Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

e(fx)clipse samples and interoperability fix for nativeLaunchers #71

Merged
merged 4 commits into from
Sep 9, 2015
Merged

e(fx)clipse samples and interoperability fix for nativeLaunchers #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0bcbb1
Fixed efxclipse interoperability with native launchers #53
mcmil Jun 3, 2015
54e9d4d
Added e(fx)clipse samples
mcmil Jun 3, 2015
0ae0686
Wiki info for e(fx)clipse sample
mcmil Jun 3, 2015
dddbf63
Merge branch 'master' of https://github.com/akhikhl/wuff
mcmil Jul 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions examples/EfxclipseApp-1/MyEfxclipseApp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
buildscript {
repositories {
mavenLocal()
jcenter()
maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' }
}

dependencies {
classpath "org.akhikhl.wuff:wuff-plugin:$wuff_version"
}
}

repositories {
mavenLocal()
jcenter()
maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' }
}

apply plugin: 'java'
apply plugin: 'org.akhikhl.wuff.efxclipse-app'

wuff {
selectedEclipseVersion = 'efxclipse-1.2'
}

products {
nativeLauncher = false
}
1 change: 1 addition & 0 deletions examples/EfxclipseApp-1/MyEfxclipseApp/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
wuff_version=0.0.14
20 changes: 20 additions & 0 deletions examples/EfxclipseApp-1/MyEfxclipseApp/src/main/java/myefxclipseapp/SamplePart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package myefxclipseapp;

import javafx.scene.control.Label;
import javafx.scene.layout.BorderPane;
import org.eclipse.e4.core.contexts.ContextInjectionFactory;
import org.eclipse.e4.core.contexts.IEclipseContext;

import javax.annotation.PostConstruct;
import javax.inject.Inject;

public class SamplePart {

@Inject
private IEclipseContext context;

@PostConstruct
public void initialize(BorderPane borderPane) {
borderPane.setCenter(new Label("This is a Java FX control"));
}
}
17 changes: 17 additions & 0 deletions examples/EfxclipseApp-1/MyEfxclipseApp/src/main/resources/Application.e4xmi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="ASCII"?>
<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xsi:schemaLocation="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic http://www.eclipse.org/ui/2010/UIModel/application#//ui/basic http://www.eclipse.org/ui/2010/UIModel/application/ui/menu http://www.eclipse.org/ui/2010/UIModel/application#//ui/menu" xmi:id="_GRxcMXk5Ed-55voCTyIpVQ">
<children xsi:type="basic:TrimmedWindow" xmi:id="_SeXUAe8EEd6FC9cDb6iV7g" elementId="_SeXUAe8EEd6FC9cDb6iV7g" label="MyEfxclipseApp" x="20" y="20" width="700" height="570">
<children xsi:type="basic:PartSashContainer" xmi:id="_SeXUCu8EEd6FC9cDb6iV7g" elementId="_SeXUCu8EEd6FC9cDb6iV7g" horizontal="true">
<children xsi:type="basic:PartStack" xmi:id="_SeXUC-8EEd6FC9cDb6iV7g" elementId="_SeXUC-8EEd6FC9cDb6iV7g" containerData="30">
<children xsi:type="basic:Part" xmi:id="_SeXUDO8EEd6FC9cDb6iV7g" elementId="SamplePart" contributionURI="bundleclass://MyEfxclipseApp/myefxclipseapp.SamplePart" label="FX Part" tooltip="FX"/>
</children>
</children>
</children>
<addons xmi:id="_XGB3wPZlEd-XstlTZ6nTXg" elementId="org.eclipse.e4.core.commands.service" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
<addons xmi:id="_XGB3wPZlEd-XstlTZ6nTXh" elementId="org.eclipse.e4.ui.contexts.service" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
<addons xmi:id="_ViIQQBnuEeKroetix5qA3A" elementId="app.addon.0" contributionURI="bundleclass://org.eclipse.fx.ui.keybindings.e4/org.eclipse.fx.ui.keybindings.e4.BindingServiceAddon"/>
<addons xmi:id="_LK0NgPZmEd-XstlTZ6nTXj" elementId="org.eclipse.e4.ui.workbench.commands.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"/>
<addons xmi:id="_LK0NgPZmEd-XstlTZ6nTXk" elementId="org.eclipse.e4.ui.workbench.contexts.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"/>
<addons xmi:id="_W5TekBnuEeKroetix5qA3A" elementId="app.addon.1" contributionURI="bundleclass://org.eclipse.fx.ui.keybindings.e4/org.eclipse.fx.ui.keybindings.e4.BindingProcessingAddon"/>
<addons xmi:id="_3c-AUL89EeKIBMNbSVZPsw" elementId="org.eclipse.e4.ui.workbench.addons.HandlerProcessingAddon" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/>
</application:Application>
Empty file added examples/EfxclipseApp-1/MyEfxclipseApp/src/main/resources/css/default.css
View file
Open in desktop
Empty file.
32 changes: 32 additions & 0 deletions examples/EfxclipseApp-1/MyEfxclipseApp/src/main/resources/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<plugin>
<extension
id="product"
point="org.eclipse.core.runtime.products">
<product
application="org.eclipse.fx.ui.workbench.fx.application"
name="MyEfxclipseApp">
<property
name="appName"
value="e(fx)clipse skeleton">
</property>
<property
name="applicationXMI"
value="MyEfxclipseApp/Application.e4xmi">
</property>
<property
name="cssTheme"
value="default">
</property>
</product>
</extension>
<extension
point="org.eclipse.fx.ui.theme">
<theme
basestylesheet="css/default.css"
id="default"
name="Default">
</theme>
</extension>
</plugin>
1 change: 1 addition & 0 deletions examples/EfxclipseApp-1/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
See wiki: [Create first e(fx)clipse app](../../../../wiki/Create-first-Efxclipse-app).
14 changes: 14 additions & 0 deletions examples/EfxclipseApp-2/MyEfxclipseApp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apply plugin: 'java'
apply plugin: 'org.akhikhl.wuff.efxclipse-app'

