update to 2.4.0

82 files changed, 114 insertions, 79 deletions

diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.ui/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.ldef.ui/META-INF/MANIFEST.MF
index 3a6892b78..37931071d 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.ui/META-INF/MANIFEST.MF
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: Language DSL Eclipse Editor

 Bundle-Vendor: Eclipse.org

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-SymbolicName: org.eclipse.fx.code.editor.ldef.ui; singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.fx.code.editor.ldef;bundle-version="2.3.0";visibility:=reexport,

diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.ui/pom.xml b/bundles/code/org.eclipse.fx.code.editor.ldef.ui/pom.xml
index c630d710a..faa4b52a4 100755
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.ui/pom.xml
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef.ui/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.ldef/META-INF/MANIFEST.MF
index 36f0d592a..dc3ebc2e7 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef/META-INF/MANIFEST.MF
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: Language Editor DSL

 Bundle-Vendor: Eclipse.org

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-SymbolicName: org.eclipse.fx.code.editor.ldef; singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.xtext;visibility:=reexport,

@@ -17,16 +17,16 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.eclipse.fx.code.editor.configuration;bundle-version="2.3.0"

 Import-Package: org.apache.log4j

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.fx.code.editor.ldef;version="2.3.0";x-internal:=true,

- org.eclipse.fx.code.editor.ldef.formatting;version="2.3.0";x-internal:=true,

- org.eclipse.fx.code.editor.ldef.generator;version="2.3.0";x-internal:=true,

- org.eclipse.fx.code.editor.ldef.lDef;version="2.3.0";x-internal:=true,

- org.eclipse.fx.code.editor.ldef.lDef.impl;version="2.3.0";x-internal:=true,

- org.eclipse.fx.code.editor.ldef.lDef.util;version="2.3.0";x-internal:=true,

- org.eclipse.fx.code.editor.ldef.parser.antlr;version="2.3.0";x-internal:=true,

- org.eclipse.fx.code.editor.ldef.parser.antlr.internal;version="2.3.0";x-internal:=true,

- org.eclipse.fx.code.editor.ldef.scoping;version="2.3.0";x-internal:=true,

- org.eclipse.fx.code.editor.ldef.serializer;version="2.3.0";x-internal:=true,

- org.eclipse.fx.code.editor.ldef.services;version="2.3.0";x-internal:=true,

- org.eclipse.fx.code.editor.ldef.validation;version="2.3.0";x-internal:=true

+Export-Package: org.eclipse.fx.code.editor.ldef;version="2.4.0";x-internal:=true,

+ org.eclipse.fx.code.editor.ldef.formatting;version="2.4.0";x-internal:=true,

+ org.eclipse.fx.code.editor.ldef.generator;version="2.4.0";x-internal:=true,

+ org.eclipse.fx.code.editor.ldef.lDef;version="2.4.0";x-internal:=true,

+ org.eclipse.fx.code.editor.ldef.lDef.impl;version="2.4.0";x-internal:=true,

+ org.eclipse.fx.code.editor.ldef.lDef.util;version="2.4.0";x-internal:=true,

+ org.eclipse.fx.code.editor.ldef.parser.antlr;version="2.4.0";x-internal:=true,

+ org.eclipse.fx.code.editor.ldef.parser.antlr.internal;version="2.4.0";x-internal:=true,

+ org.eclipse.fx.code.editor.ldef.scoping;version="2.4.0";x-internal:=true,

+ org.eclipse.fx.code.editor.ldef.serializer;version="2.4.0";x-internal:=true,

+ org.eclipse.fx.code.editor.ldef.services;version="2.4.0";x-internal:=true,

+ org.eclipse.fx.code.editor.ldef.validation;version="2.4.0";x-internal:=true

 

diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/pom.xml b/bundles/code/org.eclipse.fx.code.editor.ldef/pom.xml
index 13bba5fc7..c56aa0f53 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef/pom.xml
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.DeclarativeStyleingGenerator.xtendbin b/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.DeclarativeStyleingGenerator.xtendbin
index 9e4ffc555..86b588004 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.DeclarativeStyleingGenerator.xtendbin
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.DeclarativeStyleingGenerator.xtendbin
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.JSONConfigurationConfigurator.xtendbin b/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.JSONConfigurationConfigurator.xtendbin
index 780cb3f97..6435633cb 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.JSONConfigurationConfigurator.xtendbin
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.JSONConfigurationConfigurator.xtendbin
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/JSONConfigurationConfigurator.java b/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/JSONConfigurationConfigurator.java
index a7150403b..37844736f 100644
--- a/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/JSONConfigurationConfigurator.java
+++ b/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/JSONConfigurationConfigurator.java
@@ -21,6 +21,7 @@ import org.eclipse.fx.code.editor.configuration.PartitionRule;
 import org.eclipse.fx.code.editor.configuration.PartitionRule_DynamicEnd;
 import org.eclipse.fx.code.editor.configuration.PartitionRule_MultiLine;
 import org.eclipse.fx.code.editor.configuration.PartitionRule_SingleLine;
