[Javaclient-cvs] javaclient/net/sourceforge/javaclient/tools/xsl ClassGenerator.java,1.3,1.4

[cuongnt <cu...@us...>]

Update of /cvsroot/javaclient/javaclient/net/sourceforge/javaclient/tools/xsl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27665/net/sourceforge/javaclient/tools/xsl

Modified Files:
	ClassGenerator.java 
Log Message:
add dialog widget


Index: ClassGenerator.java
===================================================================
RCS file: /cvsroot/javaclient/javaclient/net/sourceforge/javaclient/tools/xsl/ClassGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ClassGenerator.java	13 Oct 2004 21:09:51 -0000	1.3
--- ClassGenerator.java	14 Oct 2004 20:13:25 -0000	1.4
***************
*** 163,176 ****
  		String externControllerName = externControllerInterface.size()>0 ? name+"ExternController" : null;
  		String modelName = name+"Model";
! 		String displayName = name + display;
! 		PrintStream out = openFile(name + display + "java");
      out.println("package "+packageName+";\n");
  		out.println("import java.util.Stack;");
! 		out.println("import org.eclipse.swt.widgets." + display + ";");
! 			
  		out.println("import org.eclipse.swt.widgets.Widget;");
- 		out.println("import org.eclipse.swt.events.ShellListener;");
- 		out.println("import org.eclipse.swt.events.ShellAdapter;");
- 		out.println("import org.eclipse.swt.events.ShellEvent;");
  		out.println("import net.sourceforge.javaclient.client.proxy.ClientModelProxy;");
      out.println("import "+packageName+".model."+modelName+";");
--- 163,184 ----
  		String externControllerName = externControllerInterface.size()>0 ? name+"ExternController" : null;
  		String modelName = name+"Model";
! 		String rootElementName = name + rootElement;
! 		PrintStream out = openFile(name + rootElement + ".java");
      out.println("package "+packageName+";\n");
  		out.println("import java.util.Stack;");
! 		out.println("import org.eclipse.swt.widgets.Display;");
! 		if(rootElement.equals("Dialog"))
! 		{
! 			out.println("import org.eclipse.swt.widgets.Shell;");
! 			out.println("import org.eclipse.swt.widgets.Dialog;");
! 		}
! 		else
! 		{
! 			out.println("import org.eclipse.swt.events.ShellListener;");
! 			out.println("import org.eclipse.swt.events.ShellAdapter;");
! 			out.println("import org.eclipse.swt.events.ShellEvent;");
! 		}
! 		
  		out.println("import org.eclipse.swt.widgets.Widget;");
  		out.println("import net.sourceforge.javaclient.client.proxy.ClientModelProxy;");
      out.println("import "+packageName+".model."+modelName+";");
***************
*** 181,185 ****
  			out.println("import "+i.next()+";");
  		}
! 		if(display.equals("Display"))
  		{
  			out.println("\npublic abstract class "+ name + 
--- 189,201 ----
  			out.println("import "+i.next()+";");
  		}
! 
! 		if(rootElement.equals("Dialog"))
! 		{
! 			out.println("\npublic abstract class "+ name +
! 											"Dialog extends Dialog\n{");
! 			out.print("\tpublic " + name +
! 									"Dialog(Shell parent)\n\t{\n\t\tsuper(parent);\n\t}\n");
! 		}
! 		else
  		{
  			out.println("\npublic abstract class "+ name + 
***************
*** 191,201 ****
  							"Display(Display aDpy)\n\t{\t\tdpy = aDpy;\n\t}\n");
  		}
! 		else
! 		{
! 			out.println("\npublic abstract class "+ name +
! 											"Dialog extends Dialog\n{");
! 			out.print("\tpublic " + name +
! 									"Dialog(Shell parent)\n\t{\t\tsuper(parent);\n\t}\n");
! 		}
  		out.print("\tpublic void create(boolean isVisible)\n\t{\n");
  		out.print("\t\tWidget parent = null;\n");
--- 207,211 ----
  							"Display(Display aDpy)\n\t{\t\tdpy = aDpy;\n\t}\n");
  		}
! 	
  		out.print("\tpublic void create(boolean isVisible)\n\t{\n");
  		out.print("\t\tWidget parent = null;\n");