dependencies{
compile project(':MyPlugin')
}

wuff {
selectedEclipseVersion = 'efxclipse-1.2'
}

products {
nativeLauncher = false
}
23 changes: 23 additions & 0 deletions examples/EfxclipseApp-2/MyEfxclipseApp/src/main/java/myefxclipseapp/SamplePart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package myefxclipseapp;

import javafx.scene.control.Label;
import javafx.scene.layout.BorderPane;
import org.eclipse.e4.core.contexts.ContextInjectionFactory;
import org.eclipse.e4.core.contexts.IEclipseContext;

import javax.annotation.PostConstruct;
import javax.inject.Inject;

import myplugin.SampleService;

public class SamplePart {

@Inject
private IEclipseContext context;

@PostConstruct
public void initialize(BorderPane borderPane) {
Label controlLabel = new Label("This is a Java FX control " + new SampleService().getName());
borderPane.setCenter(controlLabel);
}
}
17 changes: 17 additions & 0 deletions examples/EfxclipseApp-2/MyEfxclipseApp/src/main/resources/Application.e4xmi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="ASCII"?>
<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xsi:schemaLocation="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic http://www.eclipse.org/ui/2010/UIModel/application#//ui/basic http://www.eclipse.org/ui/2010/UIModel/application/ui/menu http://www.eclipse.org/ui/2010/UIModel/application#//ui/menu" xmi:id="_GRxcMXk5Ed-55voCTyIpVQ">
<children xsi:type="basic:TrimmedWindow" xmi:id="_SeXUAe8EEd6FC9cDb6iV7g" elementId="_SeXUAe8EEd6FC9cDb6iV7g" label="MyEfxclipseApp" x="20" y="20" width="700" height="570">
<children xsi:type="basic:PartSashContainer" xmi:id="_SeXUCu8EEd6FC9cDb6iV7g" elementId="_SeXUCu8EEd6FC9cDb6iV7g" horizontal="true">
<children xsi:type="basic:PartStack" xmi:id="_SeXUC-8EEd6FC9cDb6iV7g" elementId="_SeXUC-8EEd6FC9cDb6iV7g" containerData="30">
<children xsi:type="basic:Part" xmi:id="_SeXUDO8EEd6FC9cDb6iV7g" elementId="SamplePart" contributionURI="bundleclass://MyEfxclipseApp/myefxclipseapp.SamplePart" label="FX Part" tooltip="FX"/>
</children>
</children>
</children>
<addons xmi:id="_XGB3wPZlEd-XstlTZ6nTXg" elementId="org.eclipse.e4.core.commands.service" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
<addons xmi:id="_XGB3wPZlEd-XstlTZ6nTXh" elementId="org.eclipse.e4.ui.contexts.service" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
<addons xmi:id="_ViIQQBnuEeKroetix5qA3A" elementId="app.addon.0" contributionURI="bundleclass://org.eclipse.fx.ui.keybindings.e4/org.eclipse.fx.ui.keybindings.e4.BindingServiceAddon"/>
<addons xmi:id="_LK0NgPZmEd-XstlTZ6nTXj" elementId="org.eclipse.e4.ui.workbench.commands.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"/>
<addons xmi:id="_LK0NgPZmEd-XstlTZ6nTXk" elementId="org.eclipse.e4.ui.workbench.contexts.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"/>
<addons xmi:id="_W5TekBnuEeKroetix5qA3A" elementId="app.addon.1" contributionURI="bundleclass://org.eclipse.fx.ui.keybindings.e4/org.eclipse.fx.ui.keybindings.e4.BindingProcessingAddon"/>
<addons xmi:id="_3c-AUL89EeKIBMNbSVZPsw" elementId="org.eclipse.e4.ui.workbench.addons.HandlerProcessingAddon" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/>
</application:Application>
Empty file added examples/EfxclipseApp-2/MyEfxclipseApp/src/main/resources/css/default.css
View file
Open in desktop
Empty file.
32 changes: 32 additions & 0 deletions examples/EfxclipseApp-2/MyEfxclipseApp/src/main/resources/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<plugin>
<extension
id="product"
point="org.eclipse.core.runtime.products">
<product
application="org.eclipse.fx.ui.workbench.fx.application"
name="MyEfxclipseApp">
<property
name="appName"
value="e(fx)clipse skeleton">
</property>
<property
name="applicationXMI"
value="MyEfxclipseApp/Application.e4xmi">
</property>
<property
name="cssTheme"
value="default">
</property>
</product>
</extension>
<extension
point="org.eclipse.fx.ui.theme">
<theme
basestylesheet="css/default.css"
id="default"
name="Default">
</theme>
</extension>
</plugin>
1 change: 1 addition & 0 deletions examples/EfxclipseApp-2/MyPlugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apply plugin: 'org.akhikhl.wuff.osgi-bundle'
7 changes: 7 additions & 0 deletions examples/EfxclipseApp-2/MyPlugin/src/main/java/myplugin/SampleService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package myplugin;