+import org.eclipse.fx.code.editor.configuration.PartitionWhiteSpace;
 import org.eclipse.fx.code.editor.configuration.Token;
 import org.eclipse.fx.code.editor.configuration.TokenScanner;
 import org.eclipse.fx.code.editor.configuration.TokenScanner_CharacterRule;
@@ -57,6 +58,7 @@ import org.eclipse.fx.code.editor.ldef.lDef.Scanner_Keyword;
 import org.eclipse.fx.code.editor.ldef.lDef.Scanner_MultiLineRule;
 import org.eclipse.fx.code.editor.ldef.lDef.Scanner_PatternRule;
 import org.eclipse.fx.code.editor.ldef.lDef.Scanner_SingleLineRule;
+import org.eclipse.fx.code.editor.ldef.lDef.WhitespaceRule;
 import org.eclipse.xtext.generator.IFileSystemAccess;
 import org.eclipse.xtext.xbase.lib.Functions.Function1;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -104,11 +106,44 @@ public class JSONConfigurationConfigurator {
         return this.tokenList(m2, model, pr);
       };
       Partition.Builder _kenList = _ruleList.tokenList(_function_2);
-      return _kenList.build();
+      PartitionWhiteSpace _whitespaceRule = this.whitespaceRule(m, model, pr);
+      Partition.Builder _whitespace = _kenList.whitespace(_whitespaceRule);
+      return _whitespace.build();
     };
     return ListExtensions.<org.eclipse.fx.code.editor.ldef.lDef.Partition, Partition>map(_partitions, _function);
   }
   
