added menu to reproduce bug

4 files changed, 29 insertions, 18 deletions

diff --git a/demos/org.eclipse.fx.testcases.dnd.app/Application.e4xmi b/demos/org.eclipse.fx.testcases.dnd.app/Application.e4xmi
index 3042a3e5b..f874f8067 100644
--- a/demos/org.eclipse.fx.testcases.dnd.app/Application.e4xmi
+++ b/demos/org.eclipse.fx.testcases.dnd.app/Application.e4xmi
@@ -1,5 +1,5 @@
 <?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: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" xmi:id="_sTJ2MdYyEeOfScQ4JVEa_Q" elementId="org.eclipse.e4.application" bindingContexts="_sTJ2MNYyEeOfScQ4JVEa_Q">
+<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="_sTJ2MdYyEeOfScQ4JVEa_Q" elementId="org.eclipse.e4.application" bindingContexts="_sTJ2MNYyEeOfScQ4JVEa_Q">
   <children xsi:type="basic:TrimmedWindow" xmi:id="_ygSG0NYyEeOfScQ4JVEa_Q" elementId="org.eclipse.fx.testcases.dnd.app.trimmedwindow.0" label="DnD Sample App" x="300" y="300" width="800" height="600">
     <children xsi:type="advanced:Area" xmi:id="_0e2FQNYyEeOfScQ4JVEa_Q" elementId="org.eclipse.fx.testcases.dnd.app.area.0" horizontal="true">
       <children xsi:type="basic:PartStack" xmi:id="_1gOCsNYyEeOfScQ4JVEa_Q" elementId="org.eclipse.fx.testcases.dnd.app.partstack.0">
@@ -8,10 +8,16 @@
         <children xsi:type="basic:Part" xmi:id="_TYMgsNmkEeOeHrM7cJEweQ" elementId="org.eclipse.fx.testcases.dnd.app.part.4" contributionURI="bundleclass://org.eclipse.fx.testcases.dnd.app/org.eclipse.fx.testcases.dnd.app.PartImpl" label="Part 1.3"/>
       </children>
       <children xsi:type="basic:PartStack" xmi:id="_2Z1LQNYyEeOfScQ4JVEa_Q" elementId="org.eclipse.fx.testcases.dnd.app.partstack.1">
+        <tags>NoAutoCollapse</tags>
         <children xsi:type="basic:Part" xmi:id="_3xoEoNYyEeOfScQ4JVEa_Q" elementId="org.eclipse.fx.testcases.dnd.app.part.2" contributionURI="bundleclass://org.eclipse.fx.testcases.dnd.app/org.eclipse.fx.testcases.dnd.app.PartImpl" label="Part 2.1"/>
         <children xsi:type="basic:Part" xmi:id="_4My9sNYyEeOfScQ4JVEa_Q" elementId="org.eclipse.fx.testcases.dnd.app.part.3" contributionURI="bundleclass://org.eclipse.fx.testcases.dnd.app/org.eclipse.fx.testcases.dnd.app.PartImpl" label="Part 2.2"/>
       </children>
     </children>
+    <mainMenu xmi:id="_MrcxAC4IEeSYGs8-UuUEjw" elementId="org.eclipse.fx.testcases.dnd.app.menu.0">
+      <children xsi:type="menu:Menu" xmi:id="_NIZLsC4IEeSYGs8-UuUEjw" elementId="org.eclipse.fx.testcases.dnd.app.menu.1" label="File">
+        <children xsi:type="menu:DirectMenuItem" xmi:id="_P4LLsC4IEeSYGs8-UuUEjw" elementId="org.eclipse.fx.testcases.dnd.app.directmenuitem.0" label="Test"/>
+      </children>
+    </mainMenu>
   </children>
   <rootContext xmi:id="_sTJ2MNYyEeOfScQ4JVEa_Q" elementId="org.eclipse.ui.contexts.dialogAndWindow" name="In Dialog and Windows">
     <children xmi:id="_sTKdQNYyEeOfScQ4JVEa_Q" elementId="org.eclipse.ui.contexts.window" name="In Windows"/>