public class SampleService {
public String getName() {
return "Service works!";
}
}
2 changes: 2 additions & 0 deletions examples/EfxclipseApp-2/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Currently no tutorial. See wiki: [Create OSGi bundle and use it in Equinox app](../../../../wiki/Create-OSGi-bundle-and-use-it-in-Equinox-app).

20 changes: 20 additions & 0 deletions examples/EfxclipseApp-2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
buildscript {
repositories {
mavenLocal()
jcenter()
maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' }
}

dependencies {
classpath "org.akhikhl.wuff:wuff-plugin:$wuff_version"
}
}

subprojects {
repositories {
mavenLocal()
jcenter()
maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' }
}
}

1 change: 1 addition & 0 deletions examples/EfxclipseApp-2/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
wuff_version=0.0.14
2 changes: 2 additions & 0 deletions examples/EfxclipseApp-2/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include 'MyPlugin'
include 'MyEfxclipseApp'
2 changes: 2 additions & 0 deletions libs/wuff-plugin/src/main/resources/org/akhikhl/wuff/defaultConfig.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,8 @@ wuff {
}
}

project.products.nativeLauncher = false

project.dependencies {
osgiExtension "${eclipseMavenGroup}:org.eclipse.fx.osgi:+"
osgiExtension "pl.cmil.wuff.bundles:javax.annotation-osgi-extension:1.0"
Expand Down