Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2015-05-08 12:51:57 +0000
committerTom Schindl2015-05-08 12:51:57 +0000
commitbc8bc9d850eb7f2e4ef1bce71d85d545ed0c8626 (patch)
tree1261e2f90c25cc02eead7f55ac4ebe14a874e22b
parentceca63c34cca3934a9da2cc688e1a12611e46cc7 (diff)
downloadorg.eclipse.efxclipse-bc8bc9d850eb7f2e4ef1bce71d85d545ed0c8626.tar.gz
org.eclipse.efxclipse-bc8bc9d850eb7f2e4ef1bce71d85d545ed0c8626.tar.xz
org.eclipse.efxclipse-bc8bc9d850eb7f2e4ef1bce71d85d545ed0c8626.zip
latest sources from EclipseCon
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.app.feature/feature.xml499
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.app.product/org.eclipse.fx.code.compensator.app.product.product.launch5
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/formatting/.HSLFormatter.xtendbinbin2235 -> 2151 bytes
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/generator/.HSLGenerator.xtendbinbin2176 -> 2137 bytes
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/scoping/.HSLScopeProvider.xtendbinbin1727 -> 1693 bytes
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/validation/.HSLValidator.xtendbinbin1657 -> 1624 bytes
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/META-INF/MANIFEST.MF9
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/OSGI-INF/services/travis.xml7
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/fragment.e4xmi9
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/icons/security-high.pngbin0 -> 682 bytes
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/icons/security-low.pngbin0 -> 669 bytes
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/plugin.xml12
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/OpenProjectViewerHandler.java22
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisBuildViewer.java5
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisCIInstance.java25
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisCIServiceRootItem.java190
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisProjectViewer.java26
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/NewClassAction.java6
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/xtend-gen/org/eclipse/fx/code/compensator/project/jdt/handler/.NewClassTemplate.xtendbinbin1989 -> 1989 bytes
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project.vcs.git/src/org/eclipse/fx/code/compensator/project/vcs/git/GitVersionControlService.java8
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project/css/dark.css3
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project/css/default.css3
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ci/CIServiceInstance.java9
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ci/CIServiceRootNavigatorItem.java7
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/NewLocalProject.java6
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenProjectDialog.java76
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/vcs/VersionControlService.java3
-rw-r--r--experimental/compensator/org.eclipse.fx.code.compensator.target.releng/compensator.target29
28 files changed, 410 insertions, 549 deletions
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.app.feature/feature.xml b/experimental/compensator/org.eclipse.fx.code.compensator.app.feature/feature.xml
index 314a2c045..2d537d35f 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.app.feature/feature.xml
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.app.feature/feature.xml
@@ -17,464 +17,19 @@
TODO FILL WITH CONTENT
</license>
- <plugin
- id="org.eclipse.fx.code.compensator.app"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ui.keybindings"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ui.keybindings.e4"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ui.keybindings.generic"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.core.databinding"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ui.databinding"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.core.fxml"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ui.di"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ui.dialogs"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.javafx"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.osgi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.osgi.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ui.panes"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ui.controls"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ui.services"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ui.theme"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ui.workbench.base"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ui.workbench.fx"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ui.workbench.renderers.base"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.ui.workbench.renderers.fx"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.ibm.icu"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.annotation"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.inject"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.xml"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.logging"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.lang"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.commands"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.contenttype"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.databinding"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.databinding.observable"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ <includes
+ id="org.eclipse.fx.runtime.e4fx.feature"
+ version="0.0.0"/>
<plugin
- id="org.eclipse.core.databinding.property"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.expressions"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.filesystem"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.jobs"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.resources"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.core.commands"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.core.contexts"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.core.di"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.core.di.extensions"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.core.services"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.ui.di"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.ui.model.workbench"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.ui.services"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.ui.workbench"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.databinding"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore.change"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore.xmi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.app"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.concurrent"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.ds"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.event"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.launcher"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.preferences"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.registry"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.osgi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.osgi.services"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.console"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.felix.gogo.command"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.felix.gogo.runtime"
+ id="com.google.gson"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.apache.felix.gogo.shell"
+ id="org.eclipse.fx.code.compensator.app"
download-size="0"
install-size="0"
version="0.0.0"
@@ -558,13 +113,6 @@
unpack="false"/>
<plugin
- id="at.bestsolution.fx.code.compensator.dart"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.fx.code.compensator.flux"
download-size="0"
install-size="0"
@@ -586,13 +134,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.fx.code.compensator.project.bt"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.fx.code.compensator.project.jdt"
download-size="0"
install-size="0"
@@ -600,13 +141,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.fx.code.compensator.project.vcs"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.fx.code.compensator.project.vcs.git"
download-size="0"
install-size="0"
@@ -635,28 +169,7 @@
unpack="false"/>
<plugin
- id="org.apache.log4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.core.log4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.fx.code.compensator.project.bt.github"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.gson"
+ id="org.eclipse.egit.github.core"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.app.product/org.eclipse.fx.code.compensator.app.product.product.launch b/experimental/compensator/org.eclipse.fx.code.compensator.app.product/org.eclipse.fx.code.compensator.app.product.product.launch
index 2ce659a48..e8254018b 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.app.product/org.eclipse.fx.code.compensator.app.product.product.launch
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.app.product/org.eclipse.fx.code.compensator.app.product.product.launch
@@ -17,10 +17,10 @@
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-org.eclipse.fx.code.compensator.app.product_2"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java SE 8 u40"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java SE 8 u60"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nl ${target.nl} -consoleLog -nosplash -console -consoleLog -clearPersistedState_"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.framework.extensions=org.eclipse.fx.osgi -Dorg.osgi.framework.bundle.parent=ext"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.osgi.framework.bundle.parent=ext"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.fx.code.compensator.app.product"/>
<stringAttribute key="productFile" value="/org.eclipse.fx.code.compensator.app.product/org.eclipse.fx.code.compensator.app.product.product"/>
@@ -28,6 +28,7 @@
<setEntry value="org.eclipse.fx.code.compensator.app.feature:default"/>
<setEntry value="org.eclipse.fx.code.compensator.jdt.runtime.feature:default"/>
<setEntry value="org.eclipse.fx.code.compensator.xtext.runtime.feature:default"/>
+<setEntry value="org.eclipse.fx.runtime.e4fx.feature:default"/>
</setAttribute>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/formatting/.HSLFormatter.xtendbin b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/formatting/.HSLFormatter.xtendbin
index e0c548f17..e172e14b9 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/formatting/.HSLFormatter.xtendbin
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/formatting/.HSLFormatter.xtendbin
Binary files differ
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/generator/.HSLGenerator.xtendbin b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/generator/.HSLGenerator.xtendbin
index c8c9e4d3b..b0bff095c 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/generator/.HSLGenerator.xtendbin
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/generator/.HSLGenerator.xtendbin
Binary files differ
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/scoping/.HSLScopeProvider.xtendbin b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/scoping/.HSLScopeProvider.xtendbin
index c15aad418..4b34e708d 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/scoping/.HSLScopeProvider.xtendbin
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/scoping/.HSLScopeProvider.xtendbin
Binary files differ
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/validation/.HSLValidator.xtendbin b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/validation/.HSLValidator.xtendbin
index e0eafcffc..c89274f3a 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/validation/.HSLValidator.xtendbin
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/validation/.HSLValidator.xtendbin
Binary files differ
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/META-INF/MANIFEST.MF b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/META-INF/MANIFEST.MF
index 2931f705c..7bbfd8b85 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/META-INF/MANIFEST.MF
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/META-INF/MANIFEST.MF
@@ -1,9 +1,14 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Travis
-Bundle-SymbolicName: org.eclipse.fx.code.compensator.project.ci.travis
+Bundle-SymbolicName: org.eclipse.fx.code.compensator.project.ci.travis;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ClassPath: lib/org.eclipse.fx.travisci.client-0.0.1-SNAPSHOT.jar,
.
-Require-Bundle: org.eclipse.fx.code.compensator.project
+Require-Bundle: org.eclipse.fx.code.compensator.project,
+ org.eclipse.fx.core;bundle-version="2.0.0",
+ org.eclipse.e4.core.services;bundle-version="2.0.0",
+ org.eclipse.e4.ui.model.workbench;bundle-version="1.1.0",
+ org.eclipse.e4.ui.workbench;bundle-version="1.3.0"
+Import-Package: org.eclipse.e4.core.di.annotations
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/OSGI-INF/services/travis.xml b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/OSGI-INF/services/travis.xml
new file mode 100644
index 000000000..32ba574bf
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/OSGI-INF/services/travis.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.fx.code.compensator.project.ci.travis.travis">
+ <implementation class="org.eclipse.fx.code.compensator.project.ci.travis.TravisCIService"/>
+ <service>
+ <provide interface="org.eclipse.fx.code.compensator.project.ci.CIService"/>
+ </service>
+</scr:component>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/fragment.e4xmi b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/fragment.e4xmi
new file mode 100644
index 000000000..2fff18982
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/fragment.e4xmi
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ASCII"?>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_wXonkMhOEeSOf-VANz4pBA">
+ <fragments xsi:type="fragment:StringModelFragment" xmi:id="_z1w7UMhOEeSOf-VANz4pBA" featurename="commands" parentElementId="org.eclipse.fx.code.compensator.app">
+ <elements xsi:type="commands:Command" xmi:id="_3PZJkMhOEeSOf-VANz4pBA" elementId="org.eclipse.fx.code.compensator.project.ci.travis.command.openTravisViewer" commandName="Open Travis Viewer"/>
+ </fragments>
+ <fragments xsi:type="fragment:StringModelFragment" xmi:id="_6TrZ8MhOEeSOf-VANz4pBA" featurename="handlers" parentElementId="org.eclipse.fx.code.compensator.app">
+ <elements xsi:type="commands:Handler" xmi:id="_8YSWAMhOEeSOf-VANz4pBA" elementId="org.eclipse.fx.code.compensator.project.ci.travis.handler.0" contributionURI="bundleclass://org.eclipse.fx.code.compensator.project.ci.travis/org.eclipse.fx.code.compensator.project.ci.travis.OpenProjectViewerHandler" command="_3PZJkMhOEeSOf-VANz4pBA"/>
+ </fragments>
+</fragment:ModelFragments>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/icons/security-high.png b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/icons/security-high.png
new file mode 100644
index 000000000..d93b4bdd9
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/icons/security-high.png
Binary files differ
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/icons/security-low.png b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/icons/security-low.png
new file mode 100644
index 000000000..6e8e42c02
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/icons/security-low.png
Binary files differ
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/plugin.xml b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/plugin.xml
new file mode 100644
index 000000000..a784a670e
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/plugin.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
+
+ <extension
+ id="org.eclipse.fx.code.compensator.project.ci.travis.fragment"
+ point="org.eclipse.e4.workbench.model">
+ <fragment
+ uri="fragment.e4xmi">
+ </fragment>
+ </extension>
+
+</plugin>
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/OpenProjectViewerHandler.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/OpenProjectViewerHandler.java
new file mode 100644
index 000000000..d3d262bae
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/OpenProjectViewerHandler.java
@@ -0,0 +1,22 @@
+package org.eclipse.fx.code.compensator.project.ci.travis;
+
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import org.eclipse.e4.ui.workbench.modeling.EPartService.PartState;
+
+public class OpenProjectViewerHandler {
+ @Execute
+ public void open(EModelService modelService, EPartService partService, MPerspective perspective) {
+ MPartStack element = (MPartStack) modelService.find("org.eclipse.fx.code.compensator.project.partstack.1", perspective);
+
+ MPart p = modelService.createModelElement(MPart.class);
+ p.setContributionURI("bundleclass://org.eclipse.fx.code.compensator.project.ci.travis/org.eclipse.fx.code.compensator.project.ci.travis.TravisProjectViewer");
+ p.getTags().add(EPartService.REMOVE_ON_HIDE_TAG);
+ element.getChildren().add(p);
+ partService.showPart(p, PartState.ACTIVATE);
+ }
+}
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisBuildViewer.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisBuildViewer.java
new file mode 100644
index 000000000..2c91a0ea5
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisBuildViewer.java
@@ -0,0 +1,5 @@
+package org.eclipse.fx.code.compensator.project.ci.travis;
+
+public class TravisBuildViewer {
+
+}
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisCIInstance.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisCIInstance.java
new file mode 100644
index 000000000..f64cfa74c
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisCIInstance.java
@@ -0,0 +1,25 @@
+package org.eclipse.fx.code.compensator.project.ci.travis;
+
+import org.eclipse.fx.code.compensator.project.InstanceProject;
+import org.eclipse.fx.code.compensator.project.ci.CIService;
+import org.eclipse.fx.code.compensator.project.ci.CIServiceInstance;
+
+public class TravisCIInstance implements CIServiceInstance {
+
+ private final CIService service;
+ private final InstanceProject project;
+
+ public TravisCIInstance(CIService service, InstanceProject project) {
+ this.service = service;
+ this.project = project;
+ }
+
+ @Override
+ public CIService getService() {
+ return service;
+ }
+
+ public InstanceProject getProject() {
+ return project;
+ }
+}
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisCIServiceRootItem.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisCIServiceRootItem.java
new file mode 100644
index 000000000..e7bd7c0b3
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisCIServiceRootItem.java
@@ -0,0 +1,190 @@
+package org.eclipse.fx.code.compensator.project.ci.travis;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import org.eclipse.e4.core.services.events.IEventBroker;
+import org.eclipse.fx.code.compensator.project.ProjectNavigatorItem;
+import org.eclipse.fx.code.compensator.project.ci.CIServiceInstance;
+import org.eclipse.fx.code.compensator.project.ci.CIServiceRootNavigatorItem;
+import org.eclipse.fx.core.URI;
+import org.eclipse.fx.travisci.client.BuildsEndpoint;
+import org.eclipse.fx.travisci.client.BuildsEndpoint.BuildsQuery;
+import org.eclipse.fx.travisci.client.entities.Build;
+import org.eclipse.fx.travisci.client.impl.TravisCIClientImpl;
+
+public class TravisCIServiceRootItem implements CIServiceRootNavigatorItem {
+ private final ProjectNavigatorItem parent;
+ private final CIServiceInstance instance;
+ private final ObservableList<ProjectNavigatorItem> items = FXCollections.observableArrayList();
+ private List<Build> currentList;
+
+ public TravisCIServiceRootItem(ProjectNavigatorItem parent, CIServiceInstance instance) {
+ this.parent = parent;
+ this.instance = instance;
+
+ Thread t = new Thread() {
+ @Override
+ public void run() {
+ TravisCIClientImpl c = new TravisCIClientImpl("travis-java-client-test", "api.travis-ci.org");
+ BuildsEndpoint endpoint = c.createEndpoint(BuildsEndpoint.class);
+// while( true ) {
+ Stream<Build> builds = endpoint.getBuilds(BuildsQuery.bySlug("tomsontom/compensator-samples"));
+ List<Build> collect = builds.collect(Collectors.toList());
+
+// if( currentList != null && currentList.size() == collect.size() ) {
+// try {
+// Thread.sleep(10_000);
+// } catch (InterruptedException e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// }
+// continue;
+// }
+//
+// currentList = collect;
+
+ List<Build> items = new ArrayList<Build>();
+ if( collect.size() > 10 ) {
+ Optional<Build> lastSuccess = collect.stream().filter( b -> b.state().equals("passed") ).findFirst();
+ if( ! lastSuccess.isPresent() ) {
+ for( int i = 0; i < 10; i++ ) {
+ items.add(collect.get(i));
+ }
+ } else {
+ if( collect.indexOf(lastSuccess.get()) > 9 ) {
+ for( int i = 0; i < 9; i++ ) {
+ items.add(collect.get(i));
+ }
+ items.add(lastSuccess.get());
+ } else {
+ for( int i = 0; i < 10; i++ ) {
+ items.add(collect.get(i));
+ }
+ }
+ }
+ } else {
+ items.addAll(collect);
+ }
+
+ IEventBroker eventBroker = instance.getProject().getEventBroker();
+ eventBroker.post("org/eclipse/fx/code/compensator/cibundleinfo", items.get(0).state().equals("passed") ? "success" : "failed");
+
+ Platform.runLater(() -> {
+ TravisCIServiceRootItem.this.items.clear();
+ TravisCIServiceRootItem.this.items.setAll(items.stream().map((b) -> new TravisBuild(b, TravisCIServiceRootItem.this)).collect(Collectors.toList()));
+ });
+
+// try {
+// Thread.sleep(10_000);
+// } catch (InterruptedException e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// }
+// }
+ }
+ };
+ t.setDaemon(true);
+ t.start();
+ }
+
+ @Override
+ public CharSequence getLabel() {
+ return "Travis";
+ }
+
+ @Override
+ public URI getIcon() {
+ return null;
+ }
+
+ @Override
+ public Object getDomainObject() {
+ return instance;
+ }
+
+ @Override
+ public String getOpenCommandId() {
+ return "org.eclipse.fx.code.compensator.project.ci.travis.command.openTravisViewer";
+ }
+
+ @Override
+ public boolean isDeletable() {
+ return true;
+ }
+
+ @Override
+ public ObservableList<ProjectNavigatorItem> getChildren() {
+ return items;
+ }
+
+ @Override
+ public boolean isLeaf() {
+ return false;
+ }
+
+ @Override
+ public ProjectNavigatorItem getParent() {
+ return parent;
+ }
+
+ static class TravisBuild implements ProjectNavigatorItem {
+
+ private Build build;
+
+ private ProjectNavigatorItem parent;
+
+ public TravisBuild(Build build, ProjectNavigatorItem parent) {
+ this.build = build;
+ this.parent = parent;
+ }
+
+ @Override
+ public CharSequence getLabel() {
+ return build.number();
+ }
+
+ @Override
+ public URI getIcon() {
+ return "passed".equals(build.state()) ? URI.createPlatformPluginURI("org.eclipse.fx.code.compensator.project.ci.travis", "icons/security-high.png") : URI.createPlatformPluginURI("org.eclipse.fx.code.compensator.project.ci.travis", "icons/security-low.png");
+ }
+
+ @Override
+ public Object getDomainObject() {
+ return build;
+ }
+
+ @Override
+ public String getOpenCommandId() {
+ return null;
+ }
+
+ @Override
+ public boolean isDeletable() {
+ return false;
+ }
+
+ @Override
+ public ObservableList<ProjectNavigatorItem> getChildren() {
+ return FXCollections.emptyObservableList();
+ }
+
+ @Override
+ public boolean isLeaf() {
+ return true;
+ }
+
+ @Override
+ public ProjectNavigatorItem getParent() {
+ return parent;
+ }
+
+ }
+}
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisProjectViewer.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisProjectViewer.java
new file mode 100644
index 000000000..d2124e8de
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisProjectViewer.java
@@ -0,0 +1,26 @@
+package org.eclipse.fx.code.compensator.project.ci.travis;
+
+import javafx.event.EventHandler;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.web.WebErrorEvent;
+import javafx.scene.web.WebView;
+
+import javax.annotation.PostConstruct;
+
+public class TravisProjectViewer {
+ @PostConstruct
+ void init(BorderPane parent) {
+ WebView v = new WebView();
+ v.getEngine().setOnError(new EventHandler<WebErrorEvent>() {
+
+ @Override
+ public void handle(WebErrorEvent event) {
+ System.err.println(event);
+ }
+ });
+ v.getEngine().load("https://travis-ci.org/tomsontom/compensator-samples");
+// v.getEngine().load("http://www.google.com");
+// v.getEngine().load("https://travis-ci.org");
+ parent.setCenter(v);
+ }
+} \ No newline at end of file
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/NewClassAction.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/NewClassAction.java
index 64b7794d6..ea4088c21 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/NewClassAction.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/NewClassAction.java
@@ -22,7 +22,7 @@ import org.eclipse.fx.code.compensator.project.ProjectNavigatorItem;
import org.eclipse.fx.code.compensator.project.jdt.internal.JDTPackageFragmentRootItem;
import org.eclipse.fx.code.compensator.project.jdt.internal.JDTPathItem;
import org.eclipse.fx.core.command.CommandService;
-import org.eclipse.fx.ui.controls.stage.DefaultWindowPane;
+import org.eclipse.fx.ui.controls.stage.DefaultTrimmedWindowPane;
import org.eclipse.fx.ui.di.FXMLBuilder;
import org.eclipse.fx.ui.di.FXMLBuilder.Data;
import org.eclipse.fx.ui.di.FXMLLoader;
@@ -44,8 +44,8 @@ public class NewClassAction {
return data.getNode();
}
- protected org.eclipse.fx.ui.controls.stage.WindowPane getCustomWindowPane() {
- return new DefaultWindowPane(new StackPane());
+ protected DefaultTrimmedWindowPane getCustomWindowPane() {
+ return new DefaultTrimmedWindowPane(new StackPane());
}
};
if( dialog.open() == TitleAreaDialog.OK_BUTTON ) {
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/xtend-gen/org/eclipse/fx/code/compensator/project/jdt/handler/.NewClassTemplate.xtendbin b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/xtend-gen/org/eclipse/fx/code/compensator/project/jdt/handler/.NewClassTemplate.xtendbin
index aaeefbfe6..4db1eebea 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/xtend-gen/org/eclipse/fx/code/compensator/project/jdt/handler/.NewClassTemplate.xtendbin
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/xtend-gen/org/eclipse/fx/code/compensator/project/jdt/handler/.NewClassTemplate.xtendbin
Binary files differ
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.vcs.git/src/org/eclipse/fx/code/compensator/project/vcs/git/GitVersionControlService.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.vcs.git/src/org/eclipse/fx/code/compensator/project/vcs/git/GitVersionControlService.java
index b37c0dd9b..b13dc9ed0 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.project.vcs.git/src/org/eclipse/fx/code/compensator/project/vcs/git/GitVersionControlService.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.vcs.git/src/org/eclipse/fx/code/compensator/project/vcs/git/GitVersionControlService.java
@@ -13,7 +13,6 @@ import org.eclipse.fx.code.compensator.project.vcs.VCSRepositoryInstance;
import org.eclipse.fx.code.compensator.project.vcs.VCSRootNavigatorItem;
import org.eclipse.fx.code.compensator.project.vcs.VersionControlService;
import org.eclipse.fx.core.ProgressReporter;
-import org.eclipse.fx.core.ReturnValue;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.errors.UnsupportedCredentialItem;
@@ -40,7 +39,7 @@ public class GitVersionControlService implements VersionControlService {
}
@Override
- public ReturnValue<URI> cloneRepository(Path localDirectory, String url, String username,
+ public URI cloneRepository(Path localDirectory, String url, String username,
String password, ProgressReporter reporter) {
if( url.startsWith("ssh:") ) {
url = "ssh://"+ username + "@" + url.substring("ssh://".length());
@@ -54,9 +53,10 @@ public class GitVersionControlService implements VersionControlService {
if( result == null ) {
throw new IllegalStateException();
}
- return ReturnValue.ok(localDirectory.toUri());
+ return localDirectory.toUri();
} catch (GitAPIException e) {
- return ReturnValue.error("Unable to clone repository", e);
+// return ReturnValue.error("Unable to clone repository", e);
+ return null;
} finally {
if( result != null ) {
result.close();
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/css/dark.css b/experimental/compensator/org.eclipse.fx.code.compensator.project/css/dark.css
index c5bc04ed6..3b3507db0 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.project/css/dark.css
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/css/dark.css
@@ -10,3 +10,6 @@
-fx-image: url(icons/64/prj_obj.png);
}
+#open-project-dialog .efx-dialog-title-image {
+ -fx-image: url(icons/64/prj_obj.png);
+} \ No newline at end of file
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/css/default.css b/experimental/compensator/org.eclipse.fx.code.compensator.project/css/default.css
index c5bc04ed6..3b3507db0 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.project/css/default.css
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/css/default.css
@@ -10,3 +10,6 @@
-fx-image: url(icons/64/prj_obj.png);
}
+#open-project-dialog .efx-dialog-title-image {
+ -fx-image: url(icons/64/prj_obj.png);
+} \ No newline at end of file
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ci/CIServiceInstance.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ci/CIServiceInstance.java
new file mode 100644
index 000000000..9ef784dc7
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ci/CIServiceInstance.java
@@ -0,0 +1,9 @@
+package org.eclipse.fx.code.compensator.project.ci;
+
+import org.eclipse.fx.code.compensator.project.InstanceProject;
+
+public interface CIServiceInstance {
+
+ public CIService getService();
+ public InstanceProject getProject();
+}
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ci/CIServiceRootNavigatorItem.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ci/CIServiceRootNavigatorItem.java
new file mode 100644
index 000000000..a6b852588
--- /dev/null
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ci/CIServiceRootNavigatorItem.java
@@ -0,0 +1,7 @@
+package org.eclipse.fx.code.compensator.project.ci;
+
+import org.eclipse.fx.code.compensator.project.ProjectNavigatorItem;
+
+public interface CIServiceRootNavigatorItem extends ProjectNavigatorItem {
+
+}
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/NewLocalProject.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/NewLocalProject.java
index 8ec00a198..a00b34e8d 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/NewLocalProject.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/NewLocalProject.java
@@ -29,7 +29,7 @@ import org.eclipse.fx.core.URI;
import org.eclipse.fx.core.command.CommandService;
import org.eclipse.fx.core.di.ScopedObjectFactory;
import org.eclipse.fx.core.di.Service;
-import org.eclipse.fx.ui.controls.stage.DefaultWindowPane;
+import org.eclipse.fx.ui.controls.stage.DefaultTrimmedWindowPane;
import org.eclipse.fx.ui.dialogs.TitleAreaDialog;
import org.eclipse.fx.ui.panes.GridData;
import org.eclipse.fx.ui.panes.GridLayoutPane;
@@ -62,8 +62,8 @@ public class NewLocalProject {
return NewLocalProject.this.createDialogContent(projectServices, versionControl, loader);
}
- protected org.eclipse.fx.ui.controls.stage.WindowPane getCustomWindowPane() {
- return new DefaultWindowPane(new StackPane());
+ protected DefaultTrimmedWindowPane getCustomWindowPane() {
+ return new DefaultTrimmedWindowPane(new StackPane());
}
};
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenProjectDialog.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenProjectDialog.java
index 6c73a27d8..9354904a8 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenProjectDialog.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenProjectDialog.java
@@ -3,11 +3,7 @@ package org.eclipse.fx.code.compensator.project.internal.commands;
import java.util.Collections;
import java.util.List;
-import javafx.collections.FXCollections;
-import javafx.scene.Node;
-import javafx.scene.control.ListView;
-import javafx.scene.layout.StackPane;
-import javafx.stage.Stage;
+import javax.inject.Inject;
import org.eclipse.e4.core.di.annotations.Execute;
import org.eclipse.fx.code.compensator.model.workbench.Project;
@@ -15,35 +11,51 @@ import org.eclipse.fx.code.compensator.model.workbench.Workbench;
import org.eclipse.fx.code.compensator.project.ProjectService;
import org.eclipse.fx.core.command.CommandService;
import org.eclipse.fx.core.di.Service;
+import org.eclipse.fx.ui.controls.dialog.TitleAreaDialog;
import org.eclipse.fx.ui.controls.list.SimpleListCell;
-import org.eclipse.fx.ui.controls.stage.DefaultWindowPane;
import org.eclipse.fx.ui.controls.styledtext.StyledString;
import org.eclipse.fx.ui.controls.styledtext.StyledStringSegment;
-import org.eclipse.fx.ui.dialogs.TitleAreaDialog;
+//import org.eclipse.fx.ui.dialogs.TitleAreaDialog;
+import org.eclipse.fx.ui.services.dialog.LightWeightDialogService;
+import org.eclipse.fx.ui.services.dialog.LightWeightDialogService.ModalityScope;
+
+import javafx.collections.FXCollections;
+import javafx.scene.control.ListView;
public class OpenProjectDialog {
@Execute
- public void open(Stage parent, Workbench workbench, CommandService cmdService, @Service List<ProjectService> projectServiceList) {
- ListView<Project> list = new ListView<>();
- list.setMinWidth(600);
- list.setCellFactory(v -> new SimpleListCell<Project>( p -> labelExtractor(p, projectServiceList), p -> cssProvider(p,projectServiceList)));
- list.setItems(FXCollections.observableArrayList(workbench.getProjectList()));
-
- TitleAreaDialog dialog = new TitleAreaDialog(parent,"Open project","Open project","Open an existing project","open_project_dialog") {
-
- @Override
- protected Node createDialogContent() {
- return list;
- }
-
- protected org.eclipse.fx.ui.controls.stage.WindowPane getCustomWindowPane() {
- return new DefaultWindowPane(new StackPane());
- }
- };
-
- if( dialog.open() == TitleAreaDialog.OK_BUTTON ) {
- if( list.getSelectionModel().getSelectedItem() != null ) {
- cmdService.execute("org.eclipse.fx.code.compensator.app.command.openproject", Collections.singletonMap("projectId", list.getSelectionModel().getSelectedItem().getProjectId()));
+ public void open(LightWeightDialogService dialogService) {
+ dialogService.openDialog(OpenProjectDialogImpl.class, ModalityScope.WINDOW);
+ }
+
+ static class OpenProjectDialogImpl extends TitleAreaDialog {
+ private ListView<Project> list;
+ private final CommandService cmdService;
+
+ @Inject
+ public OpenProjectDialogImpl(Workbench workbench, CommandService cmdService,
+ @Service List<ProjectService> projectServiceList) {
+ super("Open project", "Open project", "Open an existing project");
+ this.cmdService = cmdService;
+ addDefaultButtons();
+ setMaxWidth(500);
+ setMaxHeight(500);
+ setId("open-project-dialog");
+
+ list = new ListView<>();
+ list.setMinWidth(600);
+ list.setCellFactory(v -> new SimpleListCell<Project>(p -> labelExtractor(p, projectServiceList),
+ p -> cssProvider(p, projectServiceList)));
+ list.setItems(FXCollections.observableArrayList(workbench.getProjectList()));
+ setClientArea(list);
+ }
+
+ @Override
+ protected void handleOk() {
+ if (list.getSelectionModel().getSelectedItem() != null) {
+ cmdService.execute("org.eclipse.fx.code.compensator.app.command.openproject", Collections
+ .singletonMap("projectId", list.getSelectionModel().getSelectedItem().getProjectId()));
+ super.handleOk();
}
}
}
@@ -51,11 +63,15 @@ public class OpenProjectDialog {
private static CharSequence labelExtractor(Project p, List<ProjectService> services) {
StyledString s = new StyledString();
s.getSegmentList().add(new StyledStringSegment(p.getName(), "cell-text-default"));
- s.getSegmentList().add(new StyledStringSegment(" - " + services.stream().filter( ps -> ps.applies(p)).findFirst().map(ps -> ps.getLabel()).get(), "cell-text-extra"));
+ s.getSegmentList()
+ .add(new StyledStringSegment(" - "
+ + services.stream().filter(ps -> ps.applies(p)).findFirst().map(ps -> ps.getLabel()).get(),
+ "cell-text-extra"));
return s;
}
private static List<String> cssProvider(Project p, List<ProjectService> services) {
- return Collections.singletonList(services.stream().filter( ps -> ps.applies(p)).findFirst().map(ps -> ps.getProjectType()).get());
+ return Collections.singletonList(
+ services.stream().filter(ps -> ps.applies(p)).findFirst().map(ps -> ps.getProjectType()).get());
}
} \ No newline at end of file
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/vcs/VersionControlService.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/vcs/VersionControlService.java
index 3c3a68a94..6844549e0 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/vcs/VersionControlService.java
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/vcs/VersionControlService.java
@@ -7,13 +7,12 @@ import org.eclipse.fx.code.compensator.model.workbench.VCSRepository;
import org.eclipse.fx.code.compensator.project.InstanceProject;
import org.eclipse.fx.code.compensator.project.ProjectNavigatorItem;
import org.eclipse.fx.core.ProgressReporter;
-import org.eclipse.fx.core.ReturnValue;
public interface VersionControlService {
public String getId();
public String getLabel();
public String getIconURI();
- public ReturnValue<URI> cloneRepository(Path localDirectory, String url, String username, String password, ProgressReporter reporter);
+ public URI cloneRepository(Path localDirectory, String url, String username, String password, ProgressReporter reporter);
public VCSRootNavigatorItem mapRepository(ProjectNavigatorItem parent, VCSRepositoryInstance instance);
public VCSRepositoryInstance createRepository(InstanceProject project, VCSRepository repository, String uri);
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.target.releng/compensator.target b/experimental/compensator/org.eclipse.fx.code.compensator.target.releng/compensator.target
index d2a9c080b..4eb72631c 100644
--- a/experimental/compensator/org.eclipse.fx.code.compensator.target.releng/compensator.target
+++ b/experimental/compensator/org.eclipse.fx.code.compensator.target.releng/compensator.target
@@ -1,24 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="compensator-target" sequenceNumber="60">
+<?pde version="3.8"?><target name="compensator-target" sequenceNumber="87">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.fx.code.compensator.target.feature.feature.group" version="1.0.0.201502161457"/>
+<unit id="org.eclipse.fx.code.compensator.target.feature.feature.group" version="1.0.0.201505080930"/>
<repository location="http://download.eclipse.org/efxclipse/compensator/target/site"/>
</location>
</locations>
<includeBundles>
+<plugin id="ch.qos.logback.classic"/>
+<plugin id="ch.qos.logback.classic.source"/>
+<plugin id="ch.qos.logback.core"/>
+<plugin id="ch.qos.logback.core.source"/>
+<plugin id="ch.qos.logback.slf4j"/>
+<plugin id="ch.qos.logback.slf4j.source"/>
<plugin id="com.google.gson" version="2.1.0.v201303041604"/>
+<plugin id="com.google.gson" version="2.2.4.v201311231704"/>
<plugin id="com.google.guava"/>
<plugin id="com.google.guava.source"/>
<plugin id="com.google.inject"/>
<plugin id="com.google.inject.source"/>
-<plugin id="com.ibm.icu"/>
<plugin id="com.ibm.icu.base"/>
-<plugin id="com.ibm.icu.source"/>
+<plugin id="com.ibm.icu.base.source"/>
<plugin id="com.jcraft.jsch"/>
<plugin id="javaewah"/>
<plugin id="javax.activation"/>
-<plugin id="javax.annotation"/>
+<plugin id="javax.annotation.jre"/>
<plugin id="javax.el"/>
<plugin id="javax.el.source"/>
<plugin id="javax.inject"/>
@@ -214,6 +220,7 @@
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.equinox.registry.source"/>
<plugin id="org.eclipse.equinox.security"/>
+<plugin id="org.eclipse.equinox.security.macosx"/>
<plugin id="org.eclipse.equinox.security.source"/>
<plugin id="org.eclipse.equinox.simpleconfigurator"/>
<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
@@ -245,10 +252,6 @@
<plugin id="org.eclipse.fx.emf.edit.ui.source"/>
<plugin id="org.eclipse.fx.formats.svg"/>
<plugin id="org.eclipse.fx.formats.svg.source"/>
-<plugin id="org.eclipse.fx.javafx"/>
-<plugin id="org.eclipse.fx.javafx.source"/>
-<plugin id="org.eclipse.fx.osgi"/>
-<plugin id="org.eclipse.fx.osgi.source"/>
<plugin id="org.eclipse.fx.osgi.util"/>
<plugin id="org.eclipse.fx.osgi.util.source"/>
<plugin id="org.eclipse.fx.ui.animation"/>
@@ -289,7 +292,6 @@
<plugin id="org.eclipse.jdt.core"/>
<plugin id="org.eclipse.jdt.core.source"/>
<plugin id="org.eclipse.jdt.debug"/>
-<plugin id="org.eclipse.jdt.junit"/>
<plugin id="org.eclipse.jdt.junit.core"/>
<plugin id="org.eclipse.jdt.junit.runtime"/>
<plugin id="org.eclipse.jdt.junit4.runtime"/>
@@ -311,6 +313,7 @@
<plugin id="org.eclipse.jetty.util.source"/>
<plugin id="org.eclipse.jgit"/>
<plugin id="org.eclipse.osgi"/>
+<plugin id="org.eclipse.osgi.compatibility.state"/>
<plugin id="org.eclipse.osgi.services"/>
<plugin id="org.eclipse.osgi.services.source"/>
<plugin id="org.eclipse.osgi.source"/>
@@ -328,16 +331,22 @@
<plugin id="org.eclipse.xtext.xbase.lib"/>
<plugin id="org.eclipse.xtext.xbase.lib.source"/>
<plugin id="org.hamcrest.core"/>
+<plugin id="org.hamcrest.core.source"/>
<plugin id="org.junit"/>
+<plugin id="org.junit.source"/>
<plugin id="org.objectweb.asm"/>
<plugin id="org.sat4j.core"/>
<plugin id="org.sat4j.pb"/>
<plugin id="org.slf4j.api"/>
<plugin id="org.slf4j.ext"/>
<plugin id="org.slf4j.ext.source"/>
+<plugin id="org.slf4j.impl.log4j12"/>
+<plugin id="org.slf4j.impl.log4j12.source"/>
<plugin id="org.slf4j.jcl"/>
<plugin id="org.slf4j.jcl.source"/>
<plugin id="org.slf4j.jul"/>
<plugin id="org.slf4j.jul.source"/>
+<plugin id="org.slf4j.log4j"/>
+<plugin id="org.slf4j.log4j.source"/>
</includeBundles>
</target>

Back to the top