@@ -25,4 +31,5 @@
   <addons xmi:id="_sTKdR9YyEeOfScQ4JVEa_Q" elementId="org.eclipse.fx.ui.keybindings.e4.model" contributionURI="bundleclass://org.eclipse.fx.ui.keybindings.e4/org.eclipse.fx.ui.keybindings.e4.BindingProcessingAddon"/>
   <addons xmi:id="_sTKdSNYyEeOfScQ4JVEa_Q" elementId="org.eclipse.e4.ui.workbench.addons.HandlerProcessingAddon" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/>
   <addons xmi:id="_VLDAQNY0EeOfScQ4JVEa_Q" elementId="org.eclipse.fx.testcases.dnd.app.addon.0" contributionURI="bundleclass://org.eclipse.fx.ui.workbench.renderers.base/org.eclipse.fx.ui.workbench.renderers.base.addons.DnDAddon"/>
+  <addons xmi:id="_ZLdKkA5vEeShjvA6HIESRQ" elementId="org.eclipse.fx.testcases.dnd.app.addon.1" contributionURI="bundleclass://org.eclipse.fx.ui.workbench.renderers.base/org.eclipse.fx.ui.workbench.renderers.base.addons.CleanUpAddon"/>
 </application:Application>
diff --git a/demos/org.eclipse.fx.testcases.dnd.app/META-INF/MANIFEST.MF b/demos/org.eclipse.fx.testcases.dnd.app/META-INF/MANIFEST.MF
index b1eb6c9b6..aebc4ac3b 100644
--- a/demos/org.eclipse.fx.testcases.dnd.app/META-INF/MANIFEST.MF
+++ b/demos/org.eclipse.fx.testcases.dnd.app/META-INF/MANIFEST.MF
@@ -20,10 +20,9 @@ Require-Bundle: org.eclipse.fx.ui.workbench.fx,
  org.eclipse.core.databinding.property,
  org.eclipse.e4.ui.workbench,
  org.eclipse.e4.ui.services,
- org.eclipse.fx.ui.workbench.renderers.base;bundle-version="1.0.0"
-Import-Package: javax.inject;version="1.0.0",
- javax.annotation;version="1.0.0",
- javafx.animation;version="2.0.0",
+ org.eclipse.fx.ui.workbench.renderers.base;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.0"
+Import-Package: javafx.animation;version="2.0.0",
  javafx.application;version="2.0.0",
  javafx.beans;version="2.0.0",
  javafx.beans.binding;version="2.0.0",
@@ -49,4 +48,6 @@ Import-Package: javax.inject;version="1.0.0",
  javafx.scene.transform;version="2.0.0",
  javafx.scene.web;version="2.0.0",
  javafx.stage;version="2.0.0",
- javafx.util;version="2.0.0"
+ javafx.util;version="2.0.0",
+ javax.annotation;version="1.0.0",
+ javax.inject;version="1.0.0"
diff --git a/demos/org.eclipse.fx.testcases.dnd.app/bin/.gitignore b/demos/org.eclipse.fx.testcases.dnd.app/bin/.gitignore
deleted file mode 100644
index 571ee510a..000000000
--- a/demos/org.eclipse.fx.testcases.dnd.app/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/org
diff --git a/demos/org.eclipse.fx.testcases.dnd.app/src/org/eclipse/fx/testcases/dnd/app/PartImpl.java b/demos/org.eclipse.fx.testcases.dnd.app/src/org/eclipse/fx/testcases/dnd/app/PartImpl.java
index 638c140a7..7a0de2db7 100644
--- a/demos/org.eclipse.fx.testcases.dnd.app/src/org/eclipse/fx/testcases/dnd/app/PartImpl.java
+++ b/demos/org.eclipse.fx.testcases.dnd.app/src/org/eclipse/fx/testcases/dnd/app/PartImpl.java
@@ -1,13 +1,14 @@
 package org.eclipse.fx.testcases.dnd.app;
 
+import javafx.collections.FXCollections;
 import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.text.Font;
 
 import javax.annotation.PostConstruct;
 
-import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 
 public class PartImpl {
@@ -15,17 +16,20 @@ public class PartImpl {
 
 	@PostConstruct
 	void init(BorderPane parent, MPart part) {
-		Label l = new Label(part.getLabel());
-		l.setFont(Font.font(30));
-		
+//		Label l = new Label(part.getLabel());
+//		l.setFont(Font.font(30));
+//		
+//		parent.setCenter(l);
+//		
+//		f = new TextField();
+//		parent.setBottom(f);
+		ListView<String> l = new ListView<String>();
+		l.setItems(FXCollections.observableArrayList("A","B","C"));
 		parent.setCenter(l);
-		
-		f = new TextField();
-		parent.setBottom(f);
 	}
 	
-	@Focus
-	void focus() {
-		f.requestFocus();
-	}
+//	@Focus
+//	void focus() {
+//		f.requestFocus();
+//	}
 }