Update ControlExamples for ToolBar and Menu

jossonsmith · jossonsmith · commit 45c1f4b0ffed · 2006-09-24T15:34:29.000Z
diff --git a/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java b/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java
@@ -68,13 +68,13 @@ public ControlExample(Composite parent) {
 //				"CTabFolder",
 				"SashForm",
 				
-//				"CoolBar",
+				"CoolBar",
 //				"Dialog",
 				"Group",
 				"Label",
 				"Link",
 				"List",
-//				"Menu",
+				"Menu",
 				"ProgressBar",
 				
 				"Sash",
@@ -85,7 +85,7 @@ public ControlExample(Composite parent) {
 				"TabFolder",
 				"Table",
 				"Text",
-//				"ToolBar",
+				"ToolBar",
 				"Tree"
 		};
 		for (int i=0; i<tabs.length; i++) {
@@ -150,11 +150,11 @@ public void run() {
 											if (control != null && control instanceof Label) {
 												control.dispose();
 											}
-										    item.setImage(images[(int) Math.round(3 * Math.random())]);
+										    item.setImage(images[(int) Math.floor(3 * Math.random())]);
 										    tabFolder.setSelection(tabFolder.getSelectionIndex());
 											item.setControl(page);
 										} catch (Throwable e) {
-											//e.printStackTrace();
+											e.printStackTrace();
 											throw (Error) e;
 										}
 									}
@@ -326,7 +326,7 @@ void initResources() {
 	 * Invokes as a standalone program.
 	 */
 	public static void main(String[] args) {
-		System.out.println("To begin control examples ..."); // bring the correct width and height of XHTML
+		//System.out.println("To begin control examples ..."); // bring the correct width and height of XHTML
 		Display display = new Display();
 		int styleNone = SWT.NONE;
 		int style = styleNone;
diff --git a/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CoolBarTab.java b/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CoolBarTab.java
@@ -36,7 +36,7 @@ class CoolBarTab extends Tab {
 	/**
 	 * Creates the Tab within a given instance of ControlExample.
 	 */
-	CoolBarTab(ControlExample instance) {
+	public CoolBarTab(ControlExample instance) {
 		super(instance);
 	}
 	
diff --git a/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/MenuTab.java b/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/MenuTab.java
@@ -31,7 +31,7 @@ class MenuTab extends Tab {
 	/**
 	 * Creates the Tab within a given instance of ControlExample.
 	 */
-	MenuTab(ControlExample instance) {
+	public MenuTab(ControlExample instance) {
 		super(instance);
 	}
 
diff --git a/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java b/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java
@@ -31,7 +31,7 @@ class ToolBarTab extends Tab {
 	/**
 	 * Creates the Tab within a given instance of ControlExample.
 	 */
-	ToolBarTab(ControlExample instance) {
+	public ToolBarTab(ControlExample instance) {
 		super(instance);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class CoolBarTab extends Tab {`
`36`	`36`	`/**`
`37`	`37`	`* Creates the Tab within a given instance of ControlExample.`
`38`	`38`	`*/`
`39`		`- CoolBarTab(ControlExample instance) {`
	`39`	`+ public CoolBarTab(ControlExample instance) {`
`40`	`40`	`super(instance);`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class MenuTab extends Tab {`
`31`	`31`	`/**`
`32`	`32`	`* Creates the Tab within a given instance of ControlExample.`
`33`	`33`	`*/`
`34`		`- MenuTab(ControlExample instance) {`
	`34`	`+ public MenuTab(ControlExample instance) {`
`35`	`35`	`super(instance);`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class ToolBarTab extends Tab {`
`31`	`31`	`/**`
`32`	`32`	`* Creates the Tab within a given instance of ControlExample.`
`33`	`33`	`*/`
`34`		`- ToolBarTab(ControlExample instance) {`
	`34`	`+ public ToolBarTab(ControlExample instance) {`
`35`	`35`	`super(instance);`
`36`	`36`	`}`
`37`	`37`