Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2015-06-24 18:45:51 +0000
committerTom Schindl2015-06-24 18:45:51 +0000
commit3251f6e1584b1d5b1f5a35a57a2c57436125a14f (patch)
treea8b14fd4c120aa6fb5b7b4591ae826221e30aad3
parenta97a070b092bd61e14bebad332bb1d9970d629e3 (diff)
downloadorg.eclipse.rap.incubator.e4-3251f6e1584b1d5b1f5a35a57a2c57436125a14f.tar.gz
org.eclipse.rap.incubator.e4-3251f6e1584b1d5b1f5a35a57a2c57436125a14f.tar.xz
org.eclipse.rap.incubator.e4-3251f6e1584b1d5b1f5a35a57a2c57436125a14f.zip
adding perspective sample with shared parts
-rw-r--r--demo/org.eclipse.rap.e4.demo/Application.e4xmi76
-rw-r--r--demo/org.eclipse.rap.e4.demo/META-INF/MANIFEST.MF2
-rw-r--r--demo/org.eclipse.rap.e4.demo/dev_org.eclipse.rap.e4.demo.launch2
-rw-r--r--demo/org.eclipse.rap.e4.demo/src/org/eclipse/rap/e4/demo/handlers/SwitchPerspectives.java16
-rw-r--r--demo/org.eclipse.rap.e4.demo/src/org/eclipse/rap/e4/demo/parts/NLSSamplePart.java8
-rw-r--r--demo/org.eclipse.rap.e4.demo/src/org/eclipse/rap/e4/demo/parts/SharedPart.java24
6 files changed, 92 insertions, 36 deletions
diff --git a/demo/org.eclipse.rap.e4.demo/Application.e4xmi b/demo/org.eclipse.rap.e4.demo/Application.e4xmi
index b881013..127f25f 100644
--- a/demo/org.eclipse.rap.e4.demo/Application.e4xmi
+++ b/demo/org.eclipse.rap.e4.demo/Application.e4xmi
@@ -1,39 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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" xmi:id="_-j-GgKBNEeODEs7-bWqIxA" elementId="org.eclipse.e4.ide.application" bindingContexts="_-j-tkKBNEeODEs7-bWqIxA">
+<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:advanced="http://www.eclipse.org/ui/2010/UIModel/application/ui/advanced" 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" xmi:id="_-j-GgKBNEeODEs7-bWqIxA" elementId="org.eclipse.e4.ide.application" bindingContexts="_-j-tkKBNEeODEs7-bWqIxA">
<children xsi:type="basic:TrimmedWindow" xmi:id="_-j-GgaBNEeODEs7-bWqIxA" label="%trimmedwindow.label.1" width="500" height="400">
- <children xsi:type="basic:PartSashContainer" xmi:id="_5fAc0KLgEeSGUftsJTPCBQ" elementId="org.eclipse.rap.e4.demo.partsashcontainer.2">
- <children xsi:type="basic:PartSashContainer" xmi:id="_FPvvQKCAEeOCJ5u74o02rg" elementId="org.eclipse.rap.e4.demo.partsashcontainer.0" containerData="100" horizontal="true">
- <children xsi:type="basic:PartStack" xmi:id="_8eKmwKJKEeSZFtDwdo07Rg" elementId="org.eclipse.rap.e4.demo.partstack.1" containerData="100">
- <children xsi:type="basic:Part" xmi:id="_FzadAKCAEeOCJ5u74o02rg" elementId="org.eclipse.rap.e4.demo.part.0" containerData="100" label="Empty Left" iconURI="platform:/plugin/org.eclipse.rap.e4.demo/icons/folder_user.png"/>
- </children>
- <children xsi:type="basic:PartStack" xmi:id="_M-uNIKCAEeOCJ5u74o02rg" elementId="org.eclipse.rap.e4.demo.partstack.0" containerData="300">
- <children xsi:type="basic:Part" xmi:id="_GwxdIKCAEeOCJ5u74o02rg" elementId="org.eclipse.rap.e4.demo.part.1" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.parts.EventSamplePart" label="%part.label.1" iconURI="platform:/plugin/org.eclipse.rap.e4.demo/icons/user_delete.png">
- <toolbar xmi:id="_HHjAcOGREeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.toolbar.1">
- <children xsi:type="menu:DirectToolItem" xmi:id="_Hh9EgOGREeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.directtoolitem.1" label="%directtoolitem.label.1" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.handlers.HelloWorldHandler"/>
- </toolbar>
- </children>
- <children xsi:type="basic:Part" xmi:id="_rk6l0KhAEeO0Haj3z6o3PQ" elementId="org.eclipse.rap.e4.demo.part.2" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.parts.PreferenceSamplePart" label="%part.label.2" iconURI="platform:/plugin/org.eclipse.rap.e4.demo/icons/user_add.png">
- <menus xmi:id="_EIg8IOGUEeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.menu.2">
- <tags>ViewMenu</tags>
- <children xsi:type="menu:DirectMenuItem" xmi:id="_HAt4UOGUEeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.directmenuitem.1" label="%directmenuitem.label.2" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.handlers.HelloWorldHandler"/>
- </menus>
+ <children xsi:type="advanced:PerspectiveStack" xmi:id="_X6m9cBqfEeW5c6mkiizldg" elementId="org.eclipse.rap.e4.demo.perspectivestack.0">
+ <children xsi:type="advanced:Perspective" xmi:id="_YZLIwBqfEeW5c6mkiizldg" elementId="org.eclipse.rap.e4.demo.perspective.0" label="">
+ <children xsi:type="basic:PartSashContainer" xmi:id="_5fAc0KLgEeSGUftsJTPCBQ" elementId="org.eclipse.rap.e4.demo.partsashcontainer.2">
+ <children xsi:type="basic:PartSashContainer" xmi:id="_FPvvQKCAEeOCJ5u74o02rg" elementId="org.eclipse.rap.e4.demo.partsashcontainer.0" containerData="100" horizontal="true">
+ <children xsi:type="basic:PartStack" xmi:id="_8eKmwKJKEeSZFtDwdo07Rg" elementId="org.eclipse.rap.e4.demo.partstack.1" containerData="100">
+ <children xsi:type="basic:Part" xmi:id="_FzadAKCAEeOCJ5u74o02rg" elementId="org.eclipse.rap.e4.demo.part.0" containerData="100" label="Empty Left" iconURI="platform:/plugin/org.eclipse.rap.e4.demo/icons/folder_user.png"/>
+ <children xsi:type="advanced:Placeholder" xmi:id="_w0yjEBqfEeW5c6mkiizldg" elementId="org.eclipse.rap.e4.demo.placeholder.0" ref="_hixKgBqfEeW5c6mkiizldg"/>
+ </children>
+ <children xsi:type="basic:PartStack" xmi:id="_M-uNIKCAEeOCJ5u74o02rg" elementId="org.eclipse.rap.e4.demo.partstack.0" containerData="300">
+ <children xsi:type="basic:Part" xmi:id="_GwxdIKCAEeOCJ5u74o02rg" elementId="org.eclipse.rap.e4.demo.part.1" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.parts.EventSamplePart" label="%part.label.1" iconURI="platform:/plugin/org.eclipse.rap.e4.demo/icons/user_delete.png">
+ <toolbar xmi:id="_HHjAcOGREeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.toolbar.1">
+ <children xsi:type="menu:DirectToolItem" xmi:id="_Hh9EgOGREeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.directtoolitem.1" label="%directtoolitem.label.1" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.handlers.HelloWorldHandler"/>
+ </toolbar>
+ </children>
+ <children xsi:type="basic:Part" xmi:id="_rk6l0KhAEeO0Haj3z6o3PQ" elementId="org.eclipse.rap.e4.demo.part.2" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.parts.PreferenceSamplePart" label="%part.label.2" iconURI="platform:/plugin/org.eclipse.rap.e4.demo/icons/user_add.png">
+ <menus xmi:id="_EIg8IOGUEeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.menu.2">
+ <tags>ViewMenu</tags>
+ <children xsi:type="menu:DirectMenuItem" xmi:id="_HAt4UOGUEeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.directmenuitem.1" label="%directmenuitem.label.2" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.handlers.HelloWorldHandler"/>
+ </menus>
+ </children>
+ <children xsi:type="basic:Part" xmi:id="_JBUKsKhHEeO0Haj3z6o3PQ" elementId="org.eclipse.rap.e4.demo.part.3" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.parts.NLSSamplePart" label="%part.label.3" iconURI="platform:/plugin/org.eclipse.rap.e4.demo/icons/report_user.png">
+ <menus xmi:id="_4EurEOGcEeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.menu.3">
+ <tags>ViewMenu</tags>
+ <children xsi:type="menu:DirectMenuItem" xmi:id="_4nG_YOGcEeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.directmenuitem.2" label="%directmenuitem.label.3" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.handlers.HelloWorldHandler"/>
+ </menus>
+ <toolbar xmi:id="_6O4mwOGiEeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.toolbar.2">
+ <tags>ContentArea</tags>
+ <children xsi:type="menu:DirectToolItem" xmi:id="_7pm4UOGiEeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.directtoolitem.2" label="%directtoolitem.label.2" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.handlers.HelloWorldHandler"/>
+ </toolbar>
+ </children>
+ </children>
</children>
- <children xsi:type="basic:Part" xmi:id="_JBUKsKhHEeO0Haj3z6o3PQ" elementId="org.eclipse.rap.e4.demo.part.3" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.parts.NLSSamplePart" label="%part.label.3" iconURI="platform:/plugin/org.eclipse.rap.e4.demo/icons/report_user.png">
- <menus xmi:id="_4EurEOGcEeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.menu.3">
- <tags>ViewMenu</tags>
- <children xsi:type="menu:DirectMenuItem" xmi:id="_4nG_YOGcEeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.directmenuitem.2" label="%directmenuitem.label.3" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.handlers.HelloWorldHandler"/>
- </menus>
- <toolbar xmi:id="_6O4mwOGiEeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.toolbar.2">
- <tags>ContentArea</tags>
- <children xsi:type="menu:DirectToolItem" xmi:id="_7pm4UOGiEeObqJp-_0s5uA" elementId="org.eclipse.rap.e4.demo.directtoolitem.2" label="%directtoolitem.label.2" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.handlers.HelloWorldHandler"/>
- </toolbar>
+ <children xsi:type="basic:PartSashContainer" xmi:id="_gYBKQKLgEeSGUftsJTPCBQ" elementId="org.eclipse.rap.e4.demo.partsashcontainer.1" containerData="100" horizontal="true">
+ <children xsi:type="basic:Part" xmi:id="_iOPsEKLgEeSGUftsJTPCBQ" elementId="org.eclipse.rap.e4.demo.part.4" containerData="200" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.parts.SimpleTest" label="Simple Lower Part Right" iconURI="platform:/plugin/org.eclipse.rap.e4.demo/icons/door_in.png"/>
+ <children xsi:type="basic:PartStack" xmi:id="_izBNEKLgEeSGUftsJTPCBQ" elementId="org.eclipse.rap.e4.demo.partstack.2" containerData="400">
+ <children xsi:type="basic:Part" xmi:id="_16In4KLgEeSGUftsJTPCBQ" elementId="org.eclipse.rap.e4.demo.part.5" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.parts.SimpleTest" label="Simple Lower Right" iconURI="platform:/plugin/org.eclipse.rap.e4.demo/icons/disk.png"/>
+ </children>
</children>
</children>
</children>
- <children xsi:type="basic:PartSashContainer" xmi:id="_gYBKQKLgEeSGUftsJTPCBQ" elementId="org.eclipse.rap.e4.demo.partsashcontainer.1" containerData="100" horizontal="true">
- <children xsi:type="basic:Part" xmi:id="_iOPsEKLgEeSGUftsJTPCBQ" elementId="org.eclipse.rap.e4.demo.part.4" containerData="200" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.parts.SimpleTest" label="Simple Lower Part Right" iconURI="platform:/plugin/org.eclipse.rap.e4.demo/icons/door_in.png"/>
- <children xsi:type="basic:PartStack" xmi:id="_izBNEKLgEeSGUftsJTPCBQ" elementId="org.eclipse.rap.e4.demo.partstack.2" containerData="400">
- <children xsi:type="basic:Part" xmi:id="_16In4KLgEeSGUftsJTPCBQ" elementId="org.eclipse.rap.e4.demo.part.5" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.parts.SimpleTest" label="Simple Lower Right" iconURI="platform:/plugin/org.eclipse.rap.e4.demo/icons/disk.png"/>
+ <children xsi:type="advanced:Perspective" xmi:id="_ffRowBqfEeW5c6mkiizldg" elementId="org.eclipse.rap.e4.demo.perspective.1">
+ <children xsi:type="basic:PartStack" xmi:id="_vVprkBqfEeW5c6mkiizldg" elementId="org.eclipse.rap.e4.demo.partstack.3">
+ <children xsi:type="advanced:Placeholder" xmi:id="_zhYFIBqfEeW5c6mkiizldg" elementId="org.eclipse.rap.e4.demo.placeholder.1" ref="_hixKgBqfEeW5c6mkiizldg"/>
</children>
</children>
</children>
@@ -42,7 +52,11 @@
<children xsi:type="menu:DirectMenuItem" xmi:id="_y5diwKhGEeO0Haj3z6o3PQ" elementId="org.eclipse.rap.e4.demo.directmenuitem.0" label="%directmenuitem.label.1" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.handlers.HelloWorldHandler"/>
<children xsi:type="menu:HandledMenuItem" xmi:id="_gD30kKJDEeSqSpaGLeFO-g" elementId="org.eclipse.rap.e4.demo.handledmenuitem.0" label="%handledmenuitem.label.1" command="_Zs-j8KJDEeSqSpaGLeFO-g"/>
</children>
+ <children xsi:type="menu:Menu" xmi:id="_-cK-wBqfEeW5c6mkiizldg" elementId="org.eclipse.rap.e4.demo.menu.perspectives" label="Perspectives">
+ <children xsi:type="menu:DirectMenuItem" xmi:id="_AHvvwBqgEeW5c6mkiizldg" elementId="org.eclipse.rap.e4.demo.directmenuitem.toggleperspectives" label="Toggle Perspectives" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.handlers.SwitchPerspectives"/>
+ </children>
</mainMenu>
+ <sharedElements xsi:type="basic:Part" xmi:id="_hixKgBqfEeW5c6mkiizldg" elementId="org.eclipse.rap.e4.demo.part.asharedpart" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.parts.SharedPart" label="A shared part"/>
<trimBars xmi:id="_svgAANdbEeOAKaBhrzDgEg" elementId="org.eclipse.rap.e4.demo.trimbar.0">
<children xsi:type="menu:ToolBar" xmi:id="_uOnCUNdbEeOAKaBhrzDgEg" elementId="org.eclipse.rap.e4.demo.toolbar.0">
<children xsi:type="menu:DirectToolItem" xmi:id="_wqJQoNdbEeOAKaBhrzDgEg" elementId="org.eclipse.rap.e4.demo.directtoolitem.0" label="%directmenuitem.label.1" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.handlers.HelloWorldHandler"/>
@@ -58,7 +72,7 @@
<addons xmi:id="_-j-GgqBNEeODEs7-bWqIxA" elementId="org.eclipse.e4.core.commands.service" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
<addons xmi:id="_-j-Gg6BNEeODEs7-bWqIxA" elementId="org.eclipse.e4.ui.contexts.service" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
<addons xmi:id="_-j-GhKBNEeODEs7-bWqIxA" elementId="org.eclipse.e4.ui.bindings.service" contributionURI="bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"/>
- <addons xmi:id="_-j-GhaBNEeODEs7-bWqIxA" 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="_-j-GhaBNEeODEs7-bWqIxA" elementId="org.eclipse.e4.ui.workbench.commands.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.workbench.CommandProcessingAddon"/>
<addons xmi:id="_-j-GhqBNEeODEs7-bWqIxA" elementId="org.eclipse.e4.ui.workbench.handler.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/>
<addons xmi:id="_-j-Gh6BNEeODEs7-bWqIxA" 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="_-j-GiKBNEeODEs7-bWqIxA" elementId="org.eclipse.e4.ui.workbench.bindings.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon"/>
diff --git a/demo/org.eclipse.rap.e4.demo/META-INF/MANIFEST.MF b/demo/org.eclipse.rap.e4.demo/META-INF/MANIFEST.MF
index 62c632c..8570dca 100644
--- a/demo/org.eclipse.rap.e4.demo/META-INF/MANIFEST.MF
+++ b/demo/org.eclipse.rap.e4.demo/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Demo
Bundle-SymbolicName: org.eclipse.rap.e4.demo
Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.0.0,4.0.0)",
org.eclipse.rap.e4;bundle-version="0.9.0",
org.eclipse.e4.core.di,
org.eclipse.e4.core.di.extensions,
diff --git a/demo/org.eclipse.rap.e4.demo/dev_org.eclipse.rap.e4.demo.launch b/demo/org.eclipse.rap.e4.demo/dev_org.eclipse.rap.e4.demo.launch
index 1d762c7..3195583 100644
--- a/demo/org.eclipse.rap.e4.demo/dev_org.eclipse.rap.e4.demo.launch
+++ b/demo/org.eclipse.rap.e4.demo/dev_org.eclipse.rap.e4.demo.launch
@@ -34,7 +34,7 @@
<booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>
<stringAttribute key="pde.version" value="3.3"/>
<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default"/>
+<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.commons.jxpath@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
diff --git a/demo/org.eclipse.rap.e4.demo/src/org/eclipse/rap/e4/demo/handlers/SwitchPerspectives.java b/demo/org.eclipse.rap.e4.demo/src/org/eclipse/rap/e4/demo/handlers/SwitchPerspectives.java
new file mode 100644
index 0000000..65f6673
--- /dev/null
+++ b/demo/org.eclipse.rap.e4.demo/src/org/eclipse/rap/e4/demo/handlers/SwitchPerspectives.java
@@ -0,0 +1,16 @@
+package org.eclipse.rap.e4.demo.handlers;
+
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+
+public class SwitchPerspectives {
+ @Execute
+ void switchPerspective(EPartService partService, MPerspective perspective) {
+ if( perspective.getElementId().equals("org.eclipse.rap.e4.demo.perspective.0") ) {
+ partService.switchPerspective((MPerspective) perspective.getParent().getChildren().get(1));
+ } else {
+ partService.switchPerspective((MPerspective) perspective.getParent().getChildren().get(0));
+ }
+ }
+}
diff --git a/demo/org.eclipse.rap.e4.demo/src/org/eclipse/rap/e4/demo/parts/NLSSamplePart.java b/demo/org.eclipse.rap.e4.demo/src/org/eclipse/rap/e4/demo/parts/NLSSamplePart.java
index e227d28..ba96a79 100644
--- a/demo/org.eclipse.rap.e4.demo/src/org/eclipse/rap/e4/demo/parts/NLSSamplePart.java
+++ b/demo/org.eclipse.rap.e4.demo/src/org/eclipse/rap/e4/demo/parts/NLSSamplePart.java
@@ -1,5 +1,7 @@
package org.eclipse.rap.e4.demo.parts;
+import java.util.Locale;
+
import javax.inject.Inject;
import javax.inject.Named;
@@ -46,12 +48,12 @@ public class NLSSamplePart {
}
@Inject
- public void setMessages(@Translation NLSMessages messages, @Named(TranslationService.LOCALE) String locale) {
+ public void setMessages(@Translation NLSMessages messages, @Named(TranslationService.LOCALE) Locale locale) {
currentLangLabel.setText(messages.NLSSamplePart_currentLangLabel);
- currentLangValue.setText(locale);
+ currentLangValue.setText(locale.toString());
updateLangLabel.setText(messages.NLSSamplePart_updateLangLabel);
- updateLangValue.setText(locale);
+ updateLangValue.setText(locale.toString());
updateLangButton.setText(messages.NLSSamplePart_updateLangButton);
currentLangLabel.getParent().layout(true);
diff --git a/demo/org.eclipse.rap.e4.demo/src/org/eclipse/rap/e4/demo/parts/SharedPart.java b/demo/org.eclipse.rap.e4.demo/src/org/eclipse/rap/e4/demo/parts/SharedPart.java
new file mode 100644
index 0000000..49e7758
--- /dev/null
+++ b/demo/org.eclipse.rap.e4.demo/src/org/eclipse/rap/e4/demo/parts/SharedPart.java
@@ -0,0 +1,24 @@
+package org.eclipse.rap.e4.demo.parts;
+
+import javax.annotation.PostConstruct;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class SharedPart {
+ @PostConstruct
+ void init(Composite parent) {
+ parent.setLayout(new GridLayout(2, false));
+
+ Label label = new Label(parent, SWT.NONE);
+ label.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+ label.setText("A sample");
+
+ Text text = new Text(parent, SWT.SINGLE | SWT.LEAD | SWT.BORDER);
+ text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+ }
+}

Back to the top