Update of /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24962/main/servlet/org/compiere/www Modified Files: Test.java Test2.java WAccount.java WFieldUpdate.java WFilter.java WForm.java WLocation.java WLogin.java WLookup.java WMenu.java WProcess.java WReport.java WStart.java WStatus.java WTask.java WWindow.java WWorkflow.java Removed Files: WDoc.java WEnv.java WUtil.java Log Message: . Index: Test.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/Test.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Test.java 6 Mar 2004 07:16:14 -0000 1.2 --- Test.java 30 Aug 2004 06:02:54 -0000 1.3 *************** *** 18,21 **** --- 18,23 ---- import java.io.*; + import org.compiere.util.*; + /** * Test Servlet *************** *** 33,37 **** { super.init(config); ! if (!WEnv.initWeb(config)) throw new ServletException("Test.init"); } // init --- 35,39 ---- { super.init(config); ! if (!WebEnv.initWeb(config)) throw new ServletException("Test.init"); } // init *************** *** 43,49 **** throws ServletException, IOException { ! WDoc doc = WDoc.create ("Get Request Test"); // ! WUtil.createResponse(request, response, this, null, doc, true); } // doGet --- 45,51 ---- throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("Get Request Test"); // ! WebUtil.createResponse(request, response, this, null, doc, true); } // doGet *************** *** 55,61 **** throws ServletException, IOException { ! WDoc doc = WDoc.create ("Post Request Test"); // ! WUtil.createResponse(request, response, this, null, doc, true); } // doPost --- 57,63 ---- throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("Post Request Test"); // ! WebUtil.createResponse(request, response, this, null, doc, true); } // doPost Index: Test2.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/Test2.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Test2.java 15 Feb 2004 01:56:03 -0000 1.2 --- Test2.java 30 Aug 2004 06:02:54 -0000 1.3 *************** *** 18,21 **** --- 18,22 ---- import java.io.*; + import org.compiere.util.*; /** *************** *** 33,37 **** { super.init(config); ! WEnv.initWeb(config); } // init --- 34,38 ---- { super.init(config); ! WebEnv.initWeb(config); } // init *************** *** 51,57 **** public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ! WDoc doc = WDoc.create ("Get Request Test2"); // ! WUtil.createResponse(request, response, this, null, doc, true); } // doPost --- 52,58 ---- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("Get Request Test2"); // ! WebUtil.createResponse(request, response, this, null, doc, true); } // doPost Index: WAccount.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WAccount.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WAccount.java 6 Mar 2004 07:16:14 -0000 1.2 --- WAccount.java 30 Aug 2004 06:02:54 -0000 1.3 *************** *** 52,56 **** { super.init(config); ! if (!WEnv.initWeb(config)) throw new ServletException("WAccount.init"); } // init --- 52,56 ---- { super.init(config); ! if (!WebEnv.initWeb(config)) throw new ServletException("WAccount.init"); } // init *************** *** 71,78 **** WWindowStatus ws = null; if (sess != null) ! ws = (WWindowStatus)sess.getAttribute(WEnv.SA_WINDOW); if (ws == null) { ! WUtil.createTimeoutPage(request, response, this, null, null); return; } --- 71,78 ---- WWindowStatus ws = null; if (sess != null) ! ws = (WWindowStatus)sess.getAttribute(WebEnv.SA_WINDOW); if (ws == null) { ! WebUtil.createTimeoutPage(request, response, this, null, null); return; } *************** *** 85,89 **** if (mField == null || formName == null || columnName == null || formName.equals("") || columnName.equals("")) { ! WUtil.createTimeoutPage(request, response, this, ws.ctx, Msg.getMsg(ws.ctx, "ParameterMissing")); return; } --- 85,89 ---- if (mField == null || formName == null || columnName == null || formName.equals("") || columnName.equals("")) { ! WebUtil.createTimeoutPage(request, response, this, ws.ctx, Msg.getMsg(ws.ctx, "ParameterMissing")); return; } *************** *** 92,96 **** // Create Document ! WDoc doc = WDoc.create (mField.getHeader()); body body = doc.getBody(); body.setOnBlur("self.focus();"); --- 92,96 ---- // Create Document ! WebDoc doc = WebDoc.create (mField.getHeader()); body body = doc.getBody(); body.setOnBlur("self.focus();"); *************** *** 110,114 **** // // Log.trace(Log.l6_Database, doc.toString()); ! WUtil.createResponse (request, response, this, null, doc, false); } // doGet --- 110,114 ---- // // Log.trace(Log.l6_Database, doc.toString()); ! WebUtil.createResponse (request, response, this, null, doc, false); } // doGet Index: WFieldUpdate.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WFieldUpdate.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** WFieldUpdate.java 22 Jul 2004 05:54:02 -0000 1.5 --- WFieldUpdate.java 30 Aug 2004 06:02:54 -0000 1.6 *************** *** 39,43 **** { super.init(config); ! if (!WEnv.initWeb(config)) throw new ServletException("WFieldUpdate.init"); } // init --- 39,43 ---- { super.init(config); ! if (!WebEnv.initWeb(config)) throw new ServletException("WFieldUpdate.init"); } // init *************** *** 81,86 **** // Get Session Info HttpSession sess = request.getSession(); ! Properties ctx = (Properties)sess.getAttribute(WEnv.SA_CONTEXT); ! WWindowStatus ws = (WWindowStatus)sess.getAttribute(WEnv.SA_WINDOW); if (sess == null || ctx == null) // ws can be null for Login --- 81,86 ---- // Get Session Info HttpSession sess = request.getSession(); ! Properties ctx = (Properties)sess.getAttribute(WebEnv.SA_CONTEXT); ! WWindowStatus ws = (WWindowStatus)sess.getAttribute(WebEnv.SA_WINDOW); if (sess == null || ctx == null) // ws can be null for Login *************** *** 93,97 **** // Document ! WDoc doc = WDoc.create (true); body body = doc.getBody(); --- 93,97 ---- // Document ! WebDoc doc = WebDoc.create (true); body body = doc.getBody(); *************** *** 110,114 **** // Answer ! WUtil.createResponse (request, response, this, null, doc, false); } // doPost --- 110,114 ---- // Answer ! WebUtil.createResponse (request, response, this, null, doc, false); } // doPost *************** *** 159,163 **** { // Formname ! String form = "top." + WEnv.TARGET_WINDOW + ".document.forms." + formName + "."; // Get Data KeyNamePair[] clients = DB.loadClients(ctx, new KeyNamePair(Integer.parseInt(fieldValue) , fieldValue)); --- 159,163 ---- { // Formname ! String form = "top." + WebEnv.TARGET_WINDOW + ".document.forms." + formName + "."; // Get Data KeyNamePair[] clients = DB.loadClients(ctx, new KeyNamePair(Integer.parseInt(fieldValue) , fieldValue)); *************** *** 249,253 **** { // Formname ! String form = "top." + WEnv.TARGET_WINDOW + ".document." + formName + "."; StringBuffer script = new StringBuffer (); --- 249,253 ---- { // Formname ! String form = "top." + WebEnv.TARGET_WINDOW + ".document." + formName + "."; StringBuffer script = new StringBuffer (); Index: WFilter.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WFilter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** WFilter.java 6 Mar 2004 07:16:14 -0000 1.4 --- WFilter.java 30 Aug 2004 06:02:54 -0000 1.5 *************** *** 94,98 **** // Ignore static content boolean check = true; ! if (!uri.startsWith(WEnv.DIR_BASE) // not requesting /compiere/... || uri.endsWith(".gif") || uri.endsWith(".html") || uri.endsWith(".css") || uri.endsWith(".js")) --- 94,98 ---- // Ignore static content boolean check = true; ! if (!uri.startsWith(WebEnv.DIR_BASE) // not requesting /compiere/... || uri.endsWith(".gif") || uri.endsWith(".html") || uri.endsWith(".css") || uri.endsWith(".js")) *************** *** 130,134 **** log.warn("Rejected " + uri); String msg = "Error: Access Rejected"; ! WDoc doc = WDoc.create (msg); // Body body b = doc.getBody(); --- 130,134 ---- log.warn("Rejected " + uri); String msg = "Error: Access Rejected"; ! WebDoc doc = WebDoc.create (msg); // Body body b = doc.getBody(); Index: WForm.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WForm.java 6 Mar 2004 07:16:14 -0000 1.2 --- WForm.java 30 Aug 2004 06:02:54 -0000 1.3 *************** *** 18,21 **** --- 18,23 ---- import java.io.*; + import org.compiere.util.*; + /** * Form *************** *** 33,37 **** { super.init(config); ! if (!WEnv.initWeb(config)) throw new ServletException("WForm.init"); } // init --- 35,39 ---- { super.init(config); ! if (!WebEnv.initWeb(config)) throw new ServletException("WForm.init"); } // init *************** *** 43,49 **** throws ServletException, IOException { ! WDoc doc = WDoc.create ("WForm - Get - Not Implemented Yet"); // ! WUtil.createResponse(request, response, this, null, doc, false); } // doGet --- 45,51 ---- throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("WForm - Get - Not Implemented Yet"); // ! WebUtil.createResponse(request, response, this, null, doc, false); } // doGet *************** *** 55,61 **** throws ServletException, IOException { ! WDoc doc = WDoc.create ("WForm - Post - Not Implemented Yet"); // ! WUtil.createResponse(request, response, this, null, doc, false); } // doPost --- 57,63 ---- throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("WForm - Post - Not Implemented Yet"); // ! WebUtil.createResponse(request, response, this, null, doc, false); } // doPost Index: WLocation.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WLocation.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** WLocation.java 15 Jul 2004 04:39:15 -0000 1.8 --- WLocation.java 30 Aug 2004 06:02:54 -0000 1.9 *************** *** 52,56 **** { super.init(config); ! if (!WEnv.initWeb(config)) throw new ServletException("WLocation.init"); } // init --- 52,56 ---- { super.init(config); ! if (!WebEnv.initWeb(config)) throw new ServletException("WLocation.init"); } // init *************** *** 81,88 **** WWindowStatus ws = null; if (sess != null) ! ws = (WWindowStatus)sess.getAttribute(WEnv.SA_WINDOW); if (ws == null) { ! WUtil.createTimeoutPage(request, response, this, null, null); return; } --- 81,88 ---- WWindowStatus ws = null; if (sess != null) ! ws = (WWindowStatus)sess.getAttribute(WebEnv.SA_WINDOW); if (ws == null) { ! WebUtil.createTimeoutPage(request, response, this, null, null); return; } *************** *** 95,99 **** if (mField == null || formName == null || columnName == null || formName.equals("") || columnName.equals("")) { ! WUtil.createTimeoutPage(request, response, this, ws.ctx, Msg.getMsg(ws.ctx, "ParameterMissing")); return; } --- 95,99 ---- if (mField == null || formName == null || columnName == null || formName.equals("") || columnName.equals("")) { ! WebUtil.createTimeoutPage(request, response, this, ws.ctx, Msg.getMsg(ws.ctx, "ParameterMissing")); return; } *************** *** 102,106 **** // Create Document ! WDoc doc = WDoc.create (mField.getHeader()); body body = doc.getBody(); body.setOnLoad("self.focus();"); --- 102,106 ---- // Create Document ! WebDoc doc = WebDoc.create (mField.getHeader()); body body = doc.getBody(); body.setOnLoad("self.focus();"); *************** *** 112,116 **** location = new MLocation(ws.ctx, 0); body.addElement(createForm(request.getRequestURI(), ws, location, target)); ! WUtil.createResponse (request, response, this, null, doc, false); } // doGet --- 112,116 ---- location = new MLocation(ws.ctx, 0); body.addElement(createForm(request.getRequestURI(), ws, location, target)); ! WebUtil.createResponse (request, response, this, null, doc, false); } // doGet *************** *** 131,142 **** WWindowStatus ws = null; if (sess != null) ! ws = (WWindowStatus)sess.getAttribute(WEnv.SA_WINDOW); if (ws == null) { ! WUtil.createTimeoutPage(request, response, this, null, null); return; } String target = request.getParameter(P_TARGET); ! int C_Location_ID = WUtil.getParameterAsInt(request, P_C_LOCATION_ID); // Create Location --- 131,142 ---- WWindowStatus ws = null; if (sess != null) ! ws = (WWindowStatus)sess.getAttribute(WebEnv.SA_WINDOW); if (ws == null) { ! WebUtil.createTimeoutPage(request, response, this, null, null); return; } String target = request.getParameter(P_TARGET); ! int C_Location_ID = WebUtil.getParameterAsInt(request, P_C_LOCATION_ID); // Create Location *************** *** 155,160 **** location.setCity (city); location.setPostal (postal); ! location.setC_Country_ID (WUtil.getParameterAsInt(request, P_C_COUNTRY_ID)); ! location.setC_Region_ID (WUtil.getParameterAsInt(request, P_C_REGION_ID)); } catch (UnsupportedEncodingException ex) { --- 155,160 ---- location.setCity (city); location.setPostal (postal); ! location.setC_Country_ID (WebUtil.getParameterAsInt(request, P_C_COUNTRY_ID)); ! location.setC_Region_ID (WebUtil.getParameterAsInt(request, P_C_REGION_ID)); } catch (UnsupportedEncodingException ex) { *************** *** 163,172 **** location.setCity (request.getParameter(P_CITY)); location.setPostal (request.getParameter(P_POSTAL)); ! location.setC_Country_ID (WUtil.getParameterAsInt(request, P_C_COUNTRY_ID)); ! location.setC_Region_ID (WUtil.getParameterAsInt(request, P_C_REGION_ID)); } // Document ! WDoc doc = WDoc.create ("WLocation"); body b = doc.getBody(); --- 163,172 ---- location.setCity (request.getParameter(P_CITY)); location.setPostal (request.getParameter(P_POSTAL)); ! location.setC_Country_ID (WebUtil.getParameterAsInt(request, P_C_COUNTRY_ID)); ! location.setC_Region_ID (WebUtil.getParameterAsInt(request, P_C_REGION_ID)); } // Document ! WebDoc doc = WebDoc.create ("WLocation"); body b = doc.getBody(); *************** *** 185,189 **** Log.trace(Log.l6_Database, "WLocation.doPost", script.toString()); // ! WUtil.createResponse(request, response, this, null, doc, false); } // doPost --- 185,189 ---- Log.trace(Log.l6_Database, "WLocation.doPost", script.toString()); // ! WebUtil.createResponse(request, response, this, null, doc, false); } // doPost Index: WLogin.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WLogin.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** WLogin.java 15 Aug 2004 15:32:50 -0000 1.6 --- WLogin.java 30 Aug 2004 06:02:54 -0000 1.7 *************** *** 56,60 **** { super.init(config); ! if (!WEnv.initWeb(config)) throw new ServletException("WLogin.init"); } // init --- 56,60 ---- { super.init(config); ! if (!WebEnv.initWeb(config)) throw new ServletException("WLogin.init"); } // init *************** *** 118,135 **** // Create New Session HttpSession sess = request.getSession(true); ! sess.setMaxInactiveInterval(WEnv.TIMEOUT); // Get/set Context ! Properties ctx = (Properties)sess.getAttribute(WEnv.SA_CONTEXT); if (ctx == null) ctx = new Properties(); ! sess.setAttribute(WEnv.SA_CONTEXT, ctx); // Get Cookie ! Properties cProp = WUtil.getCookieProprties(request); // Language checkLanguage (request, sess, ctx, cProp); // Page ! WDoc doc = null; // Check DB connection --- 118,135 ---- // Create New Session HttpSession sess = request.getSession(true); ! sess.setMaxInactiveInterval(WebEnv.TIMEOUT); // Get/set Context ! Properties ctx = (Properties)sess.getAttribute(WebEnv.SA_CONTEXT); if (ctx == null) ctx = new Properties(); ! sess.setAttribute(WebEnv.SA_CONTEXT, ctx); // Get Cookie ! Properties cProp = WebUtil.getCookieProprties(request); // Language checkLanguage (request, sess, ctx, cProp); // Page ! WebDoc doc = null; // Check DB connection *************** *** 137,141 **** { String msg = Msg.getMsg(ctx, "WLoginNoDB"); ! doc = WDoc.create (msg); if (msg.equals("WLoginNoDB")) msg = "No Database Connection"; --- 137,141 ---- { String msg = Msg.getMsg(ctx, "WLoginNoDB"); ! doc = WebDoc.create (msg); if (msg.equals("WLoginNoDB")) msg = "No Database Connection"; *************** *** 172,176 **** doc = createFirstPage(cProp, request, Msg.getMsg(ctx, "UserPwdError")); else ! doc = createSecondPage(cProp, request, WUtil.convertToOption(roles, null), ""); // Can we save Cookie ? if (request.getParameter(P_STORE) == null) --- 172,176 ---- doc = createFirstPage(cProp, request, Msg.getMsg(ctx, "UserPwdError")); else ! doc = createSecondPage(cProp, request, WebUtil.convertToOption(roles, null), ""); // Can we save Cookie ? if (request.getParameter(P_STORE) == null) *************** *** 188,192 **** // ! WUtil.createResponse (request, response, this, cProp, doc, true); } // doPost --- 188,192 ---- // ! WebUtil.createResponse (request, response, this, cProp, doc, true); } // doPost *************** *** 240,244 **** Msg.getMsg(ctx, "0"); cProp.setProperty(P_LANGUAGE, language.getAD_Language()); ! sess.setAttribute(WEnv.SA_LANGUAGE, language); } } // checkLanguage --- 240,244 ---- Msg.getMsg(ctx, "0"); cProp.setProperty(P_LANGUAGE, language.getAD_Language()); ! sess.setAttribute(WebEnv.SA_LANGUAGE, language); } } // checkLanguage *************** *** 254,258 **** * @return WDoc page */ ! private WDoc createFirstPage(Properties cProp, HttpServletRequest request, String errorMessage) { --- 254,258 ---- * @return WDoc page */ ! private WebDoc createFirstPage(Properties cProp, HttpServletRequest request, String errorMessage) { *************** *** 269,276 **** // Document ! WDoc doc = WDoc.create (windowTitle); body b = doc.getBody(); // Clear Menu Frame ! b.addElement(WUtil.getClearFrame(WEnv.TARGET_MENU)); // Form - post to same URL --- 269,276 ---- // Document ! WebDoc doc = WebDoc.create (windowTitle); body b = doc.getBody(); // Clear Menu Frame ! b.addElement(WebUtil.getClearFrame(WebEnv.TARGET_MENU)); // Form - post to same URL *************** *** 278,282 **** form myForm = null; myForm = new form(action, form.post, form.ENC_DEFAULT).setName("Login1"); ! myForm.setAcceptCharset(WEnv.CHARACTERSET); table table = new table().setAlign(AlignType.center); --- 278,282 ---- form myForm = null; myForm = new form(action, form.post, form.ENC_DEFAULT).setName("Login1"); ! myForm.setAcceptCharset(WebEnv.CHARACTERSET); table table = new table().setAlign(AlignType.center); *************** *** 363,367 **** * @return WDoc page */ ! private WDoc createSecondPage(Properties cProp, HttpServletRequest request, option[] roleOptions, String errorMessage) { --- 363,367 ---- * @return WDoc page */ ! private WebDoc createSecondPage(Properties cProp, HttpServletRequest request, option[] roleOptions, String errorMessage) { *************** *** 370,382 **** String windowTitle = Msg.getMsg(AD_Language, "LoginSuccess"); // Create Document ! WDoc doc = WDoc.create (windowTitle); body b = doc.getBody(); // Form - Get Menu ! String action = WEnv.getBaseDirectory("WMenu"); form myForm = null; myForm = new form(action, form.post, form.ENC_DEFAULT).setName("Login2"); ! myForm.setTarget(WEnv.TARGET_MENU); ! myForm.setAcceptCharset(WEnv.CHARACTERSET); table table = new table().setAlign(AlignType.center); --- 370,382 ---- String windowTitle = Msg.getMsg(AD_Language, "LoginSuccess"); // Create Document ! WebDoc doc = WebDoc.create (windowTitle); body b = doc.getBody(); // Form - Get Menu ! String action = WebEnv.getBaseDirectory("WMenu"); form myForm = null; myForm = new form(action, form.post, form.ENC_DEFAULT).setName("Login2"); ! myForm.setTarget(WebEnv.TARGET_MENU); ! myForm.setAcceptCharset(WebEnv.CHARACTERSET); table table = new table().setAlign(AlignType.center); *************** *** 414,418 **** // Date ! Language language = (Language)request.getSession().getAttribute(WEnv.SA_LANGUAGE); DateFormat df = DisplayType.getDateFormat(DisplayType.Date, language); String dateData = df.format(new java.util.Date()); --- 414,418 ---- // Date ! Language language = (Language)request.getSession().getAttribute(WebEnv.SA_LANGUAGE); DateFormat df = DisplayType.getDateFormat(DisplayType.Date, language); String dateData = df.format(new java.util.Date()); *************** *** 438,442 **** line.addElement(new td().addElement(cancel )); input submit = new input(input.submit, "Submit", Msg.getMsg(AD_Language, "OK")); ! submit.setOnClick("showLoadingMenu('" + WEnv.getBaseDirectory("") + "');"); line.addElement(new td().addElement(submit)); table.addElement(line); --- 438,442 ---- line.addElement(new td().addElement(cancel )); input submit = new input(input.submit, "Submit", Msg.getMsg(AD_Language, "OK")); ! submit.setOnClick("showLoadingMenu('" + WebEnv.getBaseDirectory("") + "');"); line.addElement(new td().addElement(submit)); table.addElement(line); Index: WLookup.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WLookup.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WLookup.java 6 Mar 2004 07:16:14 -0000 1.2 --- WLookup.java 30 Aug 2004 06:02:54 -0000 1.3 *************** *** 52,56 **** { super.init(config); ! if (!WEnv.initWeb(config)) throw new ServletException("WLookup.init"); } // init --- 52,56 ---- { super.init(config); ! if (!WebEnv.initWeb(config)) throw new ServletException("WLookup.init"); } // init *************** *** 71,78 **** WWindowStatus ws = null; if (sess != null) ! ws = (WWindowStatus)sess.getAttribute(WEnv.SA_WINDOW); if (ws == null) { ! WUtil.createTimeoutPage(request, response, this, null, null); return; } --- 71,78 ---- WWindowStatus ws = null; if (sess != null) ! ws = (WWindowStatus)sess.getAttribute(WebEnv.SA_WINDOW); if (ws == null) { ! WebUtil.createTimeoutPage(request, response, this, null, null); return; } *************** *** 85,89 **** if (mField == null || formName == null || columnName == null || formName.equals("") || columnName.equals("")) { ! WUtil.createTimeoutPage(request, response, this, ws.ctx, Msg.getMsg(ws.ctx, "ParameterMissing")); return; } --- 85,89 ---- if (mField == null || formName == null || columnName == null || formName.equals("") || columnName.equals("")) { ! WebUtil.createTimeoutPage(request, response, this, ws.ctx, Msg.getMsg(ws.ctx, "ParameterMissing")); return; } *************** *** 92,96 **** // Create Document ! WDoc doc = WDoc.create (mField.getHeader()); body body = doc.getBody(); body.setOnBlur("self.focus();"); --- 92,96 ---- // Create Document ! WebDoc doc = WebDoc.create (mField.getHeader()); body body = doc.getBody(); body.setOnBlur("self.focus();"); *************** *** 110,114 **** // // Log.trace(Log.l6_Database, doc.toString()); ! WUtil.createResponse (request, response, this, null, doc, false); } // doGet --- 110,114 ---- // // Log.trace(Log.l6_Database, doc.toString()); ! WebUtil.createResponse (request, response, this, null, doc, false); } // doGet Index: WMenu.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WMenu.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WMenu.java 4 Dec 2003 03:25:52 -0000 1.3 --- WMenu.java 30 Aug 2004 06:02:54 -0000 1.4 *************** *** 42,46 **** { super.init(config); ! if (!WEnv.initWeb(config)) throw new ServletException("WMenu.init"); } // init --- 42,46 ---- { super.init(config); ! if (!WebEnv.initWeb(config)) throw new ServletException("WMenu.init"); } // init *************** *** 87,91 **** if (request.getParameter("Exit") != null) { ! WUtil.createLoginPage (request, response, this, null, "Exit"); return; } --- 87,91 ---- if (request.getParameter("Exit") != null) { ! WebUtil.createLoginPage (request, response, this, null, "Exit"); return; } *************** *** 93,105 **** // Get Session attributes HttpSession sess = request.getSession(); ! Properties ctx = (Properties)sess.getAttribute(WEnv.SA_CONTEXT); if (ctx == null) { ! WUtil.createTimeoutPage(request, response, this, null, null); return; } // Window ! int AD_Window_ID = WUtil.getParameterAsInt(request, "AD_Window_ID"); // Forward to WWindow --- 93,105 ---- // Get Session attributes HttpSession sess = request.getSession(); ! Properties ctx = (Properties)sess.getAttribute(WebEnv.SA_CONTEXT); if (ctx == null) { ! WebUtil.createTimeoutPage(request, response, this, null, null); return; } // Window ! int AD_Window_ID = WebUtil.getParameterAsInt(request, "AD_Window_ID"); // Forward to WWindow *************** *** 108,112 **** Log.trace(Log.l4_Data, "AD_Window_ID=" + AD_Window_ID); // ! String url = WEnv.getBaseDirectory("WWindow?AD_Window_ID=" + AD_Window_ID); Log.trace(Log.l4_Data, "Forward to - " + url); // --- 108,112 ---- Log.trace(Log.l4_Data, "AD_Window_ID=" + AD_Window_ID); // ! String url = WebEnv.getBaseDirectory("WWindow?AD_Window_ID=" + AD_Window_ID); Log.trace(Log.l4_Data, "Forward to - " + url); // *************** *** 117,121 **** // Request not serviceable ! WUtil.createErrorPage(request, response, this, null, "NotImplemented"); } // doGet --- 117,121 ---- // Request not serviceable ! WebUtil.createErrorPage(request, response, this, null, "NotImplemented"); } // doGet *************** *** 137,145 **** // Get Session attributes HttpSession sess = request.getSession(); ! Properties ctx = (Properties)sess.getAttribute(WEnv.SA_CONTEXT); ! Properties cProp = WUtil.getCookieProprties(request); if (ctx == null) { ! WUtil.createTimeoutPage(request, response, this, null, null); return; } --- 137,145 ---- // Get Session attributes HttpSession sess = request.getSession(); ! Properties ctx = (Properties)sess.getAttribute(WebEnv.SA_CONTEXT); ! Properties cProp = WebUtil.getCookieProprties(request); if (ctx == null) { ! WebUtil.createTimeoutPage(request, response, this, null, null); return; } *************** *** 156,160 **** if (role == null || client == null || org == null) { ! WUtil.createTimeoutPage(request, response, this, ctx, Msg.getMsg(ctx, "ParameterMissing")); return; } --- 156,160 ---- if (role == null || client == null || org == null) { ! WebUtil.createTimeoutPage(request, response, this, ctx, Msg.getMsg(ctx, "ParameterMissing")); return; } *************** *** 201,205 **** { Log.error("WMenu.doPost - Parameter", e); ! WUtil.createTimeoutPage(request, response, this, ctx, Msg.getMsg(ctx, "ParameterMissing")); return; } --- 201,205 ---- { Log.error("WMenu.doPost - Parameter", e); ! WebUtil.createTimeoutPage(request, response, this, ctx, Msg.getMsg(ctx, "ParameterMissing")); return; } *************** *** 209,216 **** if (loginInfo == null) { ! WUtil.createErrorPage(request, response, this, ctx, Msg.getMsg(ctx, "RoleInconsistent")); return; } ! sess.setAttribute(WEnv.SA_LOGININFO, loginInfo); // Set cookie for future defaults --- 209,216 ---- if (loginInfo == null) { ! WebUtil.createErrorPage(request, response, this, ctx, Msg.getMsg(ctx, "RoleInconsistent")); return; } ! sess.setAttribute(WebEnv.SA_LOGININFO, loginInfo); // Set cookie for future defaults *************** *** 231,235 **** if (dateString != null && dateString.length() > 0) { ! Language language = (Language)sess.getAttribute(WEnv.SA_LANGUAGE); DateFormat df = DisplayType.getDateFormat(DisplayType.Date, language); java.util.Date date = df.parse(dateString); --- 231,235 ---- if (dateString != null && dateString.length() > 0) { ! Language language = (Language)sess.getAttribute(WebEnv.SA_LANGUAGE); DateFormat df = DisplayType.getDateFormat(DisplayType.Date, language); java.util.Date date = df.parse(dateString); *************** *** 257,267 **** // Document ! WDoc doc = WDoc.create (windowTitle); head header = doc.getHead(); // Target ! header.addElement(new base().setTarget(WEnv.TARGET_WINDOW)); // Specific Menu Script/Stylesheet ! header.addElement(new script("", WEnv.getBaseDirectory("menu.js"), "text/javascript", "JavaScript1.2")); ! header.addElement(new link().setRel("stylesheet").setHref(WEnv.getBaseDirectory("menu.css"))); // Body --- 257,267 ---- // Document ! WebDoc doc = WebDoc.create (windowTitle); head header = doc.getHead(); // Target ! header.addElement(new base().setTarget(WebEnv.TARGET_WINDOW)); // Specific Menu Script/Stylesheet ! header.addElement(new script("", WebEnv.getBaseDirectory("menu.js"), "text/javascript", "JavaScript1.2")); ! header.addElement(new link().setRel("stylesheet").setHref(WebEnv.getBaseDirectory("menu.css"))); // Body *************** *** 274,278 **** // Clear Window Frame ! body.addElement(WUtil.getClearFrame(WEnv.TARGET_WINDOW)); // Load Menu Structure ---------------------- --- 274,278 ---- // Clear Window Frame ! body.addElement(WebUtil.getClearFrame(WebEnv.TARGET_WINDOW)); // Load Menu Structure ---------------------- *************** *** 325,329 **** cProp.clear(); ! WUtil.createResponse (request, response, this, cProp, doc, false); } // doPost --- 325,329 ---- cProp.clear(); ! WebUtil.createResponse (request, response, this, cProp, doc, false); } // doPost *************** *** 441,449 **** sb.append("<li id=\"" + item + "\"><a href=\"") // url - /appl/servletName?AD_Menu_ID=x ! .append(WEnv.getBaseDirectory(servletName)) .append("?AD_Menu_ID=") .append(node.getNode_ID()) // ! .append("\" onMouseOver=\"status='" + description + "';return true;\" onclick=showLoadingWindow(\"" + WEnv.getBaseDirectory("") + "\")>") .append(node.getName()) .append("</a></li>\n"); --- 441,449 ---- sb.append("<li id=\"" + item + "\"><a href=\"") // url - /appl/servletName?AD_Menu_ID=x ! .append(WebEnv.getBaseDirectory(servletName)) .append("?AD_Menu_ID=") .append(node.getNode_ID()) // ! .append("\" onMouseOver=\"status='" + description + "';return true;\" onclick=showLoadingWindow(\"" + WebEnv.getBaseDirectory("") + "\")>") .append(node.getName()) .append("</a></li>\n"); Index: WProcess.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WProcess.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WProcess.java 6 Mar 2004 07:16:14 -0000 1.2 --- WProcess.java 30 Aug 2004 06:02:54 -0000 1.3 *************** *** 18,21 **** --- 18,23 ---- import java.io.*; + import org.compiere.util.*; + /** * *************** *** 33,37 **** { super.init(config); ! if (!WEnv.initWeb(config)) throw new ServletException("WProcess.init"); } // init --- 35,39 ---- { super.init(config); ! if (!WebEnv.initWeb(config)) throw new ServletException("WProcess.init"); } // init *************** *** 43,49 **** throws ServletException, IOException { ! WDoc doc = WDoc.create ("WProcess - Get - Not Implemented Yet"); // ! WUtil.createResponse(request, response, this, null, doc, false); } // doGet --- 45,51 ---- throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("WProcess - Get - Not Implemented Yet"); // ! WebUtil.createResponse(request, response, this, null, doc, false); } // doGet *************** *** 55,61 **** throws ServletException, IOException { ! WDoc doc = WDoc.create ("WProcess - Post - Not Implemented Yet"); // ! WUtil.createResponse(request, response, this, null, doc, false); } // doPost --- 57,63 ---- throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("WProcess - Post - Not Implemented Yet"); // ! WebUtil.createResponse(request, response, this, null, doc, false); } // doPost Index: WReport.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WReport.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WReport.java 6 Mar 2004 07:16:14 -0000 1.2 --- WReport.java 30 Aug 2004 06:02:54 -0000 1.3 *************** *** 18,21 **** --- 18,23 ---- import java.io.*; + import org.compiere.util.*; + /** * *************** *** 33,37 **** { super.init(config); ! if (!WEnv.initWeb(config)) throw new ServletException("WReport.init"); } // init --- 35,39 ---- { super.init(config); ! if (!WebEnv.initWeb(config)) throw new ServletException("WReport.init"); } // init *************** *** 43,49 **** throws ServletException, IOException { ! WDoc doc = WDoc.create ("WReport - Get - Not Implemented Yet"); // ! WUtil.createResponse(request, response, this, null, doc, false); } // doGet --- 45,51 ---- throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("WReport - Get - Not Implemented Yet"); // ! WebUtil.createResponse(request, response, this, null, doc, false); } // doGet *************** *** 55,61 **** throws ServletException, IOException { ! WDoc doc = WDoc.create ("WReport - Post - Not Implemented Yet"); // ! WUtil.createResponse(request, response, this, null, doc, false); } // doPost --- 57,63 ---- throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("WReport - Post - Not Implemented Yet"); // ! WebUtil.createResponse(request, response, this, null, doc, false); } // doPost Index: WStart.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WStart.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WStart.java 6 Mar 2004 07:16:14 -0000 1.2 --- WStart.java 30 Aug 2004 06:02:54 -0000 1.3 *************** *** 18,21 **** --- 18,22 ---- import java.io.*; + import org.compiere.util.*; /** *************** *** 39,43 **** { super.init(config); ! if (!WEnv.initWeb(config)) throw new ServletException("WStart.init"); } // init --- 40,44 ---- { super.init(config); ! if (!WebEnv.initWeb(config)) throw new ServletException("WStart.init"); } // init *************** *** 48,52 **** public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ! WUtil.createLoginPage(request, response, this, null, null); } // doGet --- 49,53 ---- public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ! WebUtil.createLoginPage(request, response, this, null, null); } // doGet Index: WStatus.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WStatus.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WStatus.java 6 Mar 2004 07:16:14 -0000 1.2 --- WStatus.java 30 Aug 2004 06:02:54 -0000 1.3 *************** *** 18,21 **** --- 18,23 ---- import java.io.*; + import org.compiere.util.*; + /** * Status Servlet *************** *** 33,37 **** { super.init(config); ! if (!WEnv.initWeb(config)) throw new ServletException("WStatus.init"); } // init --- 35,39 ---- { super.init(config); ! if (!WebEnv.initWeb(config)) throw new ServletException("WStatus.init"); } // init *************** *** 42,48 **** public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ! WDoc doc = WDoc.create ("WStatus Get Request"); // ! WUtil.createResponse(request, response, this, null, doc, true); } // doGet --- 44,50 ---- public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("WStatus Get Request"); // ! WebUtil.createResponse(request, response, this, null, doc, true); } // doGet *************** *** 53,59 **** public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ! WDoc doc = WDoc.create ("WStatus Post Request"); // ! WUtil.createResponse(request, response, this, null, doc, true); } // doPost --- 55,61 ---- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("WStatus Post Request"); // ! WebUtil.createResponse(request, response, this, null, doc, true); } // doPost Index: WTask.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WTask.java 6 Mar 2004 07:16:14 -0000 1.2 --- WTask.java 30 Aug 2004 06:02:54 -0000 1.3 *************** *** 18,21 **** --- 18,23 ---- import java.io.*; + import org.compiere.util.*; + /** * *************** *** 33,37 **** { super.init(config); ! if (!WEnv.initWeb(config)) throw new ServletException("WTask.init"); } // init --- 35,39 ---- { super.init(config); ! if (!WebEnv.initWeb(config)) throw new ServletException("WTask.init"); } // init *************** *** 43,49 **** throws ServletException, IOException { ! WDoc doc = WDoc.create ("WTask - Get - Not Implemented Yet"); // ! WUtil.createResponse(request, response, this, null, doc, false); } // doGet --- 45,51 ---- throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("WTask - Get - Not Implemented Yet"); // ! WebUtil.createResponse(request, response, this, null, doc, false); } // doGet *************** *** 55,61 **** throws ServletException, IOException { ! WDoc doc = WDoc.create ("WTask - Post - Not Implemented Yet"); // ! WUtil.createResponse(request, response, this, null, doc, false); } // doPost --- 57,63 ---- throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("WTask - Post - Not Implemented Yet"); // ! WebUtil.createResponse(request, response, this, null, doc, false); } // doPost Index: WWindow.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WWindow.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** WWindow.java 21 Jul 2004 05:48:22 -0000 1.9 --- WWindow.java 30 Aug 2004 06:02:54 -0000 1.10 *************** *** 43,47 **** { super.init (config); ! if (!WEnv.initWeb(config)) throw new ServletException("WWindow.init"); } // init --- 43,47 ---- { super.init (config); ! if (!WebEnv.initWeb(config)) throw new ServletException("WWindow.init"); } // init *************** *** 109,129 **** // Get Session attributes HttpSession sess = request.getSession(); ! Properties ctx = (Properties)sess.getAttribute(WEnv.SA_CONTEXT); ! String loginInfo = (String)sess.getAttribute(WEnv.SA_LOGININFO); if (ctx == null) { ! WUtil.createTimeoutPage(request, response, this, null, null); return; } // Parameter: AD_Window_ID ! int AD_Window_ID = WUtil.getParameterAsInt(request, "AD_Window_ID"); // Get Parameter: Menu_ID ! int AD_Menu_ID = WUtil.getParameterAsInt(request, "AD_Menu_ID"); Log.trace(Log.l4_Data, "AD_Window_ID=" + AD_Window_ID + "; AD_Menu_ID=" + AD_Menu_ID); // Clean up old Window ! WWindowStatus ws = (WWindowStatus)sess.getAttribute(WEnv.SA_WINDOW); if (ws != null) { --- 109,129 ---- // Get Session attributes HttpSession sess = request.getSession(); ! Properties ctx = (Properties)sess.getAttribute(WebEnv.SA_CONTEXT); ! String loginInfo = (String)sess.getAttribute(WebEnv.SA_LOGININFO); if (ctx == null) { ! WebUtil.createTimeoutPage(request, response, this, null, null); return; } // Parameter: AD_Window_ID ! int AD_Window_ID = WebUtil.getParameterAsInt(request, "AD_Window_ID"); // Get Parameter: Menu_ID ! int AD_Menu_ID = WebUtil.getParameterAsInt(request, "AD_Menu_ID"); Log.trace(Log.l4_Data, "AD_Window_ID=" + AD_Window_ID + "; AD_Menu_ID=" + AD_Menu_ID); // Clean up old Window ! WWindowStatus ws = (WWindowStatus)sess.getAttribute(WebEnv.SA_WINDOW); if (ws != null) { *************** *** 143,153 **** String msg = Msg.translate(ctx, "AD_Window_ID") + " " + Msg.getMsg(ctx, "NotFound") + ", ID=" + AD_Window_ID + "/" + AD_Menu_ID; ! WUtil.createErrorPage(request, response, this, ws==null ? null : ws.ctx, msg); ! sess.setAttribute(WEnv.SA_WINDOW, null); return; } // Create New Window ws = new WWindowStatus(mWindowVO); ! sess.setAttribute(WEnv.SA_WINDOW, ws); --- 143,153 ---- String msg = Msg.translate(ctx, "AD_Window_ID") + " " + Msg.getMsg(ctx, "NotFound") + ", ID=" + AD_Window_ID + "/" + AD_Menu_ID; ! WebUtil.createErrorPage(request, response, this, ws==null ? null : ws.ctx, msg); ! sess.setAttribute(WebEnv.SA_WINDOW, null); return; } // Create New Window ws = new WWindowStatus(mWindowVO); ! sess.setAttribute(WebEnv.SA_WINDOW, ws); *************** *** 159,163 **** * Build Page */ ! WDoc doc = preparePage(ws); // Body --- 159,163 ---- * Build Page */ ! WebDoc doc = preparePage(ws); // Body *************** *** 171,175 **** Log.trace(Log.l1_User, "WWindow.doGet", "fini"); // Log.trace(Log.l6_Database, doc.toString()); ! WUtil.createResponse (request, response, this, null, doc, true); Log.trace(Log.l1_User, "WWindow.doGet - closed"); } // doGet --- 171,175 ---- Log.trace(Log.l1_User, "WWindow.doGet", "fini"); // Log.trace(Log.l6_Database, doc.toString()); ! WebUtil.createResponse (request, response, this, null, doc, true); Log.trace(Log.l1_User, "WWindow.doGet - closed"); } // doGet *************** *** 194,208 **** WWindowStatus ws = null; if (sess != null) ! ws = (WWindowStatus)sess.getAttribute(WEnv.SA_WINDOW); if (ws == null) { ! Properties ctx = (Properties)sess.getAttribute(WEnv.SA_CONTEXT); if (ctx == null) ! WUtil.createTimeoutPage(request, response, this, ctx, "No Context"); else doGet(request, response); return; } ! String loginInfo = (String)sess.getAttribute(WEnv.SA_LOGININFO); // Get Parameter: Command --- 194,208 ---- WWindowStatus ws = null; if (sess != null) ! ws = (WWindowStatus)sess.getAttribute(WebEnv.SA_WINDOW); if (ws == null) { ! Properties ctx = (Properties)sess.getAttribute(WebEnv.SA_CONTEXT); if (ctx == null) ! WebUtil.createTimeoutPage(request, response, this, ctx, "No Context"); else doGet(request, response); return; } ! String loginInfo = (String)sess.getAttribute(WebEnv.SA_LOGININFO); // Get Parameter: Command *************** *** 214,218 **** if (p_cmd.equals("Exit")) { ! WUtil.createLoginPage(request, response, this, ws.ctx, "Exit"); return; } --- 214,218 ---- if (p_cmd.equals("Exit")) { ! WebUtil.createLoginPage(request, response, this, ws.ctx, "Exit"); return; } *************** *** 222,226 **** * Build Page */ ! WDoc doc = preparePage(ws); // Body --- 222,226 ---- * Build Page */ ! WebDoc doc = preparePage(ws); // Body *************** *** 235,239 **** Log.trace(Log.l1_User, "WWindow.doPost - fini"); // Log.trace(Log.l6_Database, doc.toString()); ! WUtil.createResponse (request, response, this, null, doc, true); } // doPost --- 235,239 ---- Log.trace(Log.l1_User, "WWindow.doPost - fini"); // Log.trace(Log.l6_Database, doc.toString()); ! WebUtil.createResponse (request, response, this, null, doc, true); } // doPost *************** *** 247,257 **** * @return WDoc page */ ! private WDoc preparePage(WWindowStatus ws) { ! WDoc doc = WDoc.create (ws.mWindow.getName()); head header = doc.getHead(); // add window.js & .css ! header.addElement(new script("", WEnv.getBaseDirectory("window.js"))); ! header.addElement(new link().setRel("stylesheet").setHref(WEnv.getBaseDirectory("window.css"))); // // Set Variables --- 247,257 ---- * @return WDoc page */ ! private WebDoc preparePage(WWindowStatus ws) { ! WebDoc doc = WebDoc.create (ws.mWindow.getName()); head header = doc.getHead(); // add window.js & .css ! header.addElement(new script("", WebEnv.getBaseDirectory("window.js"))); ! header.addElement(new link().setRel("stylesheet").setHref(WebEnv.getBaseDirectory("window.css"))); // // Set Variables *************** *** 873,877 **** form myForm = null; myForm = new form(action, form.post, form.ENC_DEFAULT); ! myForm.setTarget(WEnv.TARGET_WINDOW); String AD_Language = Env.getAD_Language(ws.ctx); --- 873,877 ---- form myForm = null; myForm = new form(action, form.post, form.ENC_DEFAULT); ! myForm.setTarget(WebEnv.TARGET_WINDOW); String AD_Language = Env.getAD_Language(ws.ctx); *************** *** 974,978 **** imgName.append("24.gif"); // ! img img = new img (WEnv.getImageDirectory(imgName.toString()), name); if (enabled) img.setAlt(Msg.getMsg(AD_Language, name)); // Translate ToolTip --- 974,978 ---- imgName.append("24.gif"); // ! img img = new img (WebEnv.getImageDirectory(imgName.toString()), name); if (enabled) img.setAlt(Msg.getMsg(AD_Language, name)); // Translate ToolTip *************** *** 1151,1155 **** else if (columnName.equals("M_Product_ID")) gif = "Product10.gif"; ! button.setSrc(WEnv.getImageDirectory(gif)); button.setBorder(1); button.setOnClick("return startLookup(" + columnName + ");"); --- 1151,1155 ---- else if (columnName.equals("M_Product_ID")) gif = "Product10.gif"; ! button.setSrc(WebEnv.getImageDirectory(gif)); button.setBorder(1); button.setOnClick("return startLookup(" + columnName + ");"); *************** *** 1181,1185 **** // The button Name=columnName_B, ID=ID_columnName input button = new input(input.image, columnName + "_B", "l"); ! button.setSrc(WEnv.getImageDirectory("Location10.gif")).setBorder(1); button.setOnClick("return startLocation(" + columnName + ");"); if (error) --- 1181,1185 ---- // The button Name=columnName_B, ID=ID_columnName input button = new input(input.image, columnName + "_B", "l"); ! button.setSrc(WebEnv.getImageDirectory("Location10.gif")).setBorder(1); button.setOnClick("return startLocation(" + columnName + ");"); if (error) *************** *** 1210,1214 **** // The button Name=columnName_B, ID=ID_columnName input button = new input(input.image, columnName + "_B", "x"); ! button.setSrc(WEnv.getImageDirectory("Account10.gif")); button.setBorder(1); button.setOnClick("return startAccount(" + columnName + ");"); --- 1210,1214 ---- // The button Name=columnName_B, ID=ID_columnName input button = new input(input.image, columnName + "_B", "x"); ! button.setSrc(WebEnv.getImageDirectory("Account10.gif")); button.setBorder(1); button.setOnClick("return startAccount(" + columnName + ");"); Index: WWorkflow.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/www/WWorkflow.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WWorkflow.java 6 Mar 2004 07:16:14 -0000 1.2 --- WWorkflow.java 30 Aug 2004 06:02:54 -0000 1.3 *************** *** 18,21 **** --- 18,23 ---- import java.io.*; + import org.compiere.util.*; + /** * *************** *** 33,37 **** { super.init(config); ! if (!WEnv.initWeb(config)) throw new ServletException("WWorkflow.init"); } // init --- 35,39 ---- { super.init(config); ! if (!WebEnv.initWeb(config)) throw new ServletException("WWorkflow.init"); } // init *************** *** 43,49 **** throws ServletException, IOException { ! WDoc doc = WDoc.create ("WWorkflow - Get - Not Implemented Yet"); // ! WUtil.createResponse(request, response, this, null, doc, false); } // doGet --- 45,51 ---- throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("WWorkflow - Get - Not Implemented Yet"); // ! WebUtil.createResponse(request, response, this, null, doc, false); } // doGet *************** *** 55,61 **** throws ServletException, IOException { ! WDoc doc = WDoc.create ("WWorkflow - Post - Not Implemented Yet"); // ! WUtil.createResponse(request, response, this, null, doc, false); } // doPost --- 57,63 ---- throws ServletException, IOException { ! WebDoc doc = WebDoc.create ("WWorkflow - Post - Not Implemented Yet"); // ! WebUtil.createResponse(request, response, this, null, doc, false); } // doPost --- WDoc.java DELETED --- --- WEnv.java DELETED --- --- WUtil.java DELETED --- |