+  public PartitionWhiteSpace whitespaceRule(final EditorGModel m, final LanguageDef model, final org.eclipse.fx.code.editor.ldef.lDef.Partition pr) {
+    LexicalHighlighting _lexicalHighlighting = model.getLexicalHighlighting();
+    EList<LexicalPartitionHighlighting> _list = _lexicalHighlighting.getList();
+    Iterable<LexicalPartitionHighlighting_Rule> _filter = Iterables.<LexicalPartitionHighlighting_Rule>filter(_list, LexicalPartitionHighlighting_Rule.class);
+    final Function1<LexicalPartitionHighlighting_Rule, Boolean> _function = (LexicalPartitionHighlighting_Rule lp) -> {
+      org.eclipse.fx.code.editor.ldef.lDef.Partition _partition = lp.getPartition();
+      return Boolean.valueOf(Objects.equal(_partition, pr));
+    };
+    final LexicalPartitionHighlighting_Rule rv = IterableExtensions.<LexicalPartitionHighlighting_Rule>findFirst(_filter, _function);
+    boolean _and = false;
+    boolean _notEquals = (!Objects.equal(rv, null));
+    if (!_notEquals) {
+      _and = false;
+    } else {
+      WhitespaceRule _whitespace = rv.getWhitespace();
+      boolean _notEquals_1 = (!Objects.equal(_whitespace, null));
+      _and = _notEquals_1;
+    }
+    if (_and) {
+      PartitionWhiteSpace.Builder _PartitionWhiteSpaceBuilder = m.PartitionWhiteSpaceBuilder();
+      WhitespaceRule _whitespace_1 = rv.getWhitespace();
+      boolean _isJavawhitespace = _whitespace_1.isJavawhitespace();
+      PartitionWhiteSpace.Builder _javawhiteSpace = _PartitionWhiteSpaceBuilder.javawhiteSpace(_isJavawhitespace);
+      WhitespaceRule _whitespace_2 = rv.getWhitespace();
+      EList<String> _characters = _whitespace_2.getCharacters();
+      PartitionWhiteSpace.Builder _characterList = _javawhiteSpace.characterList(_characters);
+      return _characterList.build();
+    }
+    return null;
+  }
+  
   public List<PartitionRule> ruleList(final EditorGModel m, final LanguageDef model, final org.eclipse.fx.code.editor.ldef.lDef.Partition pr) {
     Paritioning _paritioning = model.getParitioning();
     Partitioner _partitioner = _paritioning.getPartitioner();
diff --git a/bundles/tooling/org.eclipse.fx.ide.converter/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.converter/META-INF/MANIFEST.MF
index 127344554..cfb255e1c 100755
--- a/bundles/tooling/org.eclipse.fx.ide.converter/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.converter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Converter
 Bundle-SymbolicName: org.eclipse.fx.ide.converter;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources;bundle-version="3.7.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.converter/pom.xml b/bundles/tooling/org.eclipse.fx.ide.converter/pom.xml
index 662c96634..0e6747ca5 100755
--- a/bundles/tooling/org.eclipse.fx.ide.converter/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.converter/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF/MANIFEST.MF
index 3fdcd9e6b..ecf9610e6 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Proposals
 Bundle-SymbolicName: org.eclipse.fx.ide.css.cssext.proposals
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.fx.ui.controls;bundle-version="2.3.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/pom.xml b/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/pom.xml
index 50d7ae161..57cb74266 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.proposals/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/META-INF/MANIFEST.MF
index ed36e0f43..dc4da515e 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: org.eclipse.fx.ide.css.cssext.ui

 Bundle-Vendor: Eclipse.org

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-SymbolicName: org.eclipse.fx.ide.css.cssext.ui;singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.fx.ide.css.cssext;visibility:=reexport,

diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/pom.xml
index e84d86fb6..602b42a50 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.ui/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.cssext/META-INF/MANIFEST.MF
index 63b6e9287..dfb5aaf55 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: org.eclipse.fx.ide.css.cssext

 Bundle-Vendor: Eclipse.org

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-SymbolicName: org.eclipse.fx.ide.css.cssext; singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.xtext;visibility:=reexport,

diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext/pom.xml b/bundles/tooling/org.eclipse.fx.ide.css.cssext/pom.xml
index 2c970bebe..37e4aca83 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.cssext/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.jfx2/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.jfx2/META-INF/MANIFEST.MF
index eda4164d3..d6e009685 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.jfx2/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.jfx2/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Jfx2
 Bundle-SymbolicName: org.eclipse.fx.ide.css.jfx2
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse.org
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.jfx2/pom.xml b/bundles/tooling/org.eclipse.fx.ide.css.jfx2/pom.xml
index 2e4917515..0a1802e28 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.jfx2/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.css.jfx2/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.jfx8/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.jfx8/META-INF/MANIFEST.MF
index 007ee9425..bdb842547 100644
--- a/bundles/tooling/org.eclipse.fx.ide.css.jfx8/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.jfx8/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Jfx8
 Bundle-SymbolicName: org.eclipse.fx.ide.css.jfx8
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse.org
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.jfx8/pom.xml b/bundles/tooling/org.eclipse.fx.ide.css.jfx8/pom.xml
index 728e6a2af..550bae6f5 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.jfx8/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.css.jfx8/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.css.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.ui/META-INF/MANIFEST.MF
index 7b8b00289..f7879a42a 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-SymbolicName: org.eclipse.fx.ide.css.ui;singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.fx.ide.css;bundle-version="2.3.0";visibility:=reexport,

diff --git a/bundles/tooling/org.eclipse.fx.ide.css.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.css.ui/pom.xml
index 1074afea3..b49c140f8 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.css.ui/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.css/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css/META-INF/MANIFEST.MF
index 140e3e831..3e1a358c2 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.css/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-SymbolicName: org.eclipse.fx.ide.css;singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.xtext;bundle-version="2.0.0";visibility:=reexport,

diff --git a/bundles/tooling/org.eclipse.fx.ide.css/pom.xml b/bundles/tooling/org.eclipse.fx.ide.css/pom.xml
index e2fba9712..193d87dde 100755
--- a/bundles/tooling/org.eclipse.fx.ide.css/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.css/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/META-INF/MANIFEST.MF
index 22636b684..47b9406c2 100755
--- a/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-SymbolicName: org.eclipse.fx.ide.fxgraph.ui; singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.fx.ide.fxgraph;visibility:=reexport,

diff --git a/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/pom.xml
index 9a6556081..d75dcac16 100755
--- a/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.fxgraph.ui/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxgraph/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.fxgraph/META-INF/MANIFEST.MF
index 4e56fc05e..6f3f80d1c 100755
--- a/bundles/tooling/org.eclipse.fx.ide.fxgraph/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.fxgraph/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-SymbolicName: org.eclipse.fx.ide.fxgraph; singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,

diff --git a/bundles/tooling/org.eclipse.fx.ide.fxgraph/pom.xml b/bundles/tooling/org.eclipse.fx.ide.fxgraph/pom.xml
index c88f5d05a..9f2de689e 100755
--- a/bundles/tooling/org.eclipse.fx.ide.fxgraph/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.fxgraph/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/META-INF/MANIFEST.MF
index 7f06605a2..88454cfcd 100644
--- a/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: Compiler

 Bundle-SymbolicName: org.eclipse.fx.ide.fxml.compiler

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

 Require-Bundle: org.eclipse.xtend.lib,

  com.google.guava,

diff --git a/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/pom.xml b/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/pom.xml
index 3ff9d95cb..ee73945fa 100755
--- a/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.fxml.compiler/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxml/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.fxml/META-INF/MANIFEST.MF
index 6617fff7b..3c1c1c2ee 100755
--- a/bundles/tooling/org.eclipse.fx.ide.fxml/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.fxml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fxml
 Bundle-SymbolicName: org.eclipse.fx.ide.fxml;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-Activator: org.eclipse.fx.ide.fxml.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxml/pom.xml b/bundles/tooling/org.eclipse.fx.ide.fxml/pom.xml
index 057849028..19772ea47 100755
--- a/bundles/tooling/org.eclipse.fx.ide.fxml/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.fxml/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/META-INF/MANIFEST.MF
index 1d5744329..b3616185b 100644
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: GModel Language UI

 Bundle-Vendor: Eclipse.org

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-SymbolicName: org.eclipse.fx.ide.gmodel.ui; singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.fx.ide.gmodel;bundle-version="2.3.0";visibility:=reexport,

diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/pom.xml
index e8b742724..f6c962420 100755
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.gmodel/META-INF/MANIFEST.MF
index c46cf9a1b..021d4f9c5 100644
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: GModel DSL core

 Bundle-Vendor: Eclipse.org

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-SymbolicName: org.eclipse.fx.ide.gmodel; singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.xtext;visibility:=reexport,

diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel/pom.xml b/bundles/tooling/org.eclipse.fx.ide.gmodel/pom.xml
index e09f12aa3..f76d78c6d 100755
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.java6/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.java6/META-INF/MANIFEST.MF
index c0f456b2c..594f10105 100755
--- a/bundles/tooling/org.eclipse.fx.ide.java6/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.java6/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: JavaFX Tooling Java Check

 Bundle-SymbolicName: org.eclipse.fx.ide.java6;singleton:=true

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-Vendor: Eclipse.org

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.ui;bundle-version="3.7.0"

diff --git a/bundles/tooling/org.eclipse.fx.ide.java6/pom.xml b/bundles/tooling/org.eclipse.fx.ide.java6/pom.xml
index 346077889..dd9e94ab1 100755
--- a/bundles/tooling/org.eclipse.fx.ide.java6/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.java6/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.jdt.core/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.jdt.core/META-INF/MANIFEST.MF
index 76c468b48..e89294622 100755
--- a/bundles/tooling/org.eclipse.fx.ide.jdt.core/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.jdt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.fx.ide.jdt.core;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.core;bundle-version="3.7.0",
  org.eclipse.equinox.common;bundle-version="3.6.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.jdt.core/pom.xml b/bundles/tooling/org.eclipse.fx.ide.jdt.core/pom.xml
index a3340202c..1564954af 100755
--- a/bundles/tooling/org.eclipse.fx.ide.jdt.core/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.jdt.core/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.jdt.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.jdt.ui/META-INF/MANIFEST.MF
index ef7513045..7ccac090b 100755
--- a/bundles/tooling/org.eclipse.fx.ide.jdt.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.jdt.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.fx.ide.jdt.ui;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-Activator: org.eclipse.fx.ide.jdt.ui.internal.JavaFXUIPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/bundles/tooling/org.eclipse.fx.ide.jdt.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.jdt.ui/pom.xml
index cb1cda2b2..b17493e65 100755
--- a/bundles/tooling/org.eclipse.fx.ide.jdt.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.jdt.ui/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/META-INF/MANIFEST.MF
index 7e82d6010..127cbb7a1 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: org.eclipse.fx.ide.l10n.ui

 Bundle-Vendor: Eclipse.org

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-SymbolicName: org.eclipse.fx.ide.l10n.ui; singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.fx.ide.l10n;visibility:=reexport,

diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/pom.xml
index ede3be801..ad6514b65 100755
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.NLSDslProposalProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.NLSDslProposalProvider.xtendbin
index 474e3d256..f3cfd3fff 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.NLSDslProposalProvider.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.NLSDslProposalProvider.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.StringReplacementHandler.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.StringReplacementHandler.xtendbin
index 224236b99..7edfd2921 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.StringReplacementHandler.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.StringReplacementHandler.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingCalculator.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingCalculator.xtendbin
index 5483ec6c8..e2708ab15 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingCalculator.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingCalculator.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingConfiguration.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingConfiguration.xtendbin
index 3dbf3e49d..bf45bebc9 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingConfiguration.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingConfiguration.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.TokenToAttributeIdMapper.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.TokenToAttributeIdMapper.xtendbin
index 9d4b21798..b393cdbb0 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.TokenToAttributeIdMapper.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.TokenToAttributeIdMapper.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslDescriptionLabelProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslDescriptionLabelProvider.xtendbin
index 74a01b234..a1d9031f2 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslDescriptionLabelProvider.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslDescriptionLabelProvider.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslLabelProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslLabelProvider.xtendbin
index bd3674d1c..8953f6904 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslLabelProvider.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslLabelProvider.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.NLSDslOutlineTreeProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.NLSDslOutlineTreeProvider.xtendbin
index 93e41eb69..3b0206ad5 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.NLSDslOutlineTreeProvider.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.NLSDslOutlineTreeProvider.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.NLSDslQuickfixProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.NLSDslQuickfixProvider.xtendbin
index 0da2d1fa0..1305a2990 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.NLSDslQuickfixProvider.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.NLSDslQuickfixProvider.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.l10n/META-INF/MANIFEST.MF
index 19a4f529d..386e5f026 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: org.eclipse.fx.ide.l10n

 Bundle-Vendor: Eclipse.org

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-SymbolicName: org.eclipse.fx.ide.l10n; singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.xtext;visibility:=reexport,

diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/pom.xml b/bundles/tooling/org.eclipse.fx.ide.l10n/pom.xml
index 055bee735..973a31a36 100755
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.NLSDslFormatter.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.NLSDslFormatter.xtendbin
index 14e8d931e..bb6b96f80 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.NLSDslFormatter.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.NLSDslFormatter.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.NLSDslGenerator.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.NLSDslGenerator.xtendbin
index 3194eeb07..bf4599b1c 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.NLSDslGenerator.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.NLSDslGenerator.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.NLSDslScopeProvider.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.NLSDslScopeProvider.xtendbin
index 3ac87865e..43a700898 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.NLSDslScopeProvider.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.NLSDslScopeProvider.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.NLSDslValidator.xtendbin b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.NLSDslValidator.xtendbin
index 0389a4753..aa9b99b48 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.NLSDslValidator.xtendbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.NLSDslValidator.xtendbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.model/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.model/META-INF/MANIFEST.MF
index 8ccc5b2c4..d81d5b906 100755
--- a/bundles/tooling/org.eclipse.fx.ide.model/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Model
 Bundle-SymbolicName: org.eclipse.fx.ide.model;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-Activator: org.eclipse.fx.ide.model.FXPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jdt.core;bundle-version="3.7.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.model/pom.xml b/bundles/tooling/org.eclipse.fx.ide.model/pom.xml
index 20265f0d8..066f5fcba 100755
--- a/bundles/tooling/org.eclipse.fx.ide.model/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.model/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.core/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.pde.core/META-INF/MANIFEST.MF
index 52562df62..04c306e9a 100644
--- a/bundles/tooling/org.eclipse.fx.ide.pde.core/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Core
 Bundle-SymbolicName: org.eclipse.fx.ide.pde.core;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.9.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.core/pom.xml b/bundles/tooling/org.eclipse.fx.ide.pde.core/pom.xml
index 40abad38d..4a1bcb51e 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.core/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.core/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/META-INF/MANIFEST.MF
index 948bfc3e8..0277c17c0 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: E4 PDE
 Bundle-SymbolicName: org.eclipse.fx.ide.pde.ui.e4;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-Activator: org.eclipse.fx.ide.pde.ui.e4.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/pom.xml b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/pom.xml
index 01133118f..d0d7b25b6 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.pde.ui/META-INF/MANIFEST.MF
index 575f6df20..9aab9db96 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.fx.ide.pde.ui;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.pde.ui;bundle-version="3.6.100",
  org.eclipse.jface;bundle-version="3.7.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.pde.ui/pom.xml
index 80192812b..3a32bad9d 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/META-INF/MANIFEST.MF
index 21a1f0ec2..ef30c21bc 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: RRobot UI

 Bundle-Vendor: Eclipse.org

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-SymbolicName: org.eclipse.fx.ide.rrobot.dsl.ui;singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.fx.ide.rrobot.dsl;visibility:=reexport,

diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/pom.xml
index 5a4a52e5c..1d0d858e7 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.ui/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/META-INF/MANIFEST.MF
index f7fff02d7..77ccc8dbf 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: org.eclipse.fx.ide.rrobot.dsl

 Bundle-Vendor: Eclipse.org

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-SymbolicName: org.eclipse.fx.ide.rrobot.dsl;singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.xtext;visibility:=reexport,

diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/pom.xml b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/pom.xml
index 65c01a4eb..87c4fa313 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.model/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.rrobot.model/META-INF/MANIFEST.MF
index a4d53f4d2..817206f2e 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot.model/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.fx.ide.rrobot.model;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.model/pom.xml b/bundles/tooling/org.eclipse.fx.ide.rrobot.model/pom.xml
index 7212d7e49..fb0fea886 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot.model/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.model/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.rrobot/META-INF/MANIFEST.MF
index 4b3db0ffc..9fef9a1fc 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: Rrobot

 Bundle-SymbolicName: org.eclipse.fx.ide.rrobot

-Bundle-Version: 2.3.0.qualifier

+Bundle-Version: 2.4.0.qualifier

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

 Require-Bundle: org.eclipse.equinox.common;bundle-version="3.6.0",

  org.eclipse.fx.ide.rrobot.model;bundle-version="2.3.0";visibility:=reexport,

diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot/pom.xml b/bundles/tooling/org.eclipse.fx.ide.rrobot/pom.xml
index 7431ea347..4ace3f203 100755
--- a/bundles/tooling/org.eclipse.fx.ide.rrobot/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.rrobot/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/META-INF/MANIFEST.MF
index e596066aa..79a8786e6 100644
--- a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Device
 Bundle-SymbolicName: org.eclipse.fx.ide.ui.mobile.sim.device
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.fx.ide.ui.mobile.sim.device;x-internal:=true,
  org.eclipse.fx.ide.ui.mobile.sim.device.android.galaxyNote2;x-internal:=true,
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/pom.xml b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/pom.xml
index 122663361..fe92bbdc5 100755
--- a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.device/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/META-INF/MANIFEST.MF
index 44c551865..7652f157d 100644
--- a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Launch
 Bundle-SymbolicName: org.eclipse.fx.ide.ui.mobile.sim.launch;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.core;bundle-version="3.8.0",
  org.eclipse.core.runtime;bundle-version="3.8.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/pom.xml b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/pom.xml
index 51a2fae6c..27d5ce9d8 100755
--- a/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.ui.mobile.sim.launch/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui.preview/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.ui.preview/META-INF/MANIFEST.MF
index cb9054db2..d7e752311 100755
--- a/bundles/tooling/org.eclipse.fx.ide.ui.preview/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.ui.preview/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.fx.ide.ui.preview;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-Activator: org.eclipse.fx.ide.ui.preview.bundle.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui;bundle-version="3.7.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui.preview/pom.xml b/bundles/tooling/org.eclipse.fx.ide.ui.preview/pom.xml
index d3f1d7556..659ade28a 100755
--- a/bundles/tooling/org.eclipse.fx.ide.ui.preview/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.ui.preview/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.ui/META-INF/MANIFEST.MF
index acf97eef2..ef01485e1 100755
--- a/bundles/tooling/org.eclipse.fx.ide.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.fx.ide.ui;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-Activator: org.eclipse.fx.ide.ui.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.databinding;bundle-version="1.4.0",
diff --git a/bundles/tooling/org.eclipse.fx.ide.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.ui/pom.xml
index 1e514f9c5..f770c14a3 100755
--- a/bundles/tooling/org.eclipse.fx.ide.ui/pom.xml
+++ b/bundles/tooling/org.eclipse.fx.ide.ui/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.eclipse.fx.ide</groupId>
 		<artifactId>releng</artifactId>
 		<relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<build>