[cvs] expresso commit by lhamel: fix import state

JCorporate Ltd jcorp at jcorporate.com
Wed Apr 27 18:44:32 UTC 2005


Log Message:
-----------
fix import state

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/controller:
        XMLController.java

Revision Data
-------------
Index: XMLController.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/controller/XMLController.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/controller/XMLController.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/controller/XMLController.java -u -r1.19 -r1.20
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/controller/XMLController.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/controller/XMLController.java
@@ -69,16 +69,6 @@
  */
 package com.jcorporate.expresso.ext.xml.controller;
 
-import java.io.BufferedOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.apache.log4j.Logger;
-
 import com.jcorporate.expresso.core.controller.ControllerException;
 import com.jcorporate.expresso.core.controller.ControllerRequest;
 import com.jcorporate.expresso.core.controller.ControllerResponse;
@@ -96,6 +86,15 @@
 import com.jcorporate.expresso.core.security.SuperUser;
 import com.jcorporate.expresso.ext.xml.dbobj.XMLDBObject;
 import com.jcorporate.expresso.services.dbobj.SchemaList;
+import org.apache.log4j.Logger;
+
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Vector;
 
 
 /**
@@ -448,15 +447,22 @@
         res.addInput(server);
 
         Input dbobjName = new Input("DBObjectName");
-        dbobjName.setLabel("Database Object:");
+        dbobjName.setLabel("Database Object");
         res.addInput(dbobjName);
 
-        dbobjName.setLabel("Login:");
-        res.addInput(dbobjName);
+        Input login = new Input("Login");
+        login.setLabel("Login");
+        res.addInput(login);
 
         Input password = new Input("Password");
-        password.setLabel("Password:");
+        password.setLabel("Password");
         res.addInput(password);
+
+        Transition doImport = new Transition("Begin Import",
+                getClass().getName());
+        doImport.setName("doImport");
+        doImport.addParam(STATE_PARAM_KEY, "doImport");
+        res.addTransition(doImport);
     } /* promptImportState() */
 
 


More information about the cvs mailing list