Enable custom widget examples

zhourenjian · zhourenjian · commit bf5c29ab309b · 2009-02-15T06:13:46.000Z
diff --git a/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CComboTab.java b/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CComboTab.java
@@ -38,7 +38,7 @@ class CComboTab extends Tab {
 	/**
 	 * Creates the Tab within a given instance of ControlExample.
 	 */
-	CComboTab(ControlExample instance) {
+	public CComboTab(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
@@ -57,36 +57,7 @@ public class ControlExample {
 	public ControlExample(Composite parent) {
 		initResources();
 		tabFolder = new TabFolder (parent, SWT.NONE);
-		String[] tabs = new String[] {
-//				"Table",
-				"Button", 
-//				"Canvas",
-//				"CLabel",
-				
-				"Combo",
-				
-				"CoolBar",
-//				"CTabFolder",
-				"Dialog",
-				"Group",
-				"Label",
-				"Link",
-				"List",
-				"Menu",
-				"ProgressBar",
-				
-				"Sash",
-				"SashForm",
-				// shellTab = new ShellTab(this),
-				"Shell",
-				"Slider",
-				"Spinner",
-				"TabFolder",
-				"Table",
-				"Text",
-				"ToolBar",
-				"Tree"
-		};
+		String[] tabs = getTabs();
 		for (int i=0; i<tabs.length; i++) {
 			TabItem item = new TabItem (tabFolder, SWT.NONE);
 		    item.setText (tabs [i]);
@@ -198,6 +169,40 @@ public void widgetSelected(SelectionEvent e) {
 		startup = false;
 	}
 
+	String[] getTabs() {
+		String[] tabs = new String[] {
+//				"Table",
+				"Button", 
+//				"Canvas",
+//				"CLabel",
+				
+				"Combo",
+				
+				"CoolBar",
+//				"CTabFolder",
+				"Dialog",
+				"Group",
+				"Label",
+				"Link",
+				"List",
+				"Menu",
+				"ProgressBar",
+				
+				"Sash",
+				"SashForm",
+				// shellTab = new ShellTab(this),
+				"Shell",
+				"Slider",
+				"Spinner",
+				"TabFolder",
+				"Table",
+				"Text",
+				"ToolBar",
+				"Tree"
+		};
+		return tabs;
+	}
+
 	/**
 	 * Answers the set of example Tabs
 	 */
diff --git a/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CustomControlExample.java b/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/CustomControlExample.java
@@ -26,19 +26,31 @@ public CustomControlExample(Composite parent) {
 		super (parent);
 	}
 	
-	/**
-	 * Answers the set of example Tabs
-	 */
-	Tab[] createTabs() {
-		return new Tab [] {
-			new CComboTab (this),
-			new CLabelTab (this),
-			new CTabFolderTab (this),
-			new SashFormTab (this),
-			new StyledTextTab (this),
+//	/**
+//	 * Answers the set of example Tabs
+//	 */
+//	Tab[] createTabs() {
+//		return new Tab [] {
+//			new CComboTab (this),
+//			new CLabelTab (this),
+//			new CTabFolderTab (this),
+//			new SashFormTab (this),
+//			new StyledTextTab (this),
+//		};
+//	}
+//	
+	@Override
+	String[] getTabs() {
+		String[] tabs = new String[] {
+				"CLabel",
+				"CCombo",
+				"CTabFolder",
+				"SashForm",
+				"StyledText"
 		};
+		return tabs;
 	}
-	
+
 	/**
 	 * Invokes as a standalone program.
 	 */
@@ -48,7 +60,7 @@ public static void main(String[] args) {
 		shell.setLayout(new FillLayout());
 		CustomControlExample instance = new CustomControlExample(shell);
 		shell.setText(getResourceString("custom.window.title"));
-		setShellSize(display, shell);
+		//setShellSize(display, shell);
 		shell.open();
 		while (! shell.isDisposed()) {
 			if (! display.readAndDispatch()) display.sleep();
diff --git a/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/StyledTextTab.java b/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/StyledTextTab.java
@@ -37,7 +37,7 @@ class StyledTextTab extends ScrollableTab {
 	/**
 	 * Creates the Tab within a given instance of ControlExample.
 	 */
-	StyledTextTab(ControlExample instance) {
+	public StyledTextTab(ControlExample instance) {
 		super(instance);
 	}
 	
diff --git a/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java b/tests/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java
@@ -819,8 +819,6 @@ void disposeExampleWidgets () {
 	/**
 	 * @param image
 	 * @param color
-	 * 
-	 * @j2sNative
 	 */
 	void drawImage (Image image, Color color) {
 		GC gc = new GC(image);

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class CComboTab extends Tab {`
`38`	`38`	`/**`
`39`	`39`	`* Creates the Tab within a given instance of ControlExample.`
`40`	`40`	`*/`
`41`		`- CComboTab(ControlExample instance) {`
	`41`	`+ public CComboTab(ControlExample instance) {`
`42`	`42`	`super(instance);`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class StyledTextTab extends ScrollableTab {`
`37`	`37`	`/**`
`38`	`38`	`* Creates the Tab within a given instance of ControlExample.`
`39`	`39`	`*/`
`40`		`- StyledTextTab(ControlExample instance) {`
	`40`	`+ public StyledTextTab(ControlExample instance) {`
`41`	`41`	`super(instance);`
`42`	`42`	`}`
`43`	`43`