updated to kepler RC1, renamed product
diff --git a/extra/org.eclipse.emf.ecp.application.e4/Application.e4xmi b/extra/org.eclipse.emf.ecp.application.e4/Application.e4xmi
index ae99994..e66d9cc 100644
--- a/extra/org.eclipse.emf.ecp.application.e4/Application.e4xmi
+++ b/extra/org.eclipse.emf.ecp.application.e4/Application.e4xmi
@@ -1,6 +1,6 @@
<?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="_0JoRAJgREeKJoJcmiy2C6w" elementId="org.eclipse.e4.ide.application">
- <children xsi:type="basic:TrimmedWindow" xmi:id="_0JoRAZgREeKJoJcmiy2C6w" label="org.eclipse.emf.ecp.e4.application" width="500" height="400">
+ <children xsi:type="basic:TrimmedWindow" xmi:id="_0JoRAZgREeKJoJcmiy2C6w" label="org.eclipse.emf.ecp.application.e4" width="500" height="400">
<children xsi:type="basic:PartSashContainer" xmi:id="_AErb0JgUEeKJoJcmiy2C6w" elementId="org.eclipse.emf.ecp.e4.application.partsashcontainer.1" selectedElement="_lM0okJgTEeKJoJcmiy2C6w">
<children xsi:type="basic:PartSashContainer" xmi:id="_lM0okJgTEeKJoJcmiy2C6w" elementId="org.eclipse.emf.ecp.e4.application.partsashcontainer.0" horizontal="true">
<children xsi:type="basic:PartStack" xmi:id="_8GAbsJoUEeKJoJcmiy2C6w" elementId="org.eclipse.emf.ecp.e4.application.partstack.2">
@@ -8,7 +8,6 @@
<menus xsi:type="menu:PopupMenu" xmi:id="_dAsF4JgZEeKJoJcmiy2C6w" elementId="org.eclipse.emf.ecp.e4.application.popupmenu.navigator" label="Navigator menu">
<children xsi:type="menu:HandledMenuItem" xmi:id="_ibQRIJgZEeKJoJcmiy2C6w" elementId="org.eclipse.emf.ecp.e4.application.handledmenuitem.newProject" label="New Project" command="_ogB3AJgZEeKJoJcmiy2C6w"/>
<children xsi:type="menu:HandledMenuItem" xmi:id="_c1wWwJoSEeKJoJcmiy2C6w" elementId="org.eclipse.emf.ecp.e4.application.handledmenuitem.project.newModelElement" label="New Model Element" command="_StwzEJoSEeKJoJcmiy2C6w"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_eu6RsJrLEeKJoJcmiy2C6w" elementId="org.eclipse.emf.ecp.e4.application.handledmenuitem.0"/>
</menus>
<toolbar xmi:id="_uWMcwJoUEeKJoJcmiy2C6w" elementId="org.eclipse.emf.ecp.e4.application.toolbar.0">
<children xsi:type="menu:HandledToolItem" xmi:id="_CPQPoJrKEeKJoJcmiy2C6w" elementId="org.eclipse.emf.ecp.e4.application.handledtoolitem.1" command="_ogB3AJgZEeKJoJcmiy2C6w"/>
@@ -22,7 +21,7 @@
<children xsi:type="basic:PartStack" xmi:id="_wpiYYJoUEeKJoJcmiy2C6w" elementId="org.eclipse.emf.ecp.e4.application.partstack.1">
<children xsi:type="basic:Part" xmi:id="_CJd-EJgUEeKJoJcmiy2C6w" elementId="org.eclipse.emf.ecp.e4.application.part.repository" contributionURI="bundleclass://org.eclipse.emf.ecp.application.e4/org.eclipse.emf.ecp.e4.view.ECPRepositoryView" label="Repository View">
<menus xsi:type="menu:PopupMenu" xmi:id="_WzCwgJgcEeKJoJcmiy2C6w" elementId="org.eclipse.emf.ecp.e4.application.popupmenu.repository" label="Repo Popup">
- <children xsi:type="menu:HandledMenuItem" xmi:id="_bKyM0JgcEeKJoJcmiy2C6w" elementId="org.eclipse.emf.ecp.e4.application.handledmenuitem.checkout" label="Checkout" iconURI="platform:/plugin/org.eclipse.emf.ecp.e4.application/icons/sample.gif" command="_eOWrgJgcEeKJoJcmiy2C6w"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_bKyM0JgcEeKJoJcmiy2C6w" elementId="org.eclipse.emf.ecp.e4.application.handledmenuitem.checkout" label="Checkout" iconURI="platform:/plugin/org.eclipse.emf.ecp.application.e4/icons/sample.gif" command="_eOWrgJgcEeKJoJcmiy2C6w"/>
</menus>
</children>
</children>
diff --git a/extra/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF b/extra/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF
index 1d14705..8b396ef 100644
--- a/extra/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF
+++ b/extra/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF
@@ -24,7 +24,8 @@
org.eclipse.e4.core.commands;bundle-version="0.10.1",
org.eclipse.e4.ui.bindings;bundle-version="0.10.1",
org.eclipse.emf.ecp.editor;bundle-version="1.0.0",
- org.eclipse.emf.ecp.ui;bundle-version="1.0.0"
+ org.eclipse.emf.ecp.ui;bundle-version="1.0.0",
+ org.eclipse.e4.ui.model.workbench;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.annotation;version="1.0.0",
org.eclipse.emf.ecp.explorereditorbridge.internal;version="1.0.0",
diff --git a/extra/org.eclipse.emf.ecp.application.e4/build.properties b/extra/org.eclipse.emf.ecp.application.e4/build.properties
index 25bc7a6..632ce11 100644
--- a/extra/org.eclipse.emf.ecp.application.e4/build.properties
+++ b/extra/org.eclipse.emf.ecp.application.e4/build.properties
@@ -3,5 +3,6 @@
.,\
plugin.xml,\
Application.e4xmi,\
- css/default.css
+ css/default.css,\
+ bin/
source.. = src/
diff --git a/extra/org.eclipse.emf.ecp.application.e4/org.eclipse.emf.ecp.e4.application.product b/extra/org.eclipse.emf.ecp.application.e4/org.eclipse.emf.ecp.application.e4.product
similarity index 84%
rename from extra/org.eclipse.emf.ecp.application.e4/org.eclipse.emf.ecp.e4.application.product
rename to extra/org.eclipse.emf.ecp.application.e4/org.eclipse.emf.ecp.application.e4.product
index 42bbb72..acc26e5 100644
--- a/extra/org.eclipse.emf.ecp.application.e4/org.eclipse.emf.ecp.e4.application.product
+++ b/extra/org.eclipse.emf.ecp.application.e4/org.eclipse.emf.ecp.application.e4.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="org.eclipse.emf.ecp.e4.application" uid="org.eclipse.emf.ecp.e4.application.demo" id="org.eclipse.emf.ecp.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="org.eclipse.emf.ecp.e4.application" uid="org.eclipse.emf.ecp.application.e4.demo" id="org.eclipse.emf.ecp.application.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -13,6 +13,16 @@
<windowImages/>
+ <launcher>
+ <solaris/>
+ <win useIco="false">
+ <bmp/>
+ </win>
+ </launcher>
+
+ <vm>
+ </vm>
+
<plugins>
<plugin id="com.ibm.icu"/>
<plugin id="javax.annotation"/>
@@ -42,6 +52,7 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.resources"/>
<plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>
+ <plugin id="org.eclipse.core.resources.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
<plugin id="org.eclipse.e4.core.commands"/>
@@ -58,20 +69,30 @@
<plugin id="org.eclipse.e4.ui.services"/>
<plugin id="org.eclipse.e4.ui.widgets"/>
<plugin id="org.eclipse.e4.ui.workbench"/>
+ <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
<plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
<plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" fragment="true"/>
<plugin id="org.eclipse.e4.ui.workbench.swt"/>
<plugin id="org.eclipse.e4.ui.workbench3"/>
+ <plugin id="org.eclipse.emf.cdo.ecore.retrofit" fragment="true"/>
<plugin id="org.eclipse.emf.common"/>
+ <plugin id="org.eclipse.emf.common.ui"/>
<plugin id="org.eclipse.emf.databinding"/>
<plugin id="org.eclipse.emf.databinding.edit"/>
<plugin id="org.eclipse.emf.ecore"/>
<plugin id="org.eclipse.emf.ecore.change"/>
<plugin id="org.eclipse.emf.ecore.xmi"/>
+ <plugin id="org.eclipse.emf.ecp.application.e4"/>
+ <plugin id="org.eclipse.emf.ecp.core"/>
<plugin id="org.eclipse.emf.ecp.e4.application"/>
<plugin id="org.eclipse.emf.ecp.edit"/>
+ <plugin id="org.eclipse.emf.ecp.edit.swt"/>
<plugin id="org.eclipse.emf.ecp.editor"/>
+ <plugin id="org.eclipse.emf.ecp.editor.e3"/>
+ <plugin id="org.eclipse.emf.ecp.explorereditorbridge"/>
+ <plugin id="org.eclipse.emf.ecp.ui"/>
<plugin id="org.eclipse.emf.edit"/>
+ <plugin id="org.eclipse.emf.edit.ui"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
<plugin id="org.eclipse.equinox.concurrent"/>
@@ -86,6 +107,8 @@
<plugin id="org.eclipse.help"/>
<plugin id="org.eclipse.jface"/>
<plugin id="org.eclipse.jface.databinding"/>
+ <plugin id="org.eclipse.net4j"/>
+ <plugin id="org.eclipse.net4j.util"/>
<plugin id="org.eclipse.osgi"/>
<plugin id="org.eclipse.osgi.services"/>
<plugin id="org.eclipse.swt"/>
@@ -110,8 +133,12 @@
<plugin id="org.eclipse.swt.photon.qnx.x86" fragment="true"/>
<plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
<plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.ui"/>
+ <plugin id="org.eclipse.ui.forms"/>
+ <plugin id="org.eclipse.ui.views"/>
<plugin id="org.eclipse.ui.workbench"/>
<plugin id="org.w3c.css.sac"/>
+ <plugin id="org.w3c.dom.events"/>
<plugin id="org.w3c.dom.smil"/>
<plugin id="org.w3c.dom.svg"/>
</plugins>
diff --git a/extra/org.eclipse.emf.ecp.application.e4/plugin.xml b/extra/org.eclipse.emf.ecp.application.e4/plugin.xml
index ee30a0b..7bd8578 100644
--- a/extra/org.eclipse.emf.ecp.application.e4/plugin.xml
+++ b/extra/org.eclipse.emf.ecp.application.e4/plugin.xml
@@ -13,7 +13,7 @@
</property>
<property
name="applicationCSS"
- value="platform:/plugin/org.eclipse.emf.ecp.e4.application/css/default.css">
+ value="platform:/plugin/org.eclipse.emf.ecp.application.e4/css/default.css">
</property>
<property
name="appName"
@@ -23,14 +23,13 @@
</extension>
<extension
point="org.eclipse.emf.ecp.ui.modelElementOpener">
- <ModelElementOpener
- class="org.eclipse.emf.ecp.e4.editor.E4ModelElementOpener"
- name="org.eclipse.emf.ecp.e4.application.ModelElementOpener">
+ <modelElementOpener
+ class="org.eclipse.emf.ecp.e4.editor.E4ModelElementOpener">
<staticTester
modelElement="org.eclipse.emf.ecore.EObject"
priority="2">
</staticTester>
- </ModelElementOpener>
+ </modelElementOpener>
</extension>
</plugin>
diff --git a/extra/org.eclipse.emf.ecp.application.e4/src/org/eclipse/emf/ecp/e4/application/Activator.java b/extra/org.eclipse.emf.ecp.application.e4/src/org/eclipse/emf/ecp/e4/application/Activator.java
index 990742a..b3ccbf0 100644
--- a/extra/org.eclipse.emf.ecp.application.e4/src/org/eclipse/emf/ecp/e4/application/Activator.java
+++ b/extra/org.eclipse.emf.ecp.application.e4/src/org/eclipse/emf/ecp/e4/application/Activator.java
@@ -39,7 +39,7 @@
try {
ServiceReference<?> service=context.getServiceReferences(IContextFunction.class.getName(),"(service.context.key="+EPartService.class.getName()+")")[0];
//TODO a "bit" ugly
- return (EPartService) ((IContextFunction)context.getService(service)).compute(E4Workbench.getServiceContext());
+ return (EPartService) ((IContextFunction)context.getService(service)).compute(E4Workbench.getServiceContext(),null);
} catch (InvalidSyntaxException e) {
// TODO Auto-generated catch block
e.printStackTrace();
