Bug 432152 - E4: vertical toolbars don't work

2 files changed, 12 insertions, 11 deletions

diff --git a/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi b/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi
index daa0642e2..fdb073ffe 100755
--- a/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi
+++ b/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi
@@ -187,6 +187,12 @@
       </children>
       <children xsi:type="menu:ToolControl" xmi:id="_Na3dgNZUEeKlJ9ZUcG3l2Q" elementId="org.eclipse.fx.testcases.e4.toolcontrol.0" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.tool.ToolControlSample"/>
     </trimBars>
+    <trimBars xmi:id="_s3Z_EL5SEeOCpM9MHb7gVw" elementId="org.eclipse.fx.testcases.e4.trimbar.0" side="Left">
+      <children xsi:type="menu:ToolBar" xmi:id="_upiEAL5SEeOCpM9MHb7gVw" elementId="org.eclipse.fx.testcases.e4.toolbar.5">
+        <children xsi:type="menu:DirectToolItem" xmi:id="_ve_FUL5SEeOCpM9MHb7gVw" elementId="org.eclipse.fx.testcases.e4.directtoolitem.9" label="V1"/>
+        <children xsi:type="menu:DirectToolItem" xmi:id="_w4yJ0L5SEeOCpM9MHb7gVw" elementId="org.eclipse.fx.testcases.e4.directtoolitem.10" label="V2"/>
+      </children>
+    </trimBars>
   </children>
   <handlers xmi:id="_H2FJYOUcEeGP-5z69KadAQ" elementId="org.eclipse.fx.testcases.e4.handler.0" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.Handler0" command="_FEZr8OUcEeGP-5z69KadAQ"/>
   <handlers xmi:id="_0_q1EOqiEeGrz8mV_3Gr5A" elementId="org.eclipse.fx.testcases.e4.handler.0" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.Handler1" command="_3PQSEOqiEeGrz8mV_3Gr5A"/>
diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestFXML.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestFXML.java
index 733988f03..7c4b2e6c4 100644
--- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestFXML.java
+++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestFXML.java
@@ -1,27 +1,22 @@
 package org.eclipse.fx.testcases.e4.parts;

 

-import java.net.URL;

-import java.util.ResourceBundle;

-

 import javafx.scene.control.Button;

 import javafx.scene.layout.HBox;

-import javafx.util.Callback;

 

 import org.eclipse.fx.core.fxml.FXMLDocument;

 

 public class TestFXML extends FXMLDocument<HBox> {

 

 	@Override

-	public HBox load(URL location, ResourceBundle bundle,

-			Callback<Class<?>, Object> controllerFactory) {

-		HBox b = new HBox();

-		b.getChildren().add(new Button("This is the Java class"));

-		return b;

+	public Object getController() {

+		return null;

 	}

 

 	@Override

-	public Object getController() {

-		return null;

+	public HBox load(org.eclipse.fx.core.fxml.FXMLDocument.LoadData<HBox> data) {

+		HBox b = new HBox();

+		b.getChildren().add(new Button("This is the Java class"));

+		return b;

 	}

 

 }