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

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

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

Modified Files:
	ClassGenerator.java 
Log Message:
develop jc dialog


Index: ClassGenerator.java
===================================================================
RCS file: /cvsroot/javaclient/javaclient/net/sourceforge/javaclient/tools/xsl/ClassGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ClassGenerator.java	7 Oct 2004 14:46:47 -0000	1.2
--- ClassGenerator.java	13 Oct 2004 21:09:51 -0000	1.3
***************
*** 163,171 ****
  		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;");
--- 163,172 ----
  		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;");
***************
*** 180,192 ****
  			out.println("import "+i.next()+";");
  		}
! 		out.println("\npublic abstract class "+name+"Display extends ShellAdapter {");
! 
! 		// Constructor
! 		out.println("\tpublic " + name+"Display(){}");
  
! 		out.print("\tpublic " + name+"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");
! 		out.println("\t\tproxy = new ClientModelProxy("+packageName+".model."+modelName+".class,this);");
  		i = listClasses.keySet().iterator();
  		while(i.hasNext())
--- 181,205 ----
  			out.println("import "+i.next()+";");
  		}
! 		if(display.equals("Display"))
! 		{
! 			out.println("\npublic abstract class "+ name + 
! 												"Display extends ShellAdapter\n{");
! 			// Constructor
! 			out.println("\tpublic " + name+"Display(){}");
  
! 			out.print("\tpublic " + name+
! 							"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");
! 		out.println("\t\tproxy = new ClientModelProxy("+
! 									packageName+".model."+modelName+".class,this);");
  		i = listClasses.keySet().iterator();
  		while(i.hasNext())
***************
*** 196,204 ****
        if(classInfo[0].indexOf('.') == -1)
        {
! 			  out.println("\t\tproxy.addListClass(\""+key+"List\","+packageName+".model."+classInfo[0]+".class,\""+classInfo[1]+"\");");
        }
        else
        {
! 			  out.println("\t\tproxy.addListClass(\""+key+"List\","+classInfo[0]+",\""+classInfo[1]+"\");");
        }
  		}
--- 209,219 ----
        if(classInfo[0].indexOf('.') == -1)
        {
! 			  out.println("\t\tproxy.addListClass(\""+ key + "List\"," +
! 					packageName+".model."+classInfo[0]+".class,\""+classInfo[1]+"\");");
        }
        else
        {
! 			  out.println("\t\tproxy.addListClass(\""+key+"List\","+
! 												classInfo[0]+",\""+classInfo[1]+"\");");
        }
  		}
***************
*** 208,212 ****
      out.println("\t\t} catch(Exception e) { throw new RuntimeException(\"Fatal error in getting ejb\"); }");
  
! 		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
--- 223,228 ----
      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
***************
*** 343,346 ****
--- 359,367 ----
  	}
  
+ 	public void setToDialog()
+ 	{
+ 		display = "Dialog";
+ 	}
+ 
  	private HashMap imports = new HashMap();
  	private HashMap dpyObjects = new HashMap();
***************
*** 362,365 ****
--- 383,387 ----
  	private ArrayList modelNames;
  	private ArrayList models;
+ 	private String display = "Display";
  }