Add more example tabs

jossonsmith · jossonsmith · commit 6a7dca3f6678 · 2006-08-05T22:01:52.000Z
diff --git a/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CLabelTab.java b/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CLabelTab.java
@@ -28,7 +28,7 @@ class CLabelTab extends AlignableTab {
 	/**
 	 * Creates the Tab within a given instance of ControlExample.
 	 */
-	CLabelTab(ControlExample instance) {
+	public CLabelTab(ControlExample instance) {
 		super(instance);
 	}
 	
diff --git a/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CTabFolderTab.java b/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CTabFolderTab.java
@@ -44,7 +44,7 @@ class CTabFolderTab extends Tab {
 	/**
 	 * Creates the Tab within a given instance of ControlExample.
 	 */
-	CTabFolderTab(ControlExample instance) {
+	public CTabFolderTab(ControlExample instance) {
 		super(instance);
 	}
 	
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
@@ -11,6 +11,7 @@
 package org.eclipse.swt.examples.controlexample;
 
 
+import net.sf.j2s.ajax.ARunnable;
 import net.sf.j2s.ajax.ASWTClass;
 import org.eclipse.swt.*;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -62,6 +63,9 @@ public ControlExample(Composite parent) {
 				"Label", 
 //				"Canvas",
 				"Combo",
+				"CLabel",
+				"CTabFolder",
+				"SashForm",
 //				"CoolBar",
 //				"Dialog",
 				"Group",
@@ -89,10 +93,10 @@ public ControlExample(Composite parent) {
 		}
 		if (tabs.length > 0) {
 			final TabItem item = tabFolder.getItem(0);
-			ASWTClass.shellLoad(parent.getShell(), (String) item.getData(), new Runnable() {
+			ASWTClass.shellLoad(parent.getShell(), (String) item.getData(), new ARunnable() {
 				public void run() {
 					try {
-						Constructor constructor = Class.forName((String) item.getData()).getConstructor(new Class[] {ControlExample.class});
+						Constructor constructor = getClazz().getConstructor(new Class[] {ControlExample.class});
 						Object inst = constructor.newInstance(new Object[] {ControlExample.this});
 						Tab tab = (Tab) inst;
 						item.setControl(tab.createTabFolderPage(tabFolder));
@@ -113,10 +117,10 @@ public void widgetSelected(SelectionEvent e) {
 						if (item.getControl() == null) {
 							Object data = item.getData();
 							if (data != null) {
-								ASWTClass.shellLoad(tabFolder.getShell(), (String) data, new Runnable() {
+								ASWTClass.shellLoad(tabFolder.getShell(), (String) data, new ARunnable() {
 									public void run() {
 										try {
-											Constructor constructor = Class.forName((String) item.getData()).getConstructor(new Class[] {ControlExample.class});
+											Constructor constructor = getClazz().getConstructor(new Class[] {ControlExample.class});
 											Object inst = constructor.newInstance(new Object[] {ControlExample.this});
 											Tab tab = (Tab) inst;
 											if (((String) item.getData()).indexOf("Shell") != -1) {
diff --git a/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SashFormTab.java b/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SashFormTab.java
@@ -48,7 +48,7 @@ class SashFormTab extends Tab {
 	/**
 	 * Creates the Tab within a given instance of ControlExample.
 	 */
-	SashFormTab(ControlExample instance) {
+	public SashFormTab(ControlExample instance) {
 		super(instance);
 	}
 	void createExampleGroup () {
diff --git a/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SashTab.java b/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/SashTab.java
@@ -53,7 +53,7 @@ class SashTab extends Tab {
 	/**
 	 * Creates the Tab within a given instance of ControlExample.
 	 */
-	SashTab(ControlExample instance) {
+	public SashTab(ControlExample instance) {
 		super(instance);
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class CLabelTab extends AlignableTab {`
`28`	`28`	`/**`
`29`	`29`	`* Creates the Tab within a given instance of ControlExample.`
`30`	`30`	`*/`
`31`		`- CLabelTab(ControlExample instance) {`
	`31`	`+ public CLabelTab(ControlExample instance) {`
`32`	`32`	`super(instance);`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class CTabFolderTab extends Tab {`
`44`	`44`	`/**`
`45`	`45`	`* Creates the Tab within a given instance of ControlExample.`
`46`	`46`	`*/`
`47`		`- CTabFolderTab(ControlExample instance) {`
	`47`	`+ public CTabFolderTab(ControlExample instance) {`
`48`	`48`	`super(instance);`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class SashFormTab extends Tab {`
`48`	`48`	`/**`
`49`	`49`	`* Creates the Tab within a given instance of ControlExample.`
`50`	`50`	`*/`
`51`		`- SashFormTab(ControlExample instance) {`
	`51`	`+ public SashFormTab(ControlExample instance) {`
`52`	`52`	`super(instance);`
`53`	`53`	`}`
`54`	`54`	`void createExampleGroup () {`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class SashTab extends Tab {`
`53`	`53`	`/**`
`54`	`54`	`* Creates the Tab within a given instance of ControlExample.`
`55`	`55`	`*/`
`56`		`- SashTab(ControlExample instance) {`
	`56`	`+ public SashTab(ControlExample instance) {`
`57`	`57`	`super(instance);`
`58`	`58`	`}`
`59`	`59`