***************
*** 223,229 ****
      out.println("\t\t} catch(Exception e) { throw new RuntimeException(\"Fatal error in getting ejb\"); }");
  
! 		if(display.equals("Display"))
  			out.println("\t\tif(dpy == null)\n\t\t{\n\t\t\tdpy = Display.getDefault();\n\t\t}\n");
  		out.println("\t\tStack parentStack  = new Stack();");
  		// get rid of extra PopStack
  		while(components.get(components.size()-1) instanceof PopStack)
--- 233,248 ----
      out.println("\t\t} catch(Exception e) { throw new RuntimeException(\"Fatal error in getting ejb\"); }");
  
! 		if(rootElement.equals("Display"))
  			out.println("\t\tif(dpy == null)\n\t\t{\n\t\t\tdpy = Display.getDefault();\n\t\t}\n");
  		out.println("\t\tStack parentStack  = new Stack();");
+ 		if(rootElement.equals("Dialog"))
+ 		{
+ 			out.print("\t\tshell =");
+ 			out.print("\t\t\t\tJCFactory.newShell(getParent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);\n");
+ 			if(title != null)
+ 				out.print("\t\tshell.setText(\"" + title + "\");");
+ 			out.print("\t\tparentStack.push(parent);");
+ 			out.print("\t\tparent = shell;\n");
+ 		}
  		// get rid of extra PopStack
  		while(components.get(components.size()-1) instanceof PopStack)
***************
*** 242,248 ****
  		out.println("\t\tshell.open();");
      out.println("\t}");
  		out.println("\tpublic "+modelName+" getModel()");
  		out.println("\t{\n\t\treturn(("+modelName+")proxy.getInstance());\n\t}\n");
- 		out.println("\tpublic void shellClosed(ShellEvent e) {}");
  
  		i = dpyObjects.keySet().iterator();
--- 261,286 ----
  		out.println("\t\tshell.open();");
      out.println("\t}");
+ 
+ 		if(rootElement.equals("Dialog"))
+ 		{
+ 			out.println("\n\tpublic Object open()");
+ 			out.println("\t{");
+ 			out.println("\t\tDisplay dpy = shell.getDisplay();");
+ 			out.println("\t\twhile (!shell.isDisposed())");
+ 			out.println("\t\t{");
+ 			out.println("\t\t\tif(!dpy.readAndDispatch())");
+ 			out.println("\t\t\t\t dpy.sleep();");
+ 			out.println("\t\t}");
+ 
+ 			out.println("\t\treturn(retVal);");
+ 			out.println("\t}\n");
+ 		}
+ 		else
+ 		{
+ 			out.println("\tpublic void shellClosed(ShellEvent e) {}");
+ 		}
+ 
  		out.println("\tpublic "+modelName+" getModel()");
  		out.println("\t{\n\t\treturn(("+modelName+")proxy.getInstance());\n\t}\n");
  
  		i = dpyObjects.keySet().iterator();
***************
*** 276,280 ****
  
  
! 		out.println("\tprivate Display dpy;");
  		out.println("\tprivate ClientModelProxy proxy;");
  		i = dpyObjects.keySet().iterator();
--- 314,324 ----
  
  
! 		if(rootElement.equals("Display"))
! 			out.println("\tprivate Display dpy;");
! 		else if(rootElement.equals("Dialog"))
! 		{
! 			out.println("\tprotected Shell shell;");
! 			out.println("\tprotected Object retVal = null;");
! 		}
  		out.println("\tprivate ClientModelProxy proxy;");
  		i = dpyObjects.keySet().iterator();
***************
*** 361,365 ****
  	public void setToDialog()
  	{
! 		display = "Dialog";
  	}
  
--- 405,414 ----
  	public void setToDialog()
  	{
! 		rootElement = "Dialog";
! 	}
! 
! 	public void setTitle(String aTitle)
! 	{
! 		title = aTitle;
  	}
  
***************
*** 383,387 ****
  	private ArrayList modelNames;
  	private ArrayList models;
! 	private String display = "Display";
  }
  
--- 432,437 ----
  	private ArrayList modelNames;
  	private ArrayList models;
! 	private String rootElement = "Display";
! 	private String title = null;
  }