catch up with dev
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..00a75b0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,48 @@
+bin/
+.*.jar
+.DS_Store
+target
+xtend-gen/
+plugin.xml_gen
+*.tmp
+**/xtend-gen
+**/widgetsets
+**/gwt-unitCache
+**/WEB-INF
+**/git.properties
+build/
+git.properties
+
+**/target/
+**/.metadata/
+
+**/emf-gen/**/.gitignore
+**/src-gen/**/.gitignore
+**/git.properties
+**/*.java._trace
+**/*.log
+**/*.log.properties
+
+**/bin/
+**/build/
+*.class
+*.ctrl
+**/Debug/
+.DS_Store
+*.ear
+*.war
+
+**/*.actionbin
+**/*.blipbin
+**/*.chartbin
+**/*.cubebin
+**/*.datatypebin
+**/*.dtobin
+**/*.entitybin
+**/*.servicebin
+**/*.tablebin
+**/*.uibin
+**/*.uisemanticbin
+**/*.xtendbin
+**/*.xtextbin
+
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/README.md b/README.md
deleted file mode 100644
index cc41ad5..0000000
--- a/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-vaaclipse
-=========
-
-Vaaclipse is a framework for building web applications using Eclipse 4 platform and Vaadin.
diff --git a/launcher/Vaaclipse - Build Cassandra Widgetset.launch b/launcher/Vaaclipse - Build Cassandra Widgetset.launch
deleted file mode 100644
index 367c8ad..0000000
--- a/launcher/Vaaclipse - Build Cassandra Widgetset.launch
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean verify"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="build-cassandra-widgetsets"/>
-<listAttribute key="M2_PROPERTIES"/>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-<intAttribute key="M2_THREADS" value="1"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.semanticsoft.vaaclipse}"/>
-</launchConfiguration>
diff --git a/launcher/Vaaclipse - Build Widgetset.launch b/launcher/Vaaclipse - Build Widgetset.launch
deleted file mode 100644
index 04b6842..0000000
--- a/launcher/Vaaclipse - Build Widgetset.launch
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean verify"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="build-widgetsets"/>
-<listAttribute key="M2_PROPERTIES"/>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-<intAttribute key="M2_THREADS" value="1"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.semanticsoft.vaaclipse}"/>
-</launchConfiguration>
diff --git a/launcher/Vaaclipse - P2-Juno.launch b/launcher/Vaaclipse - P2-Juno.launch
deleted file mode 100644
index 23e2977..0000000
--- a/launcher/Vaaclipse - P2-Juno.launch
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean verify"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="p2-juno"/>
-<listAttribute key="M2_PROPERTIES"/>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
-<intAttribute key="M2_THREADS" value="1"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dvaaclipse.p2.target.folder=Users/admin/git/vaaclipse/org.semanticsoft.vaaclipse.p2/test"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.semanticsoft.vaaclipse}"/>
-</launchConfiguration>
diff --git a/launcher/Vaaclipse - P2-Kepler.launch b/launcher/Vaaclipse - P2-Kepler.launch
deleted file mode 100644
index a05969e..0000000
--- a/launcher/Vaaclipse - P2-Kepler.launch
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean install"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="p2-kepler"/>
-<listAttribute key="M2_PROPERTIES"/>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
-<intAttribute key="M2_THREADS" value="1"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dvaaclipse.p2.target.folder=Users/admin/git/vaaclipse/org.semanticsoft.vaaclipse.p2/test"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/vaaclipse}"/>
-</launchConfiguration>
diff --git a/manualSteps/README b/manualSteps/README
deleted file mode 100644
index 922b971..0000000
--- a/manualSteps/README
+++ /dev/null
@@ -1,9 +0,0 @@
-
- ==========================================
- Install the dragdroplayouts-development.jar under the group com.vaadin.addon.patch in your local maven repo:
- mvn install:install-file -Dfile=dragdroplayouts-development.jar -DgroupId=com.vaadin.addon.patch
- -DartifactId=dragdroplayouts -Dversion=0.0.1 -Dpackaging=jar
- ==========================================
-
-
-
\ No newline at end of file
diff --git a/org.eclipse.e4.ui.model.workbench.edit/.classpath b/org.eclipse.e4.ui.model.workbench.edit/.classpath
new file mode 100644
index 0000000..798048d
--- /dev/null
+++ b/org.eclipse.e4.ui.model.workbench.edit/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.e4.ui.model.workbench.edit/.settings/org.eclipse.core.resources.prefs b/org.eclipse.e4.ui.model.workbench.edit/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.e4.ui.model.workbench.edit/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.e4.ui.model.workbench.edit/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.e4.ui.model.workbench.edit/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..af0f20f
--- /dev/null
+++ b/org.eclipse.e4.ui.model.workbench.edit/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.e4.ui.model.workbench.edit/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.e4.ui.model.workbench.edit/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.e4.ui.model.workbench.edit/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.e4.ui.model.workbench.edit/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.e4.ui.model.workbench.edit/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.e4.ui.model.workbench.edit/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.commons/.classpath b/org.eclipse.osbp.commons/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.commons/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.commons/.gitignore b/org.eclipse.osbp.commons/.gitignore
new file mode 100644
index 0000000..87ffa24
--- /dev/null
+++ b/org.eclipse.osbp.commons/.gitignore
@@ -0,0 +1,10 @@
+/bin
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.commons/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.commons/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.commons/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.commons/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.commons/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.commons/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.commons/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.commons/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.commons/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.commons/.settings/org.eclipse.pde.core.prefs b/org.eclipse.osbp.commons/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..f29e940
--- /dev/null
+++ b/org.eclipse.osbp.commons/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.eclipse.osbp.commons/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.commons/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.commons/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.e4.injector.objectsuppliers/.classpath b/org.eclipse.osbp.e4.injector.objectsuppliers/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.e4.injector.objectsuppliers/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.e4.injector.objectsuppliers/.gitignore b/org.eclipse.osbp.e4.injector.objectsuppliers/.gitignore
new file mode 100644
index 0000000..9b50417
--- /dev/null
+++ b/org.eclipse.osbp.e4.injector.objectsuppliers/.gitignore
@@ -0,0 +1,7 @@
+/bin
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.pde.core.prefs b/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..f29e940
--- /dev/null
+++ b/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.e4.injector.objectsuppliers/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.e4extension/.classpath b/org.eclipse.osbp.e4extension/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.e4extension/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.e4extension/.gitignore b/org.eclipse.osbp.e4extension/.gitignore
new file mode 100644
index 0000000..cf2eb44
--- /dev/null
+++ b/org.eclipse.osbp.e4extension/.gitignore
@@ -0,0 +1,6 @@
+/bin
+/target/
+/target/
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.e4extension/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.e4extension/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.e4extension/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.e4extension/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.e4extension/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.e4extension/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.e4extension/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.e4extension/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.e4extension/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.e4extension/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.e4extension/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.e4extension/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.e4modelextension/.classpath b/org.eclipse.osbp.e4modelextension/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.e4modelextension/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.e4modelextension/.gitignore b/org.eclipse.osbp.e4modelextension/.gitignore
new file mode 100644
index 0000000..cf2eb44
--- /dev/null
+++ b/org.eclipse.osbp.e4modelextension/.gitignore
@@ -0,0 +1,6 @@
+/bin
+/target/
+/target/
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.pde.core.prefs b/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..f29e940
--- /dev/null
+++ b/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.e4modelextension/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.additions/.classpath b/org.eclipse.osbp.vaaclipse.additions/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.additions/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.additions/.gitignore b/org.eclipse.osbp.vaaclipse.additions/.gitignore
new file mode 100644
index 0000000..507a733
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.additions/.gitignore
@@ -0,0 +1,8 @@
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.pde.core.prefs b/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..f29e940
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.additions/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.additions/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.additions/META-INF/MANIFEST.MF
index 442297d..ed95b70 100644
--- a/org.eclipse.osbp.vaaclipse.additions/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.additions/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
Bundle-Vendor: Eclipse OSBP
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.eclipse.osbp.vaaclipse.additions.view;version="0.9.0"
-Import-Package: javax.annotation;version="1.1.0",
+Import-Package: javax.annotation,
javax.inject;version="1.0.0"
Require-Bundle: org.eclipse.e4.core.di;bundle-version="1.1.0",
org.eclipse.e4.ui.model.workbench;bundle-version="0.10.1",
@@ -15,5 +15,5 @@
org.eclipse.e4.ui.workbench;bundle-version="0.10.3",
org.eclipse.osbp.vaaclipse.publicapi;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.e4extension;bundle-version="[0.9.0,0.10.0)",
- com.vaadin.server;bundle-version="[7.5.7,7.7.0)",
- com.vaadin.shared;bundle-version="[7.5.7,7.7.0)"
+ com.vaadin.server;bundle-version="[7.7.6,7.8.0)",
+ com.vaadin.shared;bundle-version="[7.7.6,7.8.0)"
diff --git a/org.eclipse.osbp.vaaclipse.api/.classpath b/org.eclipse.osbp.vaaclipse.api/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.api/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.api/.gitignore b/org.eclipse.osbp.vaaclipse.api/.gitignore
new file mode 100644
index 0000000..a6f89c2
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.api/.gitignore
@@ -0,0 +1 @@
+/target/
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.pde.core.prefs b/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..f29e940
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.api/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.behaviour/.classpath b/org.eclipse.osbp.vaaclipse.behaviour/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.behaviour/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.behaviour/.gitignore b/org.eclipse.osbp.vaaclipse.behaviour/.gitignore
new file mode 100644
index 0000000..507a733
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.behaviour/.gitignore
@@ -0,0 +1,8 @@
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.vaaclipse.behaviour/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.behaviour/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.behaviour/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.behaviour/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.behaviour/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.behaviour/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.vaaclipse.behaviour/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.behaviour/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.behaviour/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.behaviour/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.behaviour/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.behaviour/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.behaviour/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.behaviour/META-INF/MANIFEST.MF
index 62eaff6..c8bf055 100644
--- a/org.eclipse.osbp.vaaclipse.behaviour/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.behaviour/META-INF/MANIFEST.MF
@@ -20,5 +20,5 @@
org.eclipse.osbp.vaaclipse.behaviour.cleanup;version="0.9.0"
Bundle-Vendor: Eclipse OSBP
Service-Component: OSGI-INF/org.eclipse.osbp.vaaclipse.behaviour.xml
-Import-Package: javax.annotation;version="1.1.0",
+Import-Package: javax.annotation,
javax.inject;version="1.0.0"
diff --git a/org.eclipse.osbp.vaaclipse.common.ecview.api/.classpath b/org.eclipse.osbp.vaaclipse.common.ecview.api/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.common.ecview.api/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.common.ecview.api/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.common.ecview.api/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.common.ecview.api/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.common.ecview.api/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.common.ecview.api/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.common.ecview.api/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.vaaclipse.common.ecview.api/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.common.ecview.api/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.common.ecview.api/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.common.ecview.api/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.common.ecview.api/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.common.ecview.api/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.common.ecview.api/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.common.ecview.api/META-INF/MANIFEST.MF
index 1c84445..0cbeeaa 100644
--- a/org.eclipse.osbp.vaaclipse.common.ecview.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.common.ecview.api/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.osbp.vaaclipse.common.ecview.api;version="0.9.0"
Require-Bundle: org.eclipse.osbp.ecview.core.common;bundle-version="[0.9.0,0.10.0)",
- org.eclipse.osbp.ecview.core.common.model
+ org.eclipse.osbp.ecview.core.common.model;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.e4.ui.model.workbench
diff --git a/org.eclipse.osbp.vaaclipse.common.ecview.api/src/org/eclipse/osbp/vaaclipse/common/ecview/api/IECViewContainer.java b/org.eclipse.osbp.vaaclipse.common.ecview.api/src/org/eclipse/osbp/vaaclipse/common/ecview/api/IECViewContainer.java
index 7b173d6..d674f71 100644
--- a/org.eclipse.osbp.vaaclipse.common.ecview.api/src/org/eclipse/osbp/vaaclipse/common/ecview/api/IECViewContainer.java
+++ b/org.eclipse.osbp.vaaclipse.common.ecview.api/src/org/eclipse/osbp/vaaclipse/common/ecview/api/IECViewContainer.java
@@ -8,10 +8,12 @@
* Contributors:
* Rushan R. Gilmullin - initial API and implementation
*******************************************************************************/
- package org.eclipse.osbp.vaaclipse.common.ecview.api;
+package org.eclipse.osbp.vaaclipse.common.ecview.api;
import java.util.List;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.osbp.ecview.core.common.context.IViewContext;
import org.eclipse.osbp.ecview.core.common.editpart.IViewEditpart;
/**
@@ -26,4 +28,6 @@
*/
List<IViewEditpart> getECViews();
+ List<IViewContext> getECViews(MPerspective perspective);
+
}
diff --git a/org.eclipse.osbp.vaaclipse.contributions/.classpath b/org.eclipse.osbp.vaaclipse.contributions/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.contributions/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.contributions/.gitignore b/org.eclipse.osbp.vaaclipse.contributions/.gitignore
new file mode 100644
index 0000000..507a733
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.contributions/.gitignore
@@ -0,0 +1,8 @@
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.vaaclipse.contributions/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.contributions/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.contributions/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.contributions/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.contributions/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.contributions/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.vaaclipse.contributions/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.contributions/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.contributions/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.contributions/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.contributions/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.contributions/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.emf.addon/.classpath b/org.eclipse.osbp.vaaclipse.emf.addon/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf.addon/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.emf.addon/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.emf.addon/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf.addon/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.emf.addon/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.emf.addon/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf.addon/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.vaaclipse.emf.addon/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.emf.addon/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf.addon/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.emf.addon/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.emf.addon/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf.addon/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.emf.addon/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.emf.addon/META-INF/MANIFEST.MF
index be4be15..62e3eb6 100644
--- a/org.eclipse.osbp.vaaclipse.emf.addon/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.emf.addon/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@
Bundle-Vendor: Eclipse OSBP
Bundle-Version: 0.9.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: javax.annotation;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.osbp.vaadin.emf;bundle-version="[0.9.0,0.10.0)",
+Require-Bundle: org.eclipse.osbp.vaadin.emf;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.vaaclipse.emf;bundle-version="[0.9.0,0.10.0)",
org.eclipse.e4.core.contexts,
org.eclipse.e4.core.di;bundle-version="1.4.0",
org.eclipse.osbp.vaaclipse.common.ecview.api;bundle-version="[0.9.0,0.10.0)"
Import-Package: javax.inject,
- org.slf4j;version="1.7.2"
+ org.slf4j;version="1.7.2",
+ javax.annotation
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.osbp.vaaclipse.addon;version="0.9.0"
diff --git a/org.eclipse.osbp.vaaclipse.emf.api/.classpath b/org.eclipse.osbp.vaaclipse.emf.api/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf.api/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.emf.api/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.emf.api/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf.api/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.emf.api/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.emf.api/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf.api/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.vaaclipse.emf.api/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.emf.api/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf.api/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.emf.api/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.emf.api/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf.api/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.emf/.classpath b/org.eclipse.osbp.vaaclipse.emf/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.emf/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.emf/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.emf/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.emf/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.vaaclipse.emf/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.emf/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.emf/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.emf/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.emf/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.emf/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.emf/META-INF/MANIFEST.MF
index 7c0ebb7..f300f3f 100644
--- a/org.eclipse.osbp.vaaclipse.emf/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.emf/META-INF/MANIFEST.MF
@@ -14,20 +14,20 @@
org.eclipse.emf.edit,
org.eclipse.e4.ui.workbench,
org.eclipse.e4.ui.model.workbench,
- com.vaadin.server;bundle-version="7.5.7",
+ com.vaadin.server;bundle-version="[7.7.6,7.8.0)",
org.eclipse.e4.core.services,
org.eclipse.osbp.vaadin.emf;bundle-version="[0.9.0,0.10.0)",
- javax.annotation;bundle-version="[1.1.0,1.2.0)",
org.eclipse.osbp.runtime.web.vaadin.common;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.runtime.common;bundle-version="[0.9.0,0.10.0)",
- org.eclipse.xtext.common.types;bundle-version="[2.7.3,2.8.0)",
+ org.eclipse.xtext.common.types;bundle-version="[2.11.0,2.12.0)",
org.eclipse.osbp.xtext.builder.types.bundles;bundle-version="[0.9.0,0.10.0)",
- org.eclipse.osbp.runtime.designer.api
+ org.eclipse.osbp.runtime.designer.api;bundle-version="[0.9.0,0.10.0)"
Import-Package: javax.inject,
org.osgi.service.component;version="1.2.2",
org.osgi.service.component.annotations;version="1.2.0",
org.osgi.service.event;version="1.3.0",
- org.slf4j;version="1.7.2"
+ org.slf4j;version="1.7.2",
+ javax.annotation
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.osbp.vaaclipse.emf;x-internal:=true;version="0.9.0",
org.eclipse.osbp.vaaclipse.emf.handler;x-internal:=true;version="0.9.0",
diff --git a/org.eclipse.osbp.vaaclipse.feature.core/.gitignore b/org.eclipse.osbp.vaaclipse.feature.core/.gitignore
new file mode 100644
index 0000000..92be9f2
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.feature.core/.gitignore
@@ -0,0 +1,3 @@
+/target/
+/apidocs/
+!/apidocs/README.txt
diff --git a/org.eclipse.osbp.vaaclipse.feature.core/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.feature.core/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.feature.core/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.feature.core/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.feature.core/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.feature.core/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.feature.core/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.feature.core/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.feature.core/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.feature.core/feature.xml b/org.eclipse.osbp.vaaclipse.feature.core/feature.xml
index d782cbc..e953909 100644
--- a/org.eclipse.osbp.vaaclipse.feature.core/feature.xml
+++ b/org.eclipse.osbp.vaaclipse.feature.core/feature.xml
@@ -1,45 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--#======================================================================= -->
-<!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
-<!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
-<!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
-<!--# -->
-<!--# Contributors: -->
-<!--# Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
-<!--#======================================================================= -->
-
<feature
- id="org.eclipse.osbp.vaaclipse.feature.core"
- label="%featureName"
- version="0.9.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin
- id="org.eclipse.osbp.vaaclipse.common.ecview.api"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ id="org.eclipse.osbp.vaaclipse.feature.core"
+ label="%featureName"
+ version="0.9.0.qualifier"
+ provider-name="%providerName">
- <plugin
- id="org.eclipse.osbp.vaaclipse.theme"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.osbp.vaaclipse.common.ecview.api"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osbp.vaaclipse.theme"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/org.eclipse.osbp.vaaclipse.feature.runtime.core/.gitignore b/org.eclipse.osbp.vaaclipse.feature.runtime.core/.gitignore
new file mode 100644
index 0000000..e91d5c4
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.feature.runtime.core/.gitignore
@@ -0,0 +1,3 @@
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.vaaclipse.feature.runtime.core/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.feature.runtime.core/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.feature.runtime.core/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.feature.runtime.core/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.feature.runtime.core/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.feature.runtime.core/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.feature.runtime.core/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.feature.runtime.core/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.feature.runtime.core/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.feature.runtime.core/feature.xml b/org.eclipse.osbp.vaaclipse.feature.runtime.core/feature.xml
index bdfe27f..f47ddb1 100644
--- a/org.eclipse.osbp.vaaclipse.feature.runtime.core/feature.xml
+++ b/org.eclipse.osbp.vaaclipse.feature.runtime.core/feature.xml
@@ -29,15 +29,15 @@
</license>
<requires>
- <import plugin="org.eclipse.e4.core.commands" version="0.10.2" match="equivalent"/>
- <import plugin="org.eclipse.e4.core.contexts" version="1.3.100" match="equivalent"/>
- <import plugin="org.eclipse.e4.core.di" version="1.4.0" match="equivalent"/>
- <import plugin="org.eclipse.e4.core.di.extensions" version="0.12.0" match="equivalent"/>
- <import plugin="org.eclipse.e4.core.services" version="1.2.0" match="equivalent"/>
- <import plugin="org.eclipse.e4.ui.model.workbench" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.e4.ui.css.core" version="0.10.100" match="equivalent"/>
- <import plugin="org.eclipse.e4.ui.di" version="1.0.0" match="equivalent"/>
- <import plugin="org.eclipse.e4.ui.services" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.e4.core.commands" version="0.11.100" match="equivalent"/>
+ <import plugin="org.eclipse.e4.core.contexts" version="1.5.1" match="equivalent"/>
+ <import plugin="org.eclipse.e4.core.di" version="1.6.1" match="equivalent"/>
+ <import plugin="org.eclipse.e4.core.di.extensions" version="0.14.0" match="equivalent"/>
+ <import plugin="org.eclipse.e4.core.services" version="2.0.100" match="equivalent"/>
+ <import plugin="org.eclipse.e4.ui.model.workbench" version="1.2.0" match="equivalent"/>
+ <import plugin="org.eclipse.e4.ui.css.core" version="0.12.1" match="equivalent"/>
+ <import plugin="org.eclipse.e4.ui.di" version="1.1.100" match="equivalent"/>
+ <import plugin="org.eclipse.e4.ui.services" version="1.2.100" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.osbp.vaaclipse.feature.target.core/.gitignore b/org.eclipse.osbp.vaaclipse.feature.target.core/.gitignore
new file mode 100644
index 0000000..e91d5c4
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.feature.target.core/.gitignore
@@ -0,0 +1,3 @@
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.vaaclipse.feature.target.core/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.feature.target.core/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.feature.target.core/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.feature.target.core/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.feature.target.core/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.feature.target.core/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.feature.target.core/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.feature.target.core/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.feature.target.core/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.feature.target.core/feature.xml b/org.eclipse.osbp.vaaclipse.feature.target.core/feature.xml
index 31e25dd..44d9ce0 100644
--- a/org.eclipse.osbp.vaaclipse.feature.target.core/feature.xml
+++ b/org.eclipse.osbp.vaaclipse.feature.target.core/feature.xml
@@ -29,15 +29,15 @@
</license>
<requires>
- <import plugin="org.eclipse.e4.core.commands" version="0.10.2" match="equivalent"/>
- <import plugin="org.eclipse.e4.core.contexts" version="1.3.100" match="equivalent"/>
- <import plugin="org.eclipse.e4.core.di" version="1.4.0" match="equivalent"/>
- <import plugin="org.eclipse.e4.core.di.extensions" version="0.12.0" match="equivalent"/>
- <import plugin="org.eclipse.e4.core.services" version="1.2.0" match="equivalent"/>
- <import plugin="org.eclipse.e4.ui.model.workbench" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.e4.ui.css.core" version="0.10.100" match="equivalent"/>
- <import plugin="org.eclipse.e4.ui.di" version="1.0.0" match="equivalent"/>
- <import plugin="org.eclipse.e4.ui.services" version="1.1.0" match="equivalent"/>
+ <import plugin="org.eclipse.e4.core.commands" version="0.11.100" match="equivalent"/>
+ <import plugin="org.eclipse.e4.core.contexts" version="1.5.0" match="equivalent"/>
+ <import plugin="org.eclipse.e4.core.di" version="1.6.0" match="equivalent"/>
+ <import plugin="org.eclipse.e4.core.di.extensions" version="0.14.0" match="equivalent"/>
+ <import plugin="org.eclipse.e4.core.services" version="2.0.100" match="equivalent"/>
+ <import plugin="org.eclipse.e4.ui.model.workbench" version="1.2.0" match="equivalent"/>
+ <import plugin="org.eclipse.e4.ui.css.core" version="0.12.1" match="equivalent"/>
+ <import plugin="org.eclipse.e4.ui.di" version="1.1.100" match="equivalent"/>
+ <import plugin="org.eclipse.e4.ui.services" version="1.2.100" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.osbp.vaaclipse.presentation/.classpath b/org.eclipse.osbp.vaaclipse.presentation/.classpath
new file mode 100644
index 0000000..cf36b56
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.presentation/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.presentation/.gitignore b/org.eclipse.osbp.vaaclipse.presentation/.gitignore
new file mode 100644
index 0000000..e91d5c4
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.presentation/.gitignore
@@ -0,0 +1,3 @@
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.vaaclipse.presentation/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.presentation/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.presentation/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.presentation/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.presentation/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.presentation/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.vaaclipse.presentation/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.presentation/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.presentation/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.presentation/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.presentation/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.presentation/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.presentation/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.presentation/META-INF/MANIFEST.MF
index 32309f4..de43d64 100644
--- a/org.eclipse.osbp.vaaclipse.presentation/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.presentation/META-INF/MANIFEST.MF
@@ -18,8 +18,8 @@
org.eclipse.e4.ui.di;bundle-version="0.10.1",
org.eclipse.osbp.vaadin;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.vaaclipse.publicapi;bundle-version="[0.9.0,0.10.0)",
- com.vaadin.server;bundle-version="[7.5.7,7.7.0)",
- com.vaadin.shared;bundle-version="[7.5.7,7.7.0)",
+ com.vaadin.server;bundle-version="[7.7.6,7.8.0)",
+ com.vaadin.shared;bundle-version="[7.7.6,7.8.0)",
org.eclipse.osbp.vaaclipse.widgets;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.commons;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.vaaclipse.widgetset.default;bundle-version="[0.9.0,0.10.0)";resolution:=optional,
@@ -28,12 +28,12 @@
org.jsoup;bundle-version="1.7.2",
org.eclipse.emf.edit;bundle-version="2.10.1",
org.eclipse.emf.ecore.xmi;bundle-version="2.10.2",
- org.eclipse.osbp.runtime.designer.api,
- dragdroplayouts.osgi;bundle-version="1.1.3",
- contextmenu.osgi;bundle-version="4.6.0"
+ org.eclipse.osbp.runtime.designer.api;bundle-version="[0.9.0,0.10.0)",
+ dragdroplayouts.osgi;bundle-version="[1.3.2,1.3.3)",
+ contextmenu.osgi;bundle-version="[4.6,4.7)"
Export-Package: org.eclipse.osbp.vaaclipse.presentation.engine;version="0.9.0",
org.eclipse.osbp.vaaclipse.presentation.renderers;version="0.9.0"
-Import-Package: javax.annotation;version="1.1.0",
+Import-Package: javax.annotation,
javax.inject;version="1.0.0",
org.slf4j;version="1.7.2"
Bundle-Activator: org.eclipse.osbp.vaaclipse.Activator
diff --git a/org.eclipse.osbp.vaaclipse.presentation/src/org/eclipse/osbp/vaaclipse/presentation/renderers/PartRenderer.java b/org.eclipse.osbp.vaaclipse.presentation/src/org/eclipse/osbp/vaaclipse/presentation/renderers/PartRenderer.java
index d302084..9c146a7 100644
--- a/org.eclipse.osbp.vaaclipse.presentation/src/org/eclipse/osbp/vaaclipse/presentation/renderers/PartRenderer.java
+++ b/org.eclipse.osbp.vaaclipse.presentation/src/org/eclipse/osbp/vaaclipse/presentation/renderers/PartRenderer.java
@@ -66,13 +66,12 @@
IEclipseContext localContext = part.getContext();
IContributionFactory contributionFactory = (IContributionFactory) localContext
.get(IContributionFactory.class.getName());
- Object newPart = contributionFactory.create(part.getContributionURI(),
- localContext);
+ Object newPart = contributionFactory.create(part.getContributionURI(), localContext);
- if(part.getObject() != null) {
+ if (part.getObject() != null) {
ContextInjectionFactory.uninject(part.getObject(), localContext);
}
-
+
part.setObject(newPart);
}
};
@@ -82,8 +81,7 @@
}
@Override
- public void createWidget(MUIElement element,
- MElementContainer<MUIElement> parent) {
+ public void createWidget(MUIElement element, MElementContainer<MUIElement> parent) {
Panel shortcutReceiver = new Panel();
shortcutReceiver.setSizeFull();
@@ -91,6 +89,7 @@
shortcutReceiver.setContent(pane);
pane.setSizeFull();
final MPart part = (MPart) element;
+
// toolbar
MToolBar toolbar = part.getToolbar();
if (toolbar != null && toolbar.isToBeRendered()) {
@@ -102,8 +101,7 @@
pane.addComponent(toolbarArea);
// create toolbar
- Component toolbarWidget = (Component) renderingEngine
- .createGui(toolbar);
+ Component toolbarWidget = (Component) renderingEngine.createGui(toolbar);
((AbstractLayout) toolbarWidget).setSizeUndefined();
toolbarWidget.setStyleName("mparttoolbar");
toolbarArea.addComponent(toolbarWidget);
@@ -117,14 +115,17 @@
pane.setStyleName("part");
element.setWidget(shortcutReceiver);
- IEclipseContext localContext = part.getContext();
+ final IEclipseContext localContext = part.getContext();
localContext.set(Component.class, contributionArea);
localContext.set(ComponentContainer.class, contributionArea);
localContext.set(VerticalLayout.class, contributionArea);
localContext.set(MPart.class, part);
- localContext.set(IPartItemExecutionService.class,
- new PartItemExecutionService());
+ localContext.set(IPartItemExecutionService.class, new PartItemExecutionService());
+ pane.addLayoutClickListener(e -> {
+ localContext.activate();
+ });
+
SavePromptSetup savePromptProvider = new SavePromptSetup();
savePrompts.put(part, savePromptProvider);
localContext.set(SavePromptSetup.class, savePromptProvider);
@@ -133,8 +134,7 @@
IContributionFactory contributionFactory = (IContributionFactory) localContext
.get(IContributionFactory.class.getName());
- Object newPart = contributionFactory.create(part.getContributionURI(),
- localContext);
+ Object newPart = contributionFactory.create(part.getContributionURI(), localContext);
part.setObject(newPart);
}
@@ -146,8 +146,7 @@
@PostConstruct
public void postConstruct() {
- eventBroker.subscribe(UIEvents.Contribution.TOPIC_CONTRIBUTIONURI,
- contributionURIChanged);
+ eventBroker.subscribe(UIEvents.Contribution.TOPIC_CONTRIBUTIONURI, contributionURIChanged);
}
@PreDestroy
diff --git a/org.eclipse.osbp.vaaclipse.presentation/src/org/eclipse/osbp/vaaclipse/presentation/renderers/PerspectiveStackRenderer.java b/org.eclipse.osbp.vaaclipse.presentation/src/org/eclipse/osbp/vaaclipse/presentation/renderers/PerspectiveStackRenderer.java
index 1024f74..56a7ad6 100644
--- a/org.eclipse.osbp.vaaclipse.presentation/src/org/eclipse/osbp/vaaclipse/presentation/renderers/PerspectiveStackRenderer.java
+++ b/org.eclipse.osbp.vaaclipse.presentation/src/org/eclipse/osbp/vaaclipse/presentation/renderers/PerspectiveStackRenderer.java
@@ -470,35 +470,35 @@
perspectiveSwitcherPanel.setStyleName("perspectivepanel");
perspectiveSwitcherPanel.setSizeUndefined();
- Button openPerspectiveButton = new Button("Open");
- openPerspectiveButton.addStyleName("vaaclipsebutton");
- openPerspectiveButton.addStyleName("icononly");
- openPerspectiveButton.setIcon(new ThemeResource(
- "../vaaclipse_default_theme/img/open_perspective.png"));
-
- html5Drop = new DragAndDropWrapper(openPerspectiveButton);
- html5Drop.setDropHandler(new PerspectiveDropHandler());
-
- perspectiveSwitcherPanel.addComponent(html5Drop);
-
- openPerspectiveButton.addClickListener(new Button.ClickListener() {
-
- @Override
- public void buttonClick(ClickEvent event) {
- openOpenPerspectiveWindow();
-
- // change focus
- Component parent = event.getButton().getParent();
- while (parent != null) {
- if (parent instanceof Component.Focusable) {
- ((Component.Focusable) parent).focus();
- break;
- } else {
- parent = parent.getParent();
- }
- }
- }
- });
+// Button openPerspectiveButton = new Button("Open");
+// openPerspectiveButton.addStyleName("vaaclipsebutton");
+// openPerspectiveButton.addStyleName("icononly");
+// openPerspectiveButton.setIcon(new ThemeResource(
+// "../vaaclipse_default_theme/img/open_perspective.png"));
+//
+// html5Drop = new DragAndDropWrapper(openPerspectiveButton);
+// html5Drop.setDropHandler(new PerspectiveDropHandler());
+//
+// perspectiveSwitcherPanel.addComponent(html5Drop);
+//
+// openPerspectiveButton.addClickListener(new Button.ClickListener() {
+//
+// @Override
+// public void buttonClick(ClickEvent event) {
+// openOpenPerspectiveWindow();
+//
+// // change focus
+// Component parent = event.getButton().getParent();
+// while (parent != null) {
+// if (parent instanceof Component.Focusable) {
+// ((Component.Focusable) parent).focus();
+// break;
+// } else {
+// parent = parent.getParent();
+// }
+// }
+// }
+// });
// add separator between openPerspectiveButton and perspective's buttons
Label separator = new Label();
diff --git a/org.eclipse.osbp.vaaclipse.publicapi/.classpath b/org.eclipse.osbp.vaaclipse.publicapi/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.publicapi/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.publicapi/.gitignore b/org.eclipse.osbp.vaaclipse.publicapi/.gitignore
new file mode 100644
index 0000000..32362a3
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.publicapi/.gitignore
@@ -0,0 +1,11 @@
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.vaaclipse.publicapi/.project b/org.eclipse.osbp.vaaclipse.publicapi/.project
index 6e08d37..024a1ba 100644
--- a/org.eclipse.osbp.vaaclipse.publicapi/.project
+++ b/org.eclipse.osbp.vaaclipse.publicapi/.project
@@ -31,11 +31,6 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>com.vaadin.integration.eclipse.addonStylesBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
<arguments>
</arguments>
diff --git a/org.eclipse.osbp.vaaclipse.publicapi/.settings/com.vaadin.integration.eclipse.prefs b/org.eclipse.osbp.vaaclipse.publicapi/.settings/com.vaadin.integration.eclipse.prefs
new file mode 100644
index 0000000..0904e44
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.publicapi/.settings/com.vaadin.integration.eclipse.prefs
@@ -0,0 +1,2 @@
+com.vaadin.integration.eclipse.mavenLatestVersionsUpgrade=["7.7.7"]
+eclipse.preferences.version=1
diff --git a/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.pde.core.prefs b/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..f29e940
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.publicapi/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.publicapi/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.publicapi/META-INF/MANIFEST.MF
index 145c2c0..5e6b774 100644
--- a/org.eclipse.osbp.vaaclipse.publicapi/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.publicapi/META-INF/MANIFEST.MF
@@ -18,8 +18,8 @@
org.eclipse.osbp.vaaclipse.publicapi.resources;version="0.9.0",
org.eclipse.osbp.vaaclipse.publicapi.theme;version="0.9.0"
Require-Bundle: org.eclipse.emf.common;bundle-version="2.8.0",
- com.vaadin.server;bundle-version="[7.5.7,7.7.0)",
- com.vaadin.shared;bundle-version="[7.5.7,7.7.0)",
+ com.vaadin.server;bundle-version="[7.7.6,7.8.0)",
+ com.vaadin.shared;bundle-version="[7.7.6,7.8.0)",
org.eclipse.e4.core.contexts;bundle-version="1.1.0",
org.eclipse.e4.ui.model.workbench;bundle-version="1.1.0",
org.eclipse.emf.ecore
diff --git a/org.eclipse.osbp.vaaclipse.resources/.classpath b/org.eclipse.osbp.vaaclipse.resources/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.resources/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.resources/.gitignore b/org.eclipse.osbp.vaaclipse.resources/.gitignore
new file mode 100644
index 0000000..1dd3331
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.resources/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/target/
diff --git a/org.eclipse.osbp.vaaclipse.resources/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.resources/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.resources/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.resources/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.resources/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.resources/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.vaaclipse.resources/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.resources/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.resources/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.resources/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.resources/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.resources/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.resources/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.resources/META-INF/MANIFEST.MF
index f5b73b1..783f766 100644
--- a/org.eclipse.osbp.vaaclipse.resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.resources/META-INF/MANIFEST.MF
@@ -4,5 +4,5 @@
Bundle-SymbolicName: org.eclipse.osbp.vaaclipse.resources
Bundle-Version: 0.9.0.qualifier
Bundle-Vendor: Eclipse OSBP
-Fragment-Host: com.vaadin.themes;bundle-version="[7.5.7,7.7.0)"
+Fragment-Host: com.vaadin.themes;bundle-version="[7.7.6,7.8.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.eclipse.osbp.vaaclipse.target.luna/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.target.luna/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.target.luna/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.target.luna/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.target.luna/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.target.luna/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.target.luna/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.target.luna/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.target.luna/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.target.luna/org.eclipse.osbp.vaaclipse.target.luna.target b/org.eclipse.osbp.vaaclipse.target.luna/org.eclipse.osbp.vaaclipse.target.luna.target
deleted file mode 100644
index 97cee7d..0000000
--- a/org.eclipse.osbp.vaaclipse.target.luna/org.eclipse.osbp.vaaclipse.target.luna.target
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="org.eclipse.osbp.vaaclipse.target.luna" sequenceNumber="34">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
-<unit id="org.apache.commons.io.source" version="2.0.1.v201105210651"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.10.0.v20140519-0339"/>
-<unit id="org.eclipse.e4.rcp.source.feature.group" version="1.3.100.v20140606-1445"/>
-<unit id="org.eclipse.e4.rcp.feature.group" version="1.3.100.v20140606-1445"/>
-<repository location="http://download.eclipse.org/releases/luna"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.10.0.v20140606-1445"/>
-<repository location="http://download.eclipse.org/releases/luna"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.10.0.v20140606-1602"/>
-<repository location="http://download.eclipse.org/releases/luna"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
-<unit id="ch.qos.logback.slf4j.source" version="1.0.0.v20120123-1500"/>
-<unit id="ch.qos.logback.classic.source" version="1.0.0.v20111214-2030"/>
-<unit id="org.slf4j.ext.source" version="1.6.4.v20120130-2120"/>
-<unit id="org.slf4j.ext" version="1.6.4.v20120130-2120"/>
-<unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/>
-<unit id="org.slf4j.api.source" version="1.6.4.v20120130-2120"/>
-<unit id="ch.qos.logback.core.source" version="1.0.0.v20111214-2030"/>
-<unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
-<unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.osbp.dependencies.feature.atmosphere.feature.group" version="2.1.2.vaadin6"/>
-<unit id="org.eclipse.osbp.dependencies.feature.vaadin.feature.group" version="7.3.8"/>
-<repository location="http://lun.lunifera.org/downloads/p2/lunifera/luna/latest/"/>
-</location>
-</locations>
-</target>
diff --git a/org.eclipse.osbp.vaaclipse.theme/.classpath b/org.eclipse.osbp.vaaclipse.theme/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.theme/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.theme/.gitignore b/org.eclipse.osbp.vaaclipse.theme/.gitignore
new file mode 100644
index 0000000..e91d5c4
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.theme/.gitignore
@@ -0,0 +1,3 @@
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.vaaclipse.theme/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.theme/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.theme/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.theme/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.theme/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.theme/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.vaaclipse.theme/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.theme/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.theme/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.theme/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.theme/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.theme/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.theme/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.theme/META-INF/MANIFEST.MF
index e995e4a..b8b78d4 100644
--- a/org.eclipse.osbp.vaaclipse.theme/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.theme/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@
org.eclipse.e4.core.services;bundle-version="1.0.0",
org.eclipse.e4.core.contexts;bundle-version="1.1.0",
org.eclipse.e4.core.di;bundle-version="1.1.0"
-Import-Package: javax.annotation;version="1.1.0",
+Import-Package: javax.annotation,
javax.inject;version="1.0.0",
org.osgi.framework;version="1.8.0",
org.osgi.framework.wiring;version="1.2.0",
diff --git a/org.eclipse.osbp.vaaclipse.theme/src/org/eclipse/osbp/vaaclipse/theme/ThemeImpl.java b/org.eclipse.osbp.vaaclipse.theme/src/org/eclipse/osbp/vaaclipse/theme/ThemeImpl.java
index 431d421..2af070b 100644
--- a/org.eclipse.osbp.vaaclipse.theme/src/org/eclipse/osbp/vaaclipse/theme/ThemeImpl.java
+++ b/org.eclipse.osbp.vaaclipse.theme/src/org/eclipse/osbp/vaaclipse/theme/ThemeImpl.java
@@ -145,6 +145,11 @@
@Override
public InputStream getThemeResourceAsStream(String themeUri) {
+ InputStream in = getResourceAsStreamInternal(themeUri, true);
+ return in;
+ }
+
+ private InputStream getResourceAsStreamInternal(String themeUri, boolean useDefault) {
InputStream in = null;
StringBuffer buffer = new StringBuffer(themeUri);
for (String resLocUri : getAllResourceLocationURIs()) {
@@ -158,7 +163,11 @@
}
}
if (in == null) {
- LOGGER.debug("{}", buffer);
+ if (useDefault) {
+ return getResourceAsStreamInternal("icon/nopic_small.png", false);
+ } else {
+ LOGGER.debug("{}", buffer);
+ }
}
return in;
}
@@ -190,7 +199,8 @@
if (mod.equals("after") && ThemeContribution.MAIN_CSS.equals(value)) {
afterMainCss.add(contribution);
- } else if (mod.equals("after") && ThemeContribution.INHERITED_IMPORTS.equals(value) || mod.equals("before") && ThemeContribution.MAIN_CSS.equals(value)) {
+ } else if (mod.equals("after") && ThemeContribution.INHERITED_IMPORTS.equals(value)
+ || mod.equals("before") && ThemeContribution.MAIN_CSS.equals(value)) {
afterInheritedImports.add(contribution);
} else if (mod.equals("before") && ThemeContribution.INHERITED_IMPORTS.equals(value)) {
beforeInheritedImports.add(contribution);
@@ -209,13 +219,17 @@
}
}
- StringBuffer afterMainCssContributionsBuffer = buildStringBuffer(afterMainCss, bindedContributionsBefore, bindedContributionsAfter);
- StringBuffer afterInheritedImportsContributionsBuffer = buildStringBuffer(afterInheritedImports, bindedContributionsBefore, bindedContributionsAfter);
- StringBuffer beforeInheritedImportsContributionsBuffer = buildStringBuffer(beforeInheritedImports, bindedContributionsBefore, bindedContributionsAfter);
+ StringBuffer afterMainCssContributionsBuffer = buildStringBuffer(afterMainCss, bindedContributionsBefore,
+ bindedContributionsAfter);
+ StringBuffer afterInheritedImportsContributionsBuffer = buildStringBuffer(afterInheritedImports,
+ bindedContributionsBefore, bindedContributionsAfter);
+ StringBuffer beforeInheritedImportsContributionsBuffer = buildStringBuffer(beforeInheritedImports,
+ bindedContributionsBefore, bindedContributionsAfter);
String ls = System.lineSeparator();
- String total = beforeInheritedImportsContributionsBuffer.toString() + ls + inheritedBuffer.toString() + ls + afterInheritedImportsContributionsBuffer.toString() + ls
- + "@import \"original_styles.css\";" + ls + afterMainCssContributionsBuffer.toString() + ls;
+ String total = beforeInheritedImportsContributionsBuffer.toString() + ls + inheritedBuffer.toString() + ls
+ + afterInheritedImportsContributionsBuffer.toString() + ls + "@import \"original_styles.css\";" + ls
+ + afterMainCssContributionsBuffer.toString() + ls;
cssBytes = total.getBytes("UTF-8");
@@ -281,7 +295,8 @@
return pair;
}
- private StringBuffer buildStringBuffer(List<ThemeContributionImpl> list, Map<String, List<ThemeContributionImpl>> bindedContributionsBefore,
+ private StringBuffer buildStringBuffer(List<ThemeContributionImpl> list,
+ Map<String, List<ThemeContributionImpl>> bindedContributionsBefore,
Map<String, List<ThemeContributionImpl>> bindedContributionsAfter) {
StringBuffer buffer = new StringBuffer();
List<ThemeContributionImpl> result = buildList(list, bindedContributionsBefore, bindedContributionsAfter);
@@ -291,7 +306,8 @@
return buffer;
}
- private List<ThemeContributionImpl> buildList(List<ThemeContributionImpl> list, Map<String, List<ThemeContributionImpl>> bindedContributionsBefore,
+ private List<ThemeContributionImpl> buildList(List<ThemeContributionImpl> list,
+ Map<String, List<ThemeContributionImpl>> bindedContributionsBefore,
Map<String, List<ThemeContributionImpl>> bindedContributionsAfter) {
bindedContributionsBefore = new HashMap<String, List<ThemeContributionImpl>>(bindedContributionsBefore);
bindedContributionsAfter = new HashMap<String, List<ThemeContributionImpl>>(bindedContributionsAfter);
diff --git a/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.classpath b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.classpath
new file mode 100644
index 0000000..cf36b56
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.gitignore b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.gitignore
new file mode 100644
index 0000000..32362a3
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.gitignore
@@ -0,0 +1,11 @@
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.ui.preferences.addon/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/META-INF/MANIFEST.MF
index 1f30d77..b347335 100644
--- a/org.eclipse.osbp.vaaclipse.ui.preferences.addon/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
Bundle-Version: 0.9.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: e4modelextension,
- javax.annotation;version="1.1.0",
+ javax.annotation,
javax.inject;version="1.0.0",
org.eclipse.core.internal.preferences,
org.eclipse.core.runtime.preferences;version="3.3.0",
@@ -29,21 +29,14 @@
org.eclipse.osbp.vaadin.optiondialog
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.e4.core.di,
- com.vaadin.client;bundle-version="[7.5.7,7.7.0)",
+ com.vaadin.client;bundle-version="[7.7.6,7.8.0)",
org.eclipse.e4.ui.model.workbench;bundle-version="1.0.1",
- com.vaadin.server;bundle-version="[7.5.7,7.7.0)",
- com.vaadin.shared;bundle-version="[7.5.7,7.7.0)",
+ com.vaadin.server;bundle-version="[7.7.6,7.8.0)",
+ com.vaadin.shared;bundle-version="[7.7.6,7.8.0)",
org.eclipse.equinox.preferences;bundle-version="3.5.100",
org.eclipse.core.runtime;bundle-version="3.9.0",
org.eclipse.osbp.vaaclipse.publicapi;bundle-version="[0.9.0,0.10.0)",
- javax.annotation;bundle-version="[1.1.0,1.2.0)",
org.jsoup;bundle-version="1.7.2",
org.slf4j.api;bundle-version="1.7.2"
Export-Package: org.eclipse.osbp.vaaclipse.ui.preferences.addon;version="0.9.0"
Service-Component: OSGI-INF/org.eclipse.osbp.vaaclipse.ui.preferences.addon.internal.service.PreferenceProviderContextFunction.xml
-Service-Component: OSGI-INF/org.eclipse.osbp.vaaclipse.ui.preferences.addon.internal.service.PreferenceProviderContextFunction.xml
-Service-Component: OSGI-INF/org.eclipse.osbp.vaaclipse.ui.preferences.addon.internal.service.PreferenceProviderContextFunction.xml
-Service-Component: OSGI-INF/org.eclipse.osbp.vaaclipse.ui.preferences.addon.internal.service.PreferenceProviderContextFunction.xml
-Service-Component: OSGI-INF/org.eclipse.osbp.vaaclipse.ui.preferences.addon.internal.service.PreferenceProviderContextFunction.xml
-Service-Component: OSGI-INF/org.eclipse.osbp.vaaclipse.ui.preferences.addon.internal.service.PreferenceProviderContextFunction.xml
-Service-Component: OSGI-INF/org.eclipse.osbp.vaaclipse.ui.preferences.addon.internal.service.PreferenceProviderContextFunction.xml
diff --git a/org.eclipse.osbp.vaaclipse.ui.preferences.addon/src/org/eclipse/osbp/vaaclipse/ui/preferences/addon/internal/impexp/BasicImpExp.java b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/src/org/eclipse/osbp/vaaclipse/ui/preferences/addon/internal/impexp/BasicImpExp.java
index 67f0bf4..15e130a 100644
--- a/org.eclipse.osbp.vaaclipse.ui.preferences.addon/src/org/eclipse/osbp/vaaclipse/ui/preferences/addon/internal/impexp/BasicImpExp.java
+++ b/org.eclipse.osbp.vaaclipse.ui.preferences.addon/src/org/eclipse/osbp/vaaclipse/ui/preferences/addon/internal/impexp/BasicImpExp.java
@@ -21,6 +21,7 @@
import javax.inject.Inject;
import org.eclipse.core.runtime.preferences.IPreferenceFilter;
+import org.eclipse.core.runtime.preferences.PreferenceFilterEntry;
import org.eclipse.osbp.vaaclipse.ui.preferences.model.FieldEditor;
import org.eclipse.osbp.vaaclipse.ui.preferences.model.PreferencesPage;
import org.osgi.framework.Bundle;
@@ -205,7 +206,7 @@
}
@Override
- public Map<?, ?> getMapping(String scope) {
+ public Map<String, PreferenceFilterEntry[]> getMapping(String scope) {
return null;
}
};
diff --git a/org.eclipse.osbp.vaaclipse.ui.preferences.model/.classpath b/org.eclipse.osbp.vaaclipse.ui.preferences.model/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.ui.preferences.model/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.ui.preferences.model/.gitignore b/org.eclipse.osbp.vaaclipse.ui.preferences.model/.gitignore
new file mode 100644
index 0000000..a227dd5
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.ui.preferences.model/.gitignore
@@ -0,0 +1,7 @@
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.vaaclipse.ui.preferences.model/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.ui.preferences.model/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.ui.preferences.model/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.ui.preferences.model/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.ui.preferences.model/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.ui.preferences.model/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.vaaclipse.ui.preferences.model/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.ui.preferences.model/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.ui.preferences.model/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.ui.preferences.model/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.ui.preferences.model/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.ui.preferences.model/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.util/.classpath b/org.eclipse.osbp.vaaclipse.util/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.util/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.util/.gitignore b/org.eclipse.osbp.vaaclipse.util/.gitignore
new file mode 100644
index 0000000..9c1822d
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.util/.gitignore
@@ -0,0 +1,5 @@
+/target/
+/target/
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.pde.core.prefs b/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..f29e940
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.util/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.widgets/.classpath b/org.eclipse.osbp.vaaclipse.widgets/.classpath
new file mode 100644
index 0000000..cf36b56
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.widgets/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.widgets/.gitignore b/org.eclipse.osbp.vaaclipse.widgets/.gitignore
new file mode 100644
index 0000000..89492eb
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.widgets/.gitignore
@@ -0,0 +1,3 @@
+/target/
+/target/
+/VAADIN/*
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.widgets/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.widgets/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.widgets/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.widgets/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.widgets/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.widgets/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.vaaclipse.widgets/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.widgets/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.widgets/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.widgets/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.widgets/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.widgets/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.widgets/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.widgets/META-INF/MANIFEST.MF
index 582d4f8..278b2d9 100644
--- a/org.eclipse.osbp.vaaclipse.widgets/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.widgets/META-INF/MANIFEST.MF
@@ -4,12 +4,13 @@
Bundle-SymbolicName: org.eclipse.osbp.vaaclipse.widgets
Bundle-Vendor: Eclipse OSBP
Bundle-Version: 0.9.0.qualifier
-Require-Bundle: com.vaadin.client;bundle-version="[7.5.7,7.7.0)",
- com.vaadin.server;bundle-version="[7.5.7,7.7.0)",
- com.vaadin.shared;bundle-version="[7.5.7,7.7.0)",
- com.vaadin.themes;bundle-version="[7.5.7,7.7.0)",
- org.jsoup;bundle-version="1.7.2",
- dragdroplayouts.osgi;bundle-version="1.1.3"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: com.vaadin.client;bundle-version="[7.7.6,7.8.0)",
+ com.vaadin.server;bundle-version="[7.7.6,7.8.0)",
+ com.vaadin.shared;bundle-version="[7.7.6,7.8.0)",
+ com.vaadin.themes;bundle-version="[7.7.6,7.8.0)",
+ org.jsoup;bundle-version="1.8.3",
+ dragdroplayouts.osgi;bundle-version="[1.3.2,1.3.3)",
+ org.eclipse.osbp.dependencies.bundle.vaadin.external.gwt;bundle-version="[2.7.0,2.7.1)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.osbp.vaaclipse.widgets;version="0.9.0",
org.eclipse.osbp.vaaclipse.widgets.common;version="0.9.0"
diff --git a/org.eclipse.osbp.vaaclipse.widgets/pom-compileWidgetset.xml b/org.eclipse.osbp.vaaclipse.widgets/pom-compileWidgetset.xml
index e4a2044..58f8805 100644
--- a/org.eclipse.osbp.vaaclipse.widgets/pom-compileWidgetset.xml
+++ b/org.eclipse.osbp.vaaclipse.widgets/pom-compileWidgetset.xml
@@ -3,13 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.osbp</groupId>
<artifactId>org.eclipse.osbp.vaaclipse.widgets</artifactId>
- <version>2.7.3-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<properties>
- <vaaclipse-version>2.7.3-SNAPSHOT</vaaclipse-version>
+ <vaaclipse-version>0.9.0-SNAPSHOT</vaaclipse-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <vaadin.version>7.5.7</vaadin.version>
</properties>
<dependencies>
diff --git a/org.eclipse.osbp.vaaclipse.widgets/pom.xml b/org.eclipse.osbp.vaaclipse.widgets/pom.xml
index ef20a23..80d7be4 100644
--- a/org.eclipse.osbp.vaaclipse.widgets/pom.xml
+++ b/org.eclipse.osbp.vaaclipse.widgets/pom.xml
@@ -1,32 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*******************************************************************************
- * Copyright (c) 2012 Rushan R. Gilmullin and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rushan R. Gilmullin - initial API and implementation
- *******************************************************************************/
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.eclipse.osbp.vaaclipse.widgets</artifactId>
- <packaging>eclipse-plugin</packaging>
- <parent>
- <groupId>org.eclipse.osbp.vaaclipse</groupId>
- <artifactId>org.eclipse.osbp.vaaclipse</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
+<!-- /*******************************************************************************
+ * Copyright (c) 2012 Rushan R. Gilmullin and others. * All rights reserved.
+ This program and the accompanying materials * are made available under the
+ terms of the Eclipse Public License v1.0 * which accompanies this distribution,
+ and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors:
+ * Rushan R. Gilmullin - initial API and implementation *******************************************************************************/ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.eclipse.osbp.vaaclipse.widgets</artifactId>
+ <packaging>eclipse-plugin</packaging>
+ <parent>
+ <groupId>org.eclipse.osbp.vaaclipse</groupId>
+ <artifactId>org.eclipse.osbp.vaaclipse</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
<properties>
<vaaclipse-version>0.9.0-SNAPSHOT</vaaclipse-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <vaadin.version>7.5.7</vaadin.version>
</properties>
<dependencies>
@@ -38,13 +32,13 @@
<dependency>
<groupId>org.vaadin.addons</groupId>
<artifactId>dragdroplayouts</artifactId>
- <version>1.1.3</version>
+ <version>1.3.2</version>
</dependency>
- <dependency>
- <groupId>org.vaadin.addon</groupId>
- <artifactId>easyuploads</artifactId>
- <version>7.4.2</version>
- </dependency>
+ <dependency>
+ <groupId>org.vaadin.addon</groupId>
+ <artifactId>easyuploads</artifactId>
+ <version>7.4.2</version>
+ </dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-server</artifactId>
@@ -75,6 +69,11 @@
<artifactId>vaadin-themes</artifactId>
<version>${vaadin.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.dependencies</groupId>
+ <artifactId>org.eclipse.osbp.dependencies.bundle.vaadin.external.gwt</artifactId>
+ <version>2.7.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
@@ -168,7 +167,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore/>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -181,7 +180,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore/>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
@@ -190,5 +189,5 @@
</plugin>
</plugins>
</pluginManagement>
- </build>
+ </build>
</project>
diff --git a/org.eclipse.osbp.vaaclipse.widgets/src/com/vaadin/client/ui/dd/VaaclipseDragAndDropManager.java b/org.eclipse.osbp.vaaclipse.widgets/src/com/vaadin/client/ui/dd/VaaclipseDragAndDropManager.java
index 272838f..5461c71 100644
--- a/org.eclipse.osbp.vaaclipse.widgets/src/com/vaadin/client/ui/dd/VaaclipseDragAndDropManager.java
+++ b/org.eclipse.osbp.vaaclipse.widgets/src/com/vaadin/client/ui/dd/VaaclipseDragAndDropManager.java
@@ -566,7 +566,7 @@
Scheduler.get().scheduleFixedDelay(new RepeatingCommand() {
@Override
public boolean execute() {
- if (!client.hasActiveRequest()) {
+ if (!client.getMessageSender().hasActiveRequest()) {
removeActiveDragSourceStyleName(dragSource);
return false;
}
diff --git a/org.eclipse.osbp.vaaclipse.widgetset.default/.classpath b/org.eclipse.osbp.vaaclipse.widgetset.default/.classpath
new file mode 100644
index 0000000..cf36b56
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.widgetset.default/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.widgetset.default/.gitignore b/org.eclipse.osbp.vaaclipse.widgetset.default/.gitignore
new file mode 100644
index 0000000..fa8f446
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.widgetset.default/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/resources/
diff --git a/org.eclipse.osbp.vaaclipse.widgetset.default/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.widgetset.default/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.widgetset.default/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.widgetset.default/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.widgetset.default/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..c537b63
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.widgetset.default/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.osbp.vaaclipse.widgetset.default/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.widgetset.default/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.widgetset.default/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaaclipse.widgetset.default/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.widgetset.default/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.widgetset.default/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaaclipse.widgetset.default/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.widgetset.default/META-INF/MANIFEST.MF
index 1f294b4..03f8850 100644
--- a/org.eclipse.osbp.vaaclipse.widgetset.default/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.widgetset.default/META-INF/MANIFEST.MF
@@ -4,9 +4,9 @@
Bundle-SymbolicName: org.eclipse.osbp.vaaclipse.widgetset.default
Bundle-Vendor: Eclipse OSBP
Bundle-Version: 0.9.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Vaadin-Resources: resources
-Require-Bundle: com.vaadin.server;bundle-version="[7.5.7,7.7.0)",
- com.vaadin.client;bundle-version="[7.5.7,7.7.0)",
- com.vaadin.shared;bundle-version="[7.5.7,7.7.0)",
+Require-Bundle: com.vaadin.server;bundle-version="[7.7.6,7.8.0)",
+ com.vaadin.client;bundle-version="[7.7.6,7.8.0)",
+ com.vaadin.shared;bundle-version="[7.7.6,7.8.0)",
org.jsoup;bundle-version="1.7.2"
diff --git a/org.eclipse.osbp.vaaclipse.widgetset.default/pom-compileWidgetset.xml b/org.eclipse.osbp.vaaclipse.widgetset.default/pom-compileWidgetset.xml
index 1591eca..d7ac410 100644
--- a/org.eclipse.osbp.vaaclipse.widgetset.default/pom-compileWidgetset.xml
+++ b/org.eclipse.osbp.vaaclipse.widgetset.default/pom-compileWidgetset.xml
@@ -3,13 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.semanticsoft</groupId>
<artifactId>org.semanticsoft.vaaclipse.widgetset.default</artifactId>
- <version>2.7.3-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<properties>
- <vaaclipse-version>2.7.3-SNAPSHOT</vaaclipse-version>
+ <vaaclipse-version>0.9.0-SNAPSHOT</vaaclipse-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <vaadin.version>7.5.7</vaadin.version>
</properties>
<dependencies>
diff --git a/org.eclipse.osbp.vaaclipse.widgetset.default/pom-superdev.xml b/org.eclipse.osbp.vaaclipse.widgetset.default/pom-superdev.xml
index eb4ee6c..f7057f9 100644
--- a/org.eclipse.osbp.vaaclipse.widgetset.default/pom-superdev.xml
+++ b/org.eclipse.osbp.vaaclipse.widgetset.default/pom-superdev.xml
@@ -4,13 +4,12 @@
<groupId>org.semanticsoft</groupId>
<artifactId>org.semanticsoft.vaaclipse.widgetset.default.superdev</artifactId>
- <version>2.7.3-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<properties>
- <vaaclipse-version>2.7.3-SNAPSHOT</vaaclipse-version>
+ <vaaclipse-version>0.9.0-SNAPSHOT</vaaclipse-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <vaadin.version>7.5.7</vaadin.version>
</properties>
<dependencies>
diff --git a/org.eclipse.osbp.vaaclipse.widgetset.default/pom.xml b/org.eclipse.osbp.vaaclipse.widgetset.default/pom.xml
index ca7d7b7..67a64d2 100644
--- a/org.eclipse.osbp.vaaclipse.widgetset.default/pom.xml
+++ b/org.eclipse.osbp.vaaclipse.widgetset.default/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.vaadin.addons</groupId>
<artifactId>dragdroplayouts</artifactId>
- <version>1.1.3</version>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.vaadin.addon</groupId>
diff --git a/org.eclipse.osbp.vaadin/.classpath b/org.eclipse.osbp.vaadin/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.vaadin/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaadin/.gitignore b/org.eclipse.osbp.vaadin/.gitignore
new file mode 100644
index 0000000..8352667
--- /dev/null
+++ b/org.eclipse.osbp.vaadin/.gitignore
@@ -0,0 +1,9 @@
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.vaadin/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaadin/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaadin/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaadin/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaadin/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.vaadin/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.vaadin/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaadin/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaadin/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.vaadin/.settings/org.eclipse.pde.core.prefs b/org.eclipse.osbp.vaadin/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..f29e940
--- /dev/null
+++ b/org.eclipse.osbp.vaadin/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.eclipse.osbp.vaadin/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaadin/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaadin/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.vaadin/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaadin/META-INF/MANIFEST.MF
index e4b9b7a..646f9dc 100644
--- a/org.eclipse.osbp.vaadin/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaadin/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
Bundle-Version: 0.9.0.qualifier
Bundle-Vendor: Eclipse OSBP
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: com.vaadin.server;bundle-version="[7.5.7,7.7.0)",
- com.vaadin.shared;bundle-version="[7.5.7,7.7.0)",
+Require-Bundle: com.vaadin.server;bundle-version="[7.7.6,7.8.0)",
+ com.vaadin.shared;bundle-version="[7.7.6,7.8.0)",
org.jsoup;bundle-version="1.7.2"
Export-Package: org.eclipse.osbp.vaadin.optiondialog;version="0.9.0"
diff --git a/pom.xml b/pom.xml
index 65d0df2..c06ed4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,11 +28,8 @@
<properties>
<osbp.deployment.p2.name>vaaclipse</osbp.deployment.p2.name>
<osbp.build.p2.project.name>org.eclipse.osbp.vaaclipse.p2</osbp.build.p2.project.name>
- <vaaclipse-version>2.7.3-SNAPSHOT</vaaclipse-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <vaadin.version>7.5.7</vaadin.version>
- <vaadin.plugin.version>7.5.7</vaadin.plugin.version>
<vaadin-icepush-version>0.5.4</vaadin-icepush-version>
<icepush-version>3.0.1</icepush-version>
<icepush-gwt-version>1.0.0</icepush-gwt-version>
@@ -40,7 +37,7 @@
<modules>
<!-- Bundles -->
- <module>org.eclipse.osbp.vaaclipse.target.luna</module>
+<!-- <module>org.eclipse.osbp.vaaclipse.target.luna</module> -->
<module>org.eclipse.osbp.vaaclipse.ui.preferences.addon</module>
<module>org.eclipse.osbp.vaaclipse.ui.preferences.model</module>