From ef6fe88ff2ae334805ad0f0b7ea487387b8fa624 Mon Sep 17 00:00:00 2001 From: Tom Schindl Date: Mon, 29 Feb 2016 21:51:51 +0100 Subject: upgraded version --- .../META-INF/MANIFEST.MF | 4 +-- .../org.eclipse.fx.code.editor.ldef.ui/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 28 ++++++++++----------- .../code/org.eclipse.fx.code.editor.ldef/pom.xml | 2 +- .../.DeclarativeStyleingGenerator.xtendbin | Bin 3708 -> 3708 bytes .../.JSONConfigurationConfigurator.xtendbin | Bin 9102 -> 8586 bytes .../fx/code/editor/ldef/generator/.gitignore | 2 ++ .../META-INF/MANIFEST.MF | 2 +- .../tooling/org.eclipse.fx.ide.converter/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 6 ++--- .../META-INF/MANIFEST.MF | 8 +++--- .../org.eclipse.fx.ide.css.cssext.ui/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 8 +++--- .../tooling/org.eclipse.fx.ide.css.cssext/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../tooling/org.eclipse.fx.ide.css.jfx2/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../tooling/org.eclipse.fx.ide.css.jfx8/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 6 ++--- .../org.eclipse.fx.ide.css.ui/META-INF/MANIFEST.MF | 10 ++++---- bundles/tooling/org.eclipse.fx.ide.css.ui/pom.xml | 2 +- .../org.eclipse.fx.ide.css/META-INF/MANIFEST.MF | 2 +- bundles/tooling/org.eclipse.fx.ide.css/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 6 ++--- .../tooling/org.eclipse.fx.ide.fxgraph.ui/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- bundles/tooling/org.eclipse.fx.ide.fxgraph/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.fx.ide.fxml.compiler/pom.xml | 2 +- .../org.eclipse.fx.ide.fxml/META-INF/MANIFEST.MF | 6 ++--- bundles/tooling/org.eclipse.fx.ide.fxml/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 8 +++--- .../tooling/org.eclipse.fx.ide.gmodel.ui/pom.xml | 2 +- .../org.eclipse.fx.ide.gmodel/META-INF/MANIFEST.MF | 6 ++--- bundles/tooling/org.eclipse.fx.ide.gmodel/pom.xml | 2 +- .../fx/ide/gmodel/generator/GsonGenerator.xtend | 15 ++++++++--- .../org.eclipse.fx.ide.java6/META-INF/MANIFEST.MF | 2 +- bundles/tooling/org.eclipse.fx.ide.java6/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 6 ++--- .../tooling/org.eclipse.fx.ide.jdt.core/pom.xml | 2 +- .../org.eclipse.fx.ide.jdt.ui/META-INF/MANIFEST.MF | 10 ++++---- bundles/tooling/org.eclipse.fx.ide.jdt.ui/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- bundles/tooling/org.eclipse.fx.ide.l10n.ui/pom.xml | 2 +- .../contentassist/.NLSDslProposalProvider.xtendbin | Bin 1715 -> 1715 bytes .../fx/ide/l10n/ui/contentassist/.gitignore | 1 + .../ui/edit/.StringReplacementHandler.xtendbin | Bin 4109 -> 4109 bytes .../org/eclipse/fx/ide/l10n/ui/edit/.gitignore | 1 + .../.NLSHighlightingCalculator.xtendbin | Bin 3305 -> 3325 bytes .../.NLSHighlightingConfiguration.xtendbin | Bin 3189 -> 3189 bytes .../.TokenToAttributeIdMapper.xtendbin | Bin 2660 -> 2660 bytes .../eclipse/fx/ide/l10n/ui/highlighting/.gitignore | 3 +++ .../.NLSDslDescriptionLabelProvider.xtendbin | Bin 1821 -> 1821 bytes .../l10n/ui/labeling/.NLSDslLabelProvider.xtendbin | Bin 2377 -> 2377 bytes .../org/eclipse/fx/ide/l10n/ui/labeling/.gitignore | 2 ++ .../ui/outline/.NLSDslOutlineTreeProvider.xtendbin | Bin 1700 -> 1700 bytes .../org/eclipse/fx/ide/l10n/ui/outline/.gitignore | 1 + .../ui/quickfix/.NLSDslQuickfixProvider.xtendbin | Bin 1657 -> 1657 bytes .../org/eclipse/fx/ide/l10n/ui/quickfix/.gitignore | 1 + .../org.eclipse.fx.ide.l10n/META-INF/MANIFEST.MF | 2 +- bundles/tooling/org.eclipse.fx.ide.l10n/pom.xml | 2 +- .../ide/l10n/formatting/.NLSDslFormatter.xtendbin | Bin 2138 -> 2138 bytes .../org/eclipse/fx/ide/l10n/formatting/.gitignore | 1 + .../ide/l10n/generator/.NLSDslGenerator.xtendbin | Bin 10829 -> 10951 bytes .../org/eclipse/fx/ide/l10n/generator/.gitignore | 1 + .../ide/l10n/scoping/.NLSDslScopeProvider.xtendbin | Bin 1682 -> 1682 bytes .../org/eclipse/fx/ide/l10n/scoping/.gitignore | 1 + .../ide/l10n/validation/.NLSDslValidator.xtendbin | Bin 1609 -> 1609 bytes .../org/eclipse/fx/ide/l10n/validation/.gitignore | 1 + .../org.eclipse.fx.ide.model/META-INF/MANIFEST.MF | 2 +- bundles/tooling/org.eclipse.fx.ide.model/pom.xml | 2 +- .../fx/ide/model/internal/FXClassmodel.java | 1 + .../META-INF/MANIFEST.MF | 4 +-- .../tooling/org.eclipse.fx.ide.pde.core/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- .../tooling/org.eclipse.fx.ide.pde.java7/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 8 +++--- .../tooling/org.eclipse.fx.ide.pde.ui.e4/pom.xml | 2 +- .../org.eclipse.fx.ide.pde.ui/META-INF/MANIFEST.MF | 14 +++++------ bundles/tooling/org.eclipse.fx.ide.pde.ui/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 6 ++--- .../META-INF/MANIFEST.MF | 4 +-- .../org.eclipse.fx.ide.rrobot.dsl.ui/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- .../tooling/org.eclipse.fx.ide.rrobot.dsl/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../model/BundleProject.ecore | 1 + .../org.eclipse.fx.ide.rrobot.model/pom.xml | 2 +- .../org.eclipse.fx.ide.rrobot/META-INF/MANIFEST.MF | 4 +-- bundles/tooling/org.eclipse.fx.ide.rrobot/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 6 ++--- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 6 ++--- .../tooling/org.eclipse.fx.ide.ui.preview/pom.xml | 2 +- .../org.eclipse.fx.ide.ui/META-INF/MANIFEST.MF | 2 +- bundles/tooling/org.eclipse.fx.ide.ui/pom.xml | 2 +- 98 files changed, 161 insertions(+), 135 deletions(-) (limited to 'bundles') 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 060de8874..3a6892b78 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,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Language DSL Eclipse Editor Bundle-Vendor: Eclipse.org -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.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.2.0";visibility:=reexport, +Require-Bundle: org.eclipse.fx.code.editor.ldef;bundle-version="2.3.0";visibility:=reexport, org.eclipse.xtext.ui, org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0", 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 0b2330d24..c630d710a 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 ed156ce0a..36f0d592a 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.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-SymbolicName: org.eclipse.fx.code.editor.ldef; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;visibility:=reexport, @@ -14,19 +14,19 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.antlr.runtime, org.eclipse.xtext.common.types, org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional, - org.eclipse.fx.code.editor.configuration;bundle-version="2.2.0" + 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.2.0";x-internal:=true, - org.eclipse.fx.code.editor.ldef.formatting;version="2.2.0";x-internal:=true, - org.eclipse.fx.code.editor.ldef.generator;version="2.2.0";x-internal:=true, - org.eclipse.fx.code.editor.ldef.lDef;version="2.2.0";x-internal:=true, - org.eclipse.fx.code.editor.ldef.lDef.impl;version="2.2.0";x-internal:=true, - org.eclipse.fx.code.editor.ldef.lDef.util;version="2.2.0";x-internal:=true, - org.eclipse.fx.code.editor.ldef.parser.antlr;version="2.2.0";x-internal:=true, - org.eclipse.fx.code.editor.ldef.parser.antlr.internal;version="2.2.0";x-internal:=true, - org.eclipse.fx.code.editor.ldef.scoping;version="2.2.0";x-internal:=true, - org.eclipse.fx.code.editor.ldef.serializer;version="2.2.0";x-internal:=true, - org.eclipse.fx.code.editor.ldef.services;version="2.2.0";x-internal:=true, - org.eclipse.fx.code.editor.ldef.validation;version="2.2.0";x-internal:=true +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 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 60d71cbdd..a606b81e5 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 d20ed444a..bb6d89bce 100644 Binary files a/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.DeclarativeStyleingGenerator.xtendbin and b/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.DeclarativeStyleingGenerator.xtendbin differ 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 77b549729..2a8571cb6 100644 Binary files a/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.JSONConfigurationConfigurator.xtendbin and b/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.JSONConfigurationConfigurator.xtendbin differ diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.gitignore b/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.gitignore index b2949a421..415f82667 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.gitignore +++ b/bundles/code/org.eclipse.fx.code.editor.ldef/xtend-gen/org/eclipse/fx/code/editor/ldef/generator/.gitignore @@ -8,3 +8,5 @@ /.JSONConfigurationConfigurator.xtendbin /JSONConfigurationConfigurator.java /.DeclarativeStyleingGenerator.java._trace +/.DeclarativeStyleingGenerator.xtendbin +/DeclarativeStyleingGenerator.java 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 3b92a30da..127344554 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.2.0.qualifier +Bundle-Version: 2.3.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 d72a26a68..662c96634 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/META-INF/MANIFEST.MF index a1d7727dd..e41d7c588 100755 --- a/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/META-INF/MANIFEST.MF +++ b/bundles/tooling/org.eclipse.fx.ide.css.cssext.tests/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.fx.ide.css.cssext.tests Bundle-Vendor: My Company -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-SymbolicName: org.eclipse.fx.ide.css.cssext.tests;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.fx.ide.css.cssext;bundle-version="2.2.0", - org.eclipse.fx.ide.css.cssext.ui;bundle-version="2.2.0", +Require-Bundle: org.eclipse.fx.ide.css.cssext;bundle-version="2.3.0", + org.eclipse.fx.ide.css.cssext.ui;bundle-version="2.3.0", org.eclipse.core.runtime, org.eclipse.xtext.junit4, org.eclipse.ui.workbench;resolution:=optional, 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 31335c9b7..ed36e0f43 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.2.0.qualifier +Bundle-Version: 2.3.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, @@ -15,9 +15,9 @@ Require-Bundle: org.eclipse.fx.ide.css.cssext;visibility:=reexport, org.antlr.runtime, org.eclipse.xtext.common.types.ui, org.eclipse.xtext.ui.codetemplates.ui, - org.eclipse.fx.core;bundle-version="2.2.0", - org.eclipse.fx.core.guice;bundle-version="2.2.0", - org.eclipse.fx.ide.css.ui;bundle-version="2.2.0", + org.eclipse.fx.core;bundle-version="2.3.0", + org.eclipse.fx.core.guice;bundle-version="2.3.0", + org.eclipse.fx.ide.css.ui;bundle-version="2.3.0", org.eclipse.jdt.core;bundle-version="3.7.3", org.eclipse.core.databinding.observable, org.eclipse.core.databinding.beans, 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 a65cd52b7..e84d86fb6 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 02bcb59fe..63b6e9287 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.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-SymbolicName: org.eclipse.fx.ide.css.cssext; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;visibility:=reexport, @@ -17,9 +17,9 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.emf.common, org.antlr.runtime, org.eclipse.xtext.common.types, - org.eclipse.fx.core;bundle-version="2.2.0", - org.eclipse.fx.core.guice;bundle-version="2.2.0", - org.eclipse.fx.ide.css;bundle-version="2.2.0", + org.eclipse.fx.core;bundle-version="2.3.0", + org.eclipse.fx.core.guice;bundle-version="2.3.0", + org.eclipse.fx.ide.css;bundle-version="2.3.0", org.eclipse.core.resources;bundle-version="3.7.0", org.eclipse.xtext.xbase.lib, org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional 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 d152405d2..2c970bebe 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 d96859267..eda4164d3 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.2.0.qualifier +Bundle-Version: 2.3.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 87279d444..2e4917515 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 52f97fc39..007ee9425 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.2.0.qualifier +Bundle-Version: 2.3.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 1380e758a..728e6a2af 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/bundles/tooling/org.eclipse.fx.ide.css.tests/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.css.tests/META-INF/MANIFEST.MF index ef42903dd..4625c16a4 100755 --- a/bundles/tooling/org.eclipse.fx.ide.css.tests/META-INF/MANIFEST.MF +++ b/bundles/tooling/org.eclipse.fx.ide.css.tests/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-SymbolicName: org.eclipse.fx.ide.css.tests;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.fx.ide.css;bundle-version="2.2.0", - org.eclipse.fx.ide.css.ui;bundle-version="2.2.0", +Require-Bundle: org.eclipse.fx.ide.css;bundle-version="2.3.0", + org.eclipse.fx.ide.css.ui;bundle-version="2.3.0", org.eclipse.core.runtime, org.eclipse.xtext, org.eclipse.xtext.junit4, 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 658bf8669..7b8b00289 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,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.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.2.0";visibility:=reexport, +Require-Bundle: org.eclipse.fx.ide.css;bundle-version="2.3.0";visibility:=reexport, org.eclipse.xtext.ui, org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0", @@ -16,9 +16,9 @@ Require-Bundle: org.eclipse.fx.ide.css;bundle-version="2.2.0";visibility:=reexpo org.eclipse.xtext.common.types.ui, org.eclipse.xtext.ui.codetemplates.ui, org.eclipse.compare, - org.eclipse.fx.core;bundle-version="2.2.0", - org.eclipse.fx.core.guice;bundle-version="2.2.0", - org.eclipse.fx.ide.ui;bundle-version="2.2.0", + org.eclipse.fx.core;bundle-version="2.3.0", + org.eclipse.fx.core.guice;bundle-version="2.3.0", + org.eclipse.fx.ide.ui;bundle-version="2.3.0", org.eclipse.jdt.annotation;bundle-version="2.0.100";resolution:=optional Import-Package: org.apache.commons.logging, org.apache.log4j, 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 e6e0c5339..1074afea3 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 c86ccfde5..140e3e831 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.2.0.qualifier +Bundle-Version: 2.3.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 42ba2d9c2..e2fba9712 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 60198f0b7..22636b684 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.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-SymbolicName: org.eclipse.fx.ide.fxgraph.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.fx.ide.fxgraph;visibility:=reexport, @@ -19,12 +19,12 @@ Require-Bundle: org.eclipse.fx.ide.fxgraph;visibility:=reexport, org.eclipse.jdt.core;bundle-version="3.7.0", org.eclipse.jdt.ui;bundle-version="3.7.0", org.eclipse.compare, - org.eclipse.fx.ide.ui;bundle-version="2.2.0", + org.eclipse.fx.ide.ui;bundle-version="2.3.0", org.eclipse.core.databinding;bundle-version="1.4.0", org.eclipse.jface.databinding;bundle-version="1.5.0", org.eclipse.core.databinding.beans;bundle-version="1.2.100", org.eclipse.core.databinding.property;bundle-version="1.4.0", - org.eclipse.fx.ide.model;bundle-version="2.2.0", + org.eclipse.fx.ide.model;bundle-version="2.3.0", org.eclipse.xtext.xbase.lib;bundle-version="2.3.0", org.eclipse.core.expressions;bundle-version="3.4.300", org.eclipse.jdt.debug.ui 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 e52bdb444..9a6556081 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 3e79453e1..4e56fc05e 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.2.0.qualifier +Bundle-Version: 2.3.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 8c0eaad63..c88f5d05a 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 71b1e0c90..7f06605a2 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.2.0.qualifier +Bundle-Version: 2.3.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 405908a81..3ff9d95cb 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 424692d78..6617fff7b 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.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.eclipse.fx.ide.fxml.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -14,9 +14,9 @@ Require-Bundle: org.eclipse.ui, org.eclipse.wst.sse.ui;bundle-version="1.3.0", org.eclipse.xtext.ui;bundle-version="2.3.0", org.eclipse.jdt.core;bundle-version="3.7.0", - org.eclipse.fx.ide.model;bundle-version="2.2.0", + org.eclipse.fx.ide.model;bundle-version="2.3.0", org.eclipse.jdt.ui;bundle-version="3.7.0", - org.eclipse.fx.ide.ui;bundle-version="2.2.0", + org.eclipse.fx.ide.ui;bundle-version="2.3.0", org.eclipse.ui.ide;bundle-version="3.7.0", org.eclipse.xtext.common.types.ui;bundle-version="2.3.0", org.eclipse.xtext.xbase.lib;bundle-version="2.3.0", diff --git a/bundles/tooling/org.eclipse.fx.ide.fxml/pom.xml b/bundles/tooling/org.eclipse.fx.ide.fxml/pom.xml index c99c3fdac..057849028 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 df0f21a24..8e2b73687 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 @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: org.eclipse.fx.ide.gmodel.ui -Bundle-Vendor: My Company -Bundle-Version: 2.2.0.qualifier +Bundle-Name: GModel Language UI +Bundle-Vendor: Eclipse.org +Bundle-Version: 2.3.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.2.0";visibility:=reexport, +Require-Bundle: org.eclipse.fx.ide.gmodel;bundle-version="2.3.0";visibility:=reexport, org.eclipse.xtext.ui, org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0", 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 4ba58b7bc..e8b742724 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 77537a941..c46cf9a1b 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 @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: org.eclipse.fx.ide.gmodel -Bundle-Vendor: My Company -Bundle-Version: 2.2.0.qualifier +Bundle-Name: GModel DSL core +Bundle-Vendor: Eclipse.org +Bundle-Version: 2.3.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 f0709cdb1..e09f12aa3 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel/src/org/eclipse/fx/ide/gmodel/generator/GsonGenerator.xtend b/bundles/tooling/org.eclipse.fx.ide.gmodel/src/org/eclipse/fx/ide/gmodel/generator/GsonGenerator.xtend index c8adb73fd..a3a98f453 100644 --- a/bundles/tooling/org.eclipse.fx.ide.gmodel/src/org/eclipse/fx/ide/gmodel/generator/GsonGenerator.xtend +++ b/bundles/tooling/org.eclipse.fx.ide.gmodel/src/org/eclipse/fx/ide/gmodel/generator/GsonGenerator.xtend @@ -80,9 +80,15 @@ class GsonGenerator implements IGenerator { public JsonObject toJSONObject() { JsonObject o = new JsonObject(); o.addProperty( "$gtype", "«e.name»" ); - «FOR p : properties.sortBy[ p | p.name]» - «p.generatePropertyToJson» - «ENDFOR» + «IF e.map != null» + for( java.util.Map.Entry e : this.propertyMap ) { + o.add( e.getKey(), ((GsonBase)e.getValue()).toJSONObject() ); + } + «ELSE» + «FOR p : properties.sortBy[ p | p.name]» + «p.generatePropertyToJson» + «ENDFOR» + «ENDIF» return o; } @@ -111,6 +117,9 @@ class GsonGenerator implements IGenerator { private static java.util.Map toMap(JsonObject o) { java.util.Map rv = new java.util.HashMap<>(); for( java.util.Map.Entry e : o.entrySet() ) { + if( e.getKey().startsWith("$") ) { + continue; + } «IF e.map.ref != null» rv.put( e.getKey(), GsonElementFactory.create«e.map.ref.name»(e.getValue().getAsJsonObject()) ); «ELSE» 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 612a60588..c0f456b2c 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.2.0.qualifier +Bundle-Version: 2.3.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 11fcab5da..346077889 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 e795adc00..76c468b48 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,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.fx.ide.jdt.core;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.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", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.jdt.launching;bundle-version="3.6.1", - org.eclipse.fx.core;bundle-version="2.2.0", - org.eclipse.fx.osgi.util;bundle-version="2.2.0", + org.eclipse.fx.core;bundle-version="2.3.0", + org.eclipse.fx.osgi.util;bundle-version="2.3.0", org.eclipse.pde.core;bundle-version="3.8.0", org.eclipse.core.resources;bundle-version="3.8.0" Bundle-Activator: org.eclipse.fx.ide.jdt.core.internal.JavaFXCorePlugin 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 51ca2aba8..a3340202c 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 9e9b310a5..ef7513045 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,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.fx.ide.jdt.ui;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.eclipse.fx.ide.jdt.ui.internal.JavaFXUIPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.jdt.ui;bundle-version="3.7.0", org.eclipse.jdt.core;bundle-version="3.7.0", - org.eclipse.fx.ide.jdt.core;bundle-version="2.2.0", + org.eclipse.fx.ide.jdt.core;bundle-version="2.3.0", org.eclipse.core.resources;bundle-version="3.7.100", org.eclipse.ui.ide;bundle-version="3.7.0", org.eclipse.core.filesystem;bundle-version="1.3.100", @@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jface.databinding;bundle-version="1.5.0", org.eclipse.core.databinding.property;bundle-version="1.4.0", org.eclipse.pde.core;bundle-version="3.7.0", - org.eclipse.fx.ide.ui;bundle-version="2.2.0", + org.eclipse.fx.ide.ui;bundle-version="2.3.0", org.eclipse.ant.launching;bundle-version="1.0.100", org.eclipse.jdt.launching;bundle-version="3.6.0", org.eclipse.emf.common;bundle-version="2.7.0", @@ -45,8 +45,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.help.webapp;bundle-version="3.6.0", org.eclipse.equinox.http.jetty;bundle-version="2.0.100", org.eclipse.emf.ecore.xmi;bundle-version="2.7.0", - org.eclipse.fx.core;bundle-version="2.2.0", - org.eclipse.fx.osgi.util;bundle-version="2.2.0", + org.eclipse.fx.core;bundle-version="2.3.0", + org.eclipse.fx.osgi.util;bundle-version="2.3.0", org.eclipse.jdt.annotation;bundle-version="2.0.0";resolution:=optional Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 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 6dd7ede91..cb1cda2b2 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 0475bf5e5..7e82d6010 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.2.0.qualifier +Bundle-Version: 2.3.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 1186ddd7c..ede3be801 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 f082ca950..8962922f1 100644 Binary files a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.NLSDslProposalProvider.xtendbin and b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.NLSDslProposalProvider.xtendbin differ diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.gitignore b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.gitignore index d3d831c92..1e2bbc5e4 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.gitignore +++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/contentassist/.gitignore @@ -1,2 +1,3 @@ /.NLSDslProposalProvider.java._trace /NLSDslProposalProvider.java +/.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 cd6c05838..025f73754 100644 Binary files a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.StringReplacementHandler.xtendbin and b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.StringReplacementHandler.xtendbin differ diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.gitignore b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.gitignore index 7eee13a8f..bd917a5fa 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.gitignore +++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/edit/.gitignore @@ -1,2 +1,3 @@ /.StringReplacementHandler.java._trace /StringReplacementHandler.java +/.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 a198e2c19..9e16b6dcc 100644 Binary files a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingCalculator.xtendbin and b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingCalculator.xtendbin differ 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 b6fdd9e13..f928a1232 100644 Binary files a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingConfiguration.xtendbin and b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.NLSHighlightingConfiguration.xtendbin differ 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 3256c5326..8b25cafad 100644 Binary files a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.TokenToAttributeIdMapper.xtendbin and b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.TokenToAttributeIdMapper.xtendbin differ diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.gitignore b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.gitignore index 0d0987800..103708e5b 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.gitignore +++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/highlighting/.gitignore @@ -5,3 +5,6 @@ /NLSHighlightingCalculator.java /NLSHighlightingConfiguration.java /TokenToAttributeIdMapper.java +/.NLSHighlightingCalculator.xtendbin +/.NLSHighlightingConfiguration.xtendbin +/.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 7bcf04524..766451787 100644 Binary files a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslDescriptionLabelProvider.xtendbin and b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslDescriptionLabelProvider.xtendbin differ 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 fb87d9f78..0ab177b6d 100644 Binary files a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslLabelProvider.xtendbin and b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.NLSDslLabelProvider.xtendbin differ diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.gitignore b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.gitignore index 1cdae0a45..97786c331 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.gitignore +++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/labeling/.gitignore @@ -2,3 +2,5 @@ /.NLSDslLabelProvider.java._trace /NLSDslDescriptionLabelProvider.java /NLSDslLabelProvider.java +/.NLSDslDescriptionLabelProvider.xtendbin +/.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 d5ed315ec..a45b0e37d 100644 Binary files a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.NLSDslOutlineTreeProvider.xtendbin and b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.NLSDslOutlineTreeProvider.xtendbin differ diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.gitignore b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.gitignore index 91796ac90..eb605183e 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.gitignore +++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/outline/.gitignore @@ -1,2 +1,3 @@ /.NLSDslOutlineTreeProvider.java._trace /NLSDslOutlineTreeProvider.java +/.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 cb5f9fd14..28cbd4365 100644 Binary files a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.NLSDslQuickfixProvider.xtendbin and b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.NLSDslQuickfixProvider.xtendbin differ diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.gitignore b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.gitignore index 4690c9a01..808a39c8c 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.gitignore +++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/xtend-gen/org/eclipse/fx/ide/l10n/ui/quickfix/.gitignore @@ -1,2 +1,3 @@ /.NLSDslQuickfixProvider.java._trace /NLSDslQuickfixProvider.java +/.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 fd9003fa4..19a4f529d 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.2.0.qualifier +Bundle-Version: 2.3.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 67c9af95e..055bee735 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 e5e809f09..62b12fe8e 100644 Binary files a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.NLSDslFormatter.xtendbin and b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.NLSDslFormatter.xtendbin differ diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.gitignore b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.gitignore index 6a68d28a2..7b4c0ee37 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.gitignore +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/formatting/.gitignore @@ -1,2 +1,3 @@ /.NLSDslFormatter.java._trace /NLSDslFormatter.java +/.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 cd3a3429a..d094d8171 100644 Binary files a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.NLSDslGenerator.xtendbin and b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.NLSDslGenerator.xtendbin differ diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.gitignore b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.gitignore index 0947b9d76..9bd41a163 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.gitignore +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/generator/.gitignore @@ -1,2 +1,3 @@ /.NLSDslGenerator.java._trace /NLSDslGenerator.java +/.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 076132ac9..343e351df 100644 Binary files a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.NLSDslScopeProvider.xtendbin and b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.NLSDslScopeProvider.xtendbin differ diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.gitignore b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.gitignore index aa321ff2b..f73783b50 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.gitignore +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/scoping/.gitignore @@ -1,2 +1,3 @@ /.NLSDslScopeProvider.java._trace /NLSDslScopeProvider.java +/.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 fd9c74cb4..8af4d5721 100644 Binary files a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.NLSDslValidator.xtendbin and b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.NLSDslValidator.xtendbin differ diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.gitignore b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.gitignore index b308109bf..f984be3d6 100644 --- a/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.gitignore +++ b/bundles/tooling/org.eclipse.fx.ide.l10n/xtend-gen/org/eclipse/fx/ide/l10n/validation/.gitignore @@ -1,2 +1,3 @@ /.NLSDslValidator.java._trace /NLSDslValidator.java +/.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 208197c00..8ccc5b2c4 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.2.0.qualifier +Bundle-Version: 2.3.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 ebd8f9b84..20265f0d8 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/bundles/tooling/org.eclipse.fx.ide.model/src/org/eclipse/fx/ide/model/internal/FXClassmodel.java b/bundles/tooling/org.eclipse.fx.ide.model/src/org/eclipse/fx/ide/model/internal/FXClassmodel.java index c936051e9..2134c0e88 100755 --- a/bundles/tooling/org.eclipse.fx.ide.model/src/org/eclipse/fx/ide/model/internal/FXClassmodel.java +++ b/bundles/tooling/org.eclipse.fx.ide.model/src/org/eclipse/fx/ide/model/internal/FXClassmodel.java @@ -23,6 +23,7 @@ public class FXClassmodel implements IFXClassmodel { private Map fxClassCache = new HashMap<>(); private Map fxCtrlClassCache = new HashMap<>(); + @Override public IFXClass findClass(IJavaProject javaProject, IType type) { synchronized (this.fxClassCache) { IFXClass rv = this.fxClassCache.get(type); 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 1737b8a73..52562df62 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,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Core Bundle-SymbolicName: org.eclipse.fx.ide.pde.core;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.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", org.eclipse.pde.core, org.eclipse.jdt.core, org.eclipse.jdt.launching, - org.eclipse.fx.ide.jdt.core;bundle-version="2.2.0" + org.eclipse.fx.ide.jdt.core;bundle-version="2.3.0" Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse.org 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 f0fd582fb..40abad38d 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.java7/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.pde.java7/META-INF/MANIFEST.MF index cfd972fdd..553eb268c 100755 --- a/bundles/tooling/org.eclipse.fx.ide.pde.java7/META-INF/MANIFEST.MF +++ b/bundles/tooling/org.eclipse.fx.ide.pde.java7/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Java7 Bundle-SymbolicName: org.eclipse.fx.ide.pde.java7;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.jdt.core;bundle-version="3.7.0", org.eclipse.jdt.launching;bundle-version="3.6.0", - org.eclipse.fx.ide.jdt.core;bundle-version="2.2.0", + org.eclipse.fx.ide.jdt.core;bundle-version="2.3.0", org.eclipse.pde.core;bundle-version="3.7.0" diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.java7/pom.xml b/bundles/tooling/org.eclipse.fx.ide.pde.java7/pom.xml index 6cc7e6041..5f1788426 100755 --- a/bundles/tooling/org.eclipse.fx.ide.pde.java7/pom.xml +++ b/bundles/tooling/org.eclipse.fx.ide.pde.java7/pom.xml @@ -10,7 +10,7 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 0db24c3fe..948bfc3e8 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.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.eclipse.fx.ide.pde.ui.e4.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -14,10 +14,10 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.ide;bundle-version="3.7.0", com.google.guava;bundle-version="10.0.1", org.eclipse.xtext.xbase.lib;bundle-version="2.3.0", - org.eclipse.fx.ide.pde.ui;bundle-version="2.2.0", - org.eclipse.fx.ide.rrobot;bundle-version="2.2.0", + org.eclipse.fx.ide.pde.ui;bundle-version="2.3.0", + org.eclipse.fx.ide.rrobot;bundle-version="2.3.0", org.eclipse.xtend.lib;bundle-version="2.3.1", - org.eclipse.fx.ide.rrobot.dsl;bundle-version="2.2.0" + org.eclipse.fx.ide.rrobot.dsl;bundle-version="2.3.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse.org 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 ad14f1fb8..01133118f 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 4b80b9782..575f6df20 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.2.0.qualifier +Bundle-Version: 2.3.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", @@ -12,19 +12,19 @@ Require-Bundle: org.eclipse.pde.ui;bundle-version="3.6.100", org.eclipse.ui;bundle-version="3.7.0", org.eclipse.pde.ui.templates;bundle-version="3.4.400", org.eclipse.jdt.core;bundle-version="3.7.0", - org.eclipse.fx.ide.jdt.core;bundle-version="2.2.0", + org.eclipse.fx.ide.jdt.core;bundle-version="2.3.0", org.eclipse.ui.ide;bundle-version="3.7.0", org.eclipse.debug.core;bundle-version="3.7.0", - org.eclipse.fx.ide.jdt.ui;bundle-version="2.2.0", - org.eclipse.fx.ide.ui;bundle-version="2.2.0", + org.eclipse.fx.ide.jdt.ui;bundle-version="2.3.0", + org.eclipse.fx.ide.ui;bundle-version="2.3.0", org.eclipse.xtext.xbase.lib;bundle-version="2.3.0", org.eclipse.core.databinding;bundle-version="1.4.0", org.eclipse.jdt.launching;bundle-version="3.6.0", org.eclipse.xtend.lib;bundle-version="2.3.1", - org.eclipse.fx.ide.rrobot.model;bundle-version="2.2.0", + org.eclipse.fx.ide.rrobot.model;bundle-version="2.3.0", org.eclipse.jdt.ui;bundle-version="3.7.0", - org.eclipse.fx.ide.rrobot;bundle-version="2.2.0", - org.eclipse.fx.ide.rrobot.dsl;bundle-version="2.2.0", + org.eclipse.fx.ide.rrobot;bundle-version="2.3.0", + org.eclipse.fx.ide.rrobot.dsl;bundle-version="2.3.0", org.eclipse.jdt.annotation;bundle-version="2.0.0";resolution:=optional Bundle-Activator: org.eclipse.fx.ide.pde.ui.Activator Bundle-ActivationPolicy: lazy 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 a4bbe1f90..80192812b 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.tests/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.tests/META-INF/MANIFEST.MF index 65d2139ec..fe554b4ba 100755 --- a/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.tests/META-INF/MANIFEST.MF +++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.dsl.tests/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.fx.ide.rrobot.dsl.tests Bundle-Vendor: Eclipse.org -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-SymbolicName: org.eclipse.fx.ide.rrobot.dsl.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.fx.ide.rrobot.dsl;bundle-version="2.2.0", - org.eclipse.fx.ide.rrobot.dsl.ui;bundle-version="2.2.0", +Require-Bundle: org.eclipse.fx.ide.rrobot.dsl;bundle-version="2.3.0", + org.eclipse.fx.ide.rrobot.dsl.ui;bundle-version="2.3.0", org.eclipse.core.runtime, org.eclipse.xtext.junit4, org.eclipse.ui.workbench;resolution:=optional 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 7cf23c757..21a1f0ec2 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.2.0.qualifier +Bundle-Version: 2.3.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, @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.fx.ide.rrobot.dsl;visibility:=reexport, org.antlr.runtime, org.eclipse.compare, org.eclipse.xtext.builder, - org.eclipse.fx.ide.rrobot;bundle-version="2.2.0" + org.eclipse.fx.ide.rrobot;bundle-version="2.3.0" Import-Package: org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.fx.ide.rrobot.dsl.ui.contentassist;x-internal:=true, 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 a64a56801..5a4a52e5c 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 e438daa36..f7fff02d7 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.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-SymbolicName: org.eclipse.fx.ide.rrobot.dsl;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;visibility:=reexport, @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.emf.codegen.ecore;resolution:=optional, org.eclipse.emf.mwe.utils;resolution:=optional, org.eclipse.emf.mwe2.launch;resolution:=optional, - org.eclipse.fx.ide.rrobot.model;bundle-version="2.2.0", + org.eclipse.fx.ide.rrobot.model;bundle-version="2.3.0", org.eclipse.xtext.util, org.antlr.runtime Import-Package: org.apache.log4j, 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 b8d5b9338..65c01a4eb 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 ac69f4130..a4d53f4d2 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.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot.model/model/BundleProject.ecore b/bundles/tooling/org.eclipse.fx.ide.rrobot.model/model/BundleProject.ecore index 40fd410f0..ac4dbdf99 100755 --- a/bundles/tooling/org.eclipse.fx.ide.rrobot.model/model/BundleProject.ecore +++ b/bundles/tooling/org.eclipse.fx.ide.rrobot.model/model/BundleProject.ecore @@ -179,4 +179,5 @@ + 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 d71d94900..7212d7e49 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 f364fd5ca..4b3db0ffc 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,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Rrobot Bundle-SymbolicName: org.eclipse.fx.ide.rrobot -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.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.2.0";visibility:=reexport, + org.eclipse.fx.ide.rrobot.model;bundle-version="2.3.0";visibility:=reexport, org.eclipse.core.resources;bundle-version="3.7.0", org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, diff --git a/bundles/tooling/org.eclipse.fx.ide.rrobot/pom.xml b/bundles/tooling/org.eclipse.fx.ide.rrobot/pom.xml index 05c5a3e5a..7431ea347 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 6fd44d6ef..e596066aa 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.2.0.qualifier +Bundle-Version: 2.3.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 2dae3dd26..122663361 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 9bbf77ffa..44c551865 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.2.0.qualifier +Bundle-Version: 2.3.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", @@ -15,8 +15,8 @@ Require-Bundle: org.eclipse.jdt.core;bundle-version="3.8.0", org.eclipse.debug.ui;bundle-version="3.8.0", org.eclipse.jdt.debug.ui;bundle-version="3.6.200", org.eclipse.core.expressions;bundle-version="3.4.500", - org.eclipse.fx.osgi.util;bundle-version="2.2.0", - org.eclipse.fx.core;bundle-version="2.2.0", + org.eclipse.fx.osgi.util;bundle-version="2.3.0", + org.eclipse.fx.core;bundle-version="2.3.0", org.eclipse.jdt.annotation;bundle-version="2.0.100";resolution:=optional Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse.org 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 b9b954d94..51a2fae6c 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 e19ddf703..cb9054db2 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.2.0.qualifier +Bundle-Version: 2.3.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", @@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.xtext.ui;bundle-version="2.0.0", org.eclipse.core.databinding;bundle-version="1.4.0", org.eclipse.jdt.core;bundle-version="3.7.0", - org.eclipse.fx.ide.ui;bundle-version="2.2.0", - org.eclipse.fx.ide.ui.mobile.sim.device;bundle-version="2.2.0" + org.eclipse.fx.ide.ui;bundle-version="2.3.0", + org.eclipse.fx.ide.ui.mobile.sim.device;bundle-version="2.3.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor 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 d2f4b92df..d3f1d7556 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 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 de4a35f85..acf97eef2 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.2.0.qualifier +Bundle-Version: 2.3.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 7f8983a8a..1e514f9c5 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 @@ org.eclipse.fx.ide releng ../../../releng/org.eclipse.fx.ide.releng/pom.xml - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT -- cgit v1.2.3