[cvs] expresso commit by lhamel: use string constants
JCorporate Ltd
jcorp at jcorp2.servlets.net
Sun Oct 24 21:35:32 PDT 2004
Log Message:
-----------
use string constants
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller:
Controller.java
ControllerResponse.java
DBController.java
DefaultControllerFactory.java
DefaultForm.java
ExpressoActionServlet.java
ExpressoRequestProcessor.java
ServletControllerRequest.java
Transition.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc:
ReservedWords.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility:
ControllerRun.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller:
RunTests.java
TestController.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/regexp:
RE.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/controller:
XMLController.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller:
CacheControl.java
ControllerSecurityMatrix.java
DBMaint.java
DBSecurityMatrix.java
EditUserPreference.java
JobSecurityMatrix.java
QueueJob.java
SimpleLoginController.java
SimpleRegistration.java
Status.java
WizardFormStack.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint:
Add.java
DynamicCmd.java
GetBase.java
ListBase.java
Search.java
Update.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job:
ControllerJob.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test:
ControllerTestCase.java
Revision Data
-------------
Index: ExpressoActionServlet.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoActionServlet.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoActionServlet.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoActionServlet.java -u -r1.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoActionServlet.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoActionServlet.java
@@ -545,7 +545,7 @@
// a request processor and create the action class
- String className = request.getParameter("controller");
+ String className = request.getParameter(Controller.CONTROLLER_PARAM_KEY);
if (className == null || className.length() == 0) {
throw new IllegalArgumentException(
@@ -609,12 +609,12 @@
protected String processPath(HttpServletRequest request) {
String path = super.processPath(request);
- String controller = request.getParameter("controller");
+ String controller = request.getParameter(Controller.CONTROLLER_PARAM_KEY);
if ( controller != null ) {
// do reverse-lookup from controller class to mapping
ActionMapping mapping = ConfigManager.getMapping(
controller,
- request.getParameter("state"));
+ request.getParameter(STATE_PARAM_KEY));
if ( mapping != null ) {
path = mapping.getPath();
}
Index: DefaultForm.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java -u -r1.13 -r1.14
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java
@@ -355,14 +355,14 @@
}
}
- if (paramName.equals("controller")) {
+ if (paramName.equals(Controller.CONTROLLER_PARAM_KEY)) {
gotControllerFromButton = true;
}
if (log.isDebugEnabled()) {
log.debug("Parameter '" + paramName + "', value '"
+ paramValue + "'");
}
- if (paramName.equals("state")) {
+ if (paramName.equals(Controller.STATE_PARAM_KEY)) {
return paramValue;
}
Index: ControllerResponse.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java -u -r1.51 -r1.52
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java
@@ -658,7 +658,7 @@
}
myRequest = newRequest;
- requestedState = StringUtil.notNull(myRequest.getParameter("state"));
+ requestedState = StringUtil.notNull(myRequest.getParameter(Controller.STATE_PARAM_KEY));
this.dataContext = newRequest.getDataContext();
this.responseLocale = newRequest.getLocale();
}
Index: ExpressoRequestProcessor.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoRequestProcessor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoRequestProcessor.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoRequestProcessor.java -u -r1.8 -r1.9
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoRequestProcessor.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoRequestProcessor.java
@@ -235,11 +235,11 @@
protected String processPath(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws IOException {
String path = super.processPath(httpServletRequest, httpServletResponse);
- String controller = httpServletRequest.getParameter("controller");
+ String controller = httpServletRequest.getParameter(Controller.CONTROLLER_PARAM_KEY);
if (controller != null) {
// do reverse-lookup from controller class to mapping
ActionConfig mapping = ConfigManager.getActionConfig(controller,
- httpServletRequest.getParameter("state"));
+ httpServletRequest.getParameter(Controller.STATE_PARAM_KEY));
if (mapping != null) {
path = mapping.getPath();
}
Index: Transition.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Transition.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Transition.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Transition.java -u -r1.58 -r1.59
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Transition.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Transition.java
@@ -201,7 +201,7 @@
}
setLabel(theState.getDescription());
- addParam("state", newState);
+ addParam(Controller.STATE_PARAM_KEY, newState);
} /* Transition(String, Controller) */
/**
@@ -280,12 +280,12 @@
*/
public synchronized void addParam(String paramCode, String paramValue) {
clearCache();
- if (paramCode.equals("state")) {
+ if (paramCode.equals(Controller.STATE_PARAM_KEY)) {
setState(StringUtil.notNull(paramValue));
return;
}
- if (paramCode.equals("controller")) {
+ if (paramCode.equals(Controller.CONTROLLER_PARAM_KEY)) {
setControllerObject(StringUtil.notNull(paramValue));
return;
@@ -316,7 +316,7 @@
*/
public String getState() {
if (myState == null) {
- return getParam("state");
+ return getParam(Controller.STATE_PARAM_KEY);
}
return myState;
@@ -415,7 +415,7 @@
*/
public String getControllerObject() {
if (controllerObject == null) {
- return getParam("controller");
+ return getParam(Controller.CONTROLLER_PARAM_KEY);
}
return controllerObject;
@@ -781,8 +781,8 @@
if (!oneParamName.endsWith("_params") &&
!oneParamName.endsWith("_encoding") &&
- !oneParamName.equals("state") &&
- !oneParamName.equals("controller")) {
+ !oneParamName.equals(Controller.STATE_PARAM_KEY) &&
+ !oneParamName.equals(Controller.CONTROLLER_PARAM_KEY)) {
oneParamValue = params.get(oneParamName);
newParams.put(oneParamName, oneParamValue);
}
@@ -901,7 +901,7 @@
}
}
- attributeNode = transitionAttributes.getNamedItem("controller");
+ attributeNode = transitionAttributes.getNamedItem(Controller.CONTROLLER_PARAM_KEY);
if (attributeNode != null) {
String value = attributeNode.getNodeValue();
@@ -1040,7 +1040,7 @@
* <p>If the ControllerResponse has been set and running in a servlet environment,
* then this function also encodes the resulting URL with suitable session id's
* if necessary too</p>
- * This URL is optimized, so it includes a "controller" param only if
+ * This URL is optimized, so it includes a Controller.CONTROLLER_PARAM_KEY param only if
* the destination controller is different than the controller of the ControllerResponse (if
* the response is known).
*
@@ -1210,8 +1210,8 @@
ControllerRequest newRequest = (ControllerRequest) req.clone();
newRequest.setParameters(this.params);
- newRequest.setParameter("state", StringUtil.notNull(this.getState()));
- newRequest.setParameter("controller", this.getControllerObject());
+ newRequest.setParameter(Controller.STATE_PARAM_KEY, StringUtil.notNull(this.getState()));
+ newRequest.setParameter(Controller.CONTROLLER_PARAM_KEY, this.getControllerObject());
ControllerResponse newResponse = null;
Index: Controller.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java,v
retrieving revision 1.100
retrieving revision 1.101
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java -u -r1.100 -r1.101
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java
@@ -194,9 +194,17 @@
public final static String RETURN_TO_SENDER_TRAN = "returnToSender";
- /* The name of the state which is the "initial" state of this controller */
+ /**
+ * key for putting state into parameter map
+ */
+ public static final String STATE_PARAM_KEY = "state";
+ /**
+ * key for putting controller into parameter map
+ */
+ public static final String CONTROLLER_PARAM_KEY = "controller";
+ /* The name of the state which is the "initial" state of this controller */
/* E.g. where the controller starts if no state parameter is specified */
private static Hashtable initialStates = new Hashtable();
@@ -1593,7 +1601,7 @@
// TODO: Please document what is the purpose of this QUEUED REQUEST code. *PP* Tue Jan 27 11:18:40 GMT 2004
if (queuedRequest != null) {
request.removeAttribute(ExpressoConstants.CONTROLLER_REQUEST_KEY);
- String queuedState = StringUtil.notNull(request.getParameter("state"));
+ String queuedState = StringUtil.notNull(request.getParameter(STATE_PARAM_KEY));
// Only reset the controller form when the controller is
// invoked! If state is specified then the form is not
@@ -1759,7 +1767,7 @@
// set. Likewise a "state" parameter from the
// "HttpServletRequest", if any. So we are checking for
// missing controller state definition here.
- String requestedState = StringUtil.notNull(req.getParameter("state"));
+ String requestedState = StringUtil.notNull(req.getParameter(STATE_PARAM_KEY));
log.debug("requestedState = `" + requestedState + "'");
if (!controllerRequested.equals("")) {
@@ -1849,7 +1857,7 @@
log.debug("Checking if we need to redirect to different protocol");
}
Hashtable myStateList = (Hashtable) states.get(getClass().getName());
- String stateName = req.getParameter("state");
+ String stateName = req.getParameter(STATE_PARAM_KEY);
if (stateName == null || stateName.length() == 0) {
stateName = this.getInitialState();
}
@@ -1869,7 +1877,7 @@
if (log.isDebugEnabled()) {
log.debug("Controller '" + getClass().getName() +
"' to state '" +
- StringUtil.notNull(req.getParameter("state")) + "'");
+ StringUtil.notNull(req.getParameter(STATE_PARAM_KEY)) + "'");
}
req.setFormAttribute(mapping.getAttribute());
Index: DBController.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java -u -r1.30 -r1.31
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java
@@ -489,7 +489,7 @@
ControllerRequest myRequest,
ControllerResponse myResponse)
throws ControllerException {
- String transitionState = StringUtil.notNull(newTransition.getParam("state"));
+ String transitionState = StringUtil.notNull(newTransition.getParam(STATE_PARAM_KEY));
/* If the new transition doesn't specify a state... */
if (transitionState.equals("")) {
Index: DefaultControllerFactory.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultControllerFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultControllerFactory.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultControllerFactory.java -u -r1.7 -r1.8
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultControllerFactory.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultControllerFactory.java
@@ -122,7 +122,7 @@
*/
public synchronized Controller getController(ControllerRequest request)
throws ControllerException {
- String s = request.getParameter("controller");
+ String s = request.getParameter(Controller.CONTROLLER_PARAM_KEY);
StringUtil.assertNotBlank(s,
"You must define your controller " +
"parameter in your controller request");
Index: ServletControllerRequest.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ServletControllerRequest.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ServletControllerRequest.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ServletControllerRequest.java -u -r1.30 -r1.31
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ServletControllerRequest.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ServletControllerRequest.java
@@ -350,7 +350,7 @@
String controllerName = controller.getClass().getName();
Hashtable params = new Hashtable();
- params.put("controller", controllerName);
+ params.put(Controller.CONTROLLER_PARAM_KEY, controllerName);
if (req == null) {
throw new IllegalArgumentException("Request may not be null here");
@@ -405,13 +405,13 @@
boolean addThisParam = true;
// Handle special cases
- if (oneParamName.equals("controller") && gotControllerFromButton) {
+ if (oneParamName.equals(Controller.CONTROLLER_PARAM_KEY) && gotControllerFromButton) {
// This is a controller name, but we already have one
// previously set from a button (xxx_params).
addThisParam = false;
- } else if (oneParamName.equals("state") && gotStateFromButton) {
+ } else if (oneParamName.equals(Controller.STATE_PARAM_KEY) && gotStateFromButton) {
// This is a state name, but we already have one
// previously set from a button (xxx_params).
@@ -513,9 +513,9 @@
newParams.put(paramName, paramValue);
- if (paramName.equals("controller")) {
+ if (paramName.equals(Controller.CONTROLLER_PARAM_KEY)) {
gotControllerFromButton = true;
- } else if (paramName.equals("state")) {
+ } else if (paramName.equals(Controller.STATE_PARAM_KEY)) {
gotStateFromButton = true;
}
@@ -580,7 +580,7 @@
cparams.setParameters(null);
Hashtable params = new Hashtable();
- params.put("controller", controllerName);
+ params.put(Controller.CONTROLLER_PARAM_KEY, controllerName);
Hashtable textParams = mp.getTextElements();
Hashtable fileParams = mp.getFileElements();
@@ -731,7 +731,7 @@
//Cleanup controller and state params because they have been consumed already.
//Not removing them will cause an unintended rerouting in the Controller.perform() method.
- boolean routingParam = (oneParamName.equals("controller") || oneParamName.equals("state"));
+ boolean routingParam = (oneParamName.equals(Controller.CONTROLLER_PARAM_KEY) || oneParamName.equals(Controller.STATE_PARAM_KEY));
if (newRouting || (!newRouting && !routingParam)) {
if (oneParamValue instanceof String) {
cparams.setParameter(oneParamName, (String) oneParamValue);
Index: ReservedWords.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ReservedWords.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ReservedWords.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ReservedWords.java -u -r1.6 -r1.7
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ReservedWords.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ReservedWords.java
@@ -64,6 +64,8 @@
package com.jcorporate.expresso.core.misc;
+import com.jcorporate.expresso.core.controller.Controller;
+
import java.util.TreeSet;
@@ -146,8 +148,8 @@
//Expresso Reserved Words - Can't have parameters with these names in
//them. If you have for example, "State" field name, you're ok, you
//just can't have lower case "state"
- caseSensitiveWords.add("state");
- caseSensitiveWords.add("controller");
+ caseSensitiveWords.add(Controller.STATE_PARAM_KEY);
+ caseSensitiveWords.add(Controller.CONTROLLER_PARAM_KEY);
caseSensitiveWords.add("page");
caseSensitiveWords.add("style");
caseSensitiveWords.add("xsl");
@@ -414,7 +416,7 @@
caseInsensitiveWords.add("sqlstate");
caseInsensitiveWords.add("sqlwarning");
caseInsensitiveWords.add("start");
- caseInsensitiveWords.add("state");
+ caseInsensitiveWords.add(Controller.STATE_PARAM_KEY);
caseInsensitiveWords.add("statement");
caseInsensitiveWords.add("static");
caseInsensitiveWords.add("structure");
Index: ControllerRun.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/ControllerRun.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/ControllerRun.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/ControllerRun.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/ControllerRun.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/ControllerRun.java
@@ -403,7 +403,7 @@
if (oneValue != null) {
if ((!oneKey.equals("webAppDir")) &&
(!oneKey.equals("configDir")) &&
- (!oneKey.equals("state"))) {
+ (!oneKey.equals(Controller.STATE_PARAM_KEY))) {
params.setParameter(oneKey, oneValue);
}
} /* if value not null */
@@ -416,7 +416,7 @@
}
boolean interactiveMode = true;
- String initialState = (String) commandArgs.get("state");
+ String initialState = (String) commandArgs.get(Controller.STATE_PARAM_KEY);
/* If state is specified, we run in non-interactive mode */
if (initialState == null) {
Index: RunTests.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/RunTests.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/RunTests.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/RunTests.java -u -r1.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/RunTests.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/RunTests.java
@@ -143,7 +143,7 @@
Transition runTests = new Transition("Run Tests", getClass().getName());
runTests.setName("runtests");
- runTests.addParam("state", "runtests");
+ runTests.addParam(STATE_PARAM_KEY, "runtests");
myResponse.addTransition(runTests);
}
Index: TestController.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/TestController.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/TestController.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/TestController.java -u -r1.14 -r1.15
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/TestController.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/TestController.java
@@ -787,13 +787,13 @@
selTest.setName("selTest");
-selTest.addParam("state", "selTest");
+selTest.addParam(STATE_PARAM_KEY, "selTest");
addAction(selTest); */
Transition runAllTests = new Transition("Run All Tests",
getClass().getName());
runAllTests.setName("runAllTests");
- runAllTests.addParam("state", "runAllTests");
+ runAllTests.addParam(STATE_PARAM_KEY, "runAllTests");
myResponse.addTransition(runAllTests);
} catch (DBException de) {
throw new ControllerException(de);
Index: RE.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/regexp/RE.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/regexp/RE.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/regexp/RE.java -u -r1.6 -r1.7
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/regexp/RE.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/regexp/RE.java
@@ -408,7 +408,7 @@
*
* </font>
*
- * @see recompile
+
* @see RECompiler
*
* @author <a href="mailto:jonl at muppetlabs.com">Jonathan Locke</a>
@@ -552,7 +552,7 @@
* (bytecode) data.
* @param program Compiled regular expression program
* @see RECompiler
- * @see recompile
+
*/
public RE(REProgram program) {
this(program, MATCH_NORMAL);
@@ -575,7 +575,7 @@
*
* @see RECompiler
* @see REProgram
- * @see recompile
+
*/
public RE(REProgram program, int matchFlags) {
setProgram(program);
@@ -589,7 +589,7 @@
* @param pattern The regular expression pattern to compile.
* @exception RESyntaxException Thrown if the regular expression has invalid syntax.
* @see RECompiler
- * @see recompile
+
*/
public RE(String pattern)
throws RESyntaxException {
@@ -604,7 +604,7 @@
* @param matchFlags The matching style
* @exception RESyntaxException Thrown if the regular expression has invalid syntax.
* @see RECompiler
- * @see recompile
+
*/
public RE(String pattern, int matchFlags)
throws RESyntaxException {
@@ -1591,7 +1591,7 @@
* @param program Regular expression program compiled by RECompiler.
* @see RECompiler
* @see REProgram
- * @see recompile
+
*/
public void setProgram(REProgram program) {
this.program = program;
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.14
retrieving revision 1.15
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.14 -r1.15
--- 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
@@ -373,7 +373,7 @@
Transition again = new Transition("Start Again",
getClass().getName());
again.setName("again");
- again.addParam("state", "promptForSchema");
+ again.addParam(STATE_PARAM_KEY, "promptForSchema");
res.addTransition(again);
}
@@ -427,7 +427,7 @@
Transition doImport = new Transition("Begin Import",
getClass().getName());
doImport.setName("doFileImport");
- doImport.addParam("state", "doFileImport");
+ doImport.addParam(STATE_PARAM_KEY, "doFileImport");
res.addTransition(doImport);
} /* promptFileImportState() */
@@ -492,21 +492,21 @@
Transition promptImport = new Transition("Import from File",
getClass().getName());
promptImport.setName("promptFileImport");
- promptImport.addParam("state", "promptFileImport");
+ promptImport.addParam(STATE_PARAM_KEY, "promptFileImport");
res.addTransition(promptImport);
/* now the actions */
Transition promptImport2 = new Transition("Import from Server",
getClass().getName());
promptImport2.setName("promptImport");
- promptImport2.addParam("state", "promptImport");
+ promptImport2.addParam(STATE_PARAM_KEY, "promptImport");
res.addTransition(promptImport2);
/* now the actions */
Transition selDBObj = new Transition("Select Database Object",
getClass().getName());
selDBObj.setName("selDBObj");
- selDBObj.addParam("state", "selDBObj");
+ selDBObj.addParam(STATE_PARAM_KEY, "selDBObj");
res.addTransition(selDBObj);
}
@@ -539,7 +539,7 @@
Transition doExport = new Transition("Export", getClass().getName());
doExport.setName("doFileExport");
- doExport.addParam("state", "doFileExport");
+ doExport.addParam(STATE_PARAM_KEY, "doFileExport");
doExport.addParam("SchemaClass", req.getParameter("SchemaClass"));
res.addTransition(doExport);
} /* selDBObj(ControllerRequest, ControllerResponse) */
Index: CacheControl.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/CacheControl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/CacheControl.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/CacheControl.java -u -r1.16 -r1.17
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/CacheControl.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/CacheControl.java
@@ -257,7 +257,7 @@
Transition prompt = new Transition("Start Again", getClass().getName());
prompt.setName("prompt");
- prompt.addParam("state", "prompt");
+ prompt.addParam(STATE_PARAM_KEY, "prompt");
response.addTransition(prompt);
} /* clearState() */
@@ -338,7 +338,7 @@
Transition prompt = new Transition("Start Again", getClass().getName());
prompt.setName("prompt");
- prompt.addParam("state", "prompt");
+ prompt.addParam(STATE_PARAM_KEY, "prompt");
response.addTransition(prompt);
} /* displayState() */
@@ -393,13 +393,13 @@
Transition clear = new Transition("Clear Cache", getClass().getName());
clear.setName("clear");
- clear.addParam("state", "clear");
+ clear.addParam(STATE_PARAM_KEY, "clear");
response.addTransition(clear);
Transition display = new Transition("Display Cache",
getClass().getName());
display.setName("display");
- display.addParam("state", "display");
+ display.addParam(STATE_PARAM_KEY, "display");
response.addTransition(display);
} /* promptState() */
Index: SimpleRegistration.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java -u -r1.33 -r1.34
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java
@@ -78,6 +78,7 @@
import com.jcorporate.expresso.core.controller.ServletControllerRequest;
import com.jcorporate.expresso.core.controller.State;
import com.jcorporate.expresso.core.controller.Transition;
+import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
import com.jcorporate.expresso.core.dataobjects.jdbc.JDBCObjectMetaData;
import com.jcorporate.expresso.core.db.DBException;
@@ -811,8 +812,8 @@
// Otherwise, automatically move on to detailed registration (if needed)
// if (nextObj != null) {
// Transition continueRegister = new Transition();
- // continueRegister.addParam("controller",this.getClass().getName());
- // continueRegister.addParam("state", "promptAddRecord");
+ // continueRegister.addParam(Controller.CONTROLLER_PARAM_KEY,this.getClass().getName());
+ // continueRegister.addParam(STATE_PARAM_KEY, "promptAddRecord");
// continueRegister.addParam("dbobj", nextObj);
// continueRegister.addParam("dbContext", request.getDBName());
// continueRegister.addParam("uid", user.getUidString());
@@ -966,8 +967,8 @@
Transition doLogin = new Transition();
doLogin.setName("promptLogin");
doLogin.setLabel("Go To Login");
- doLogin.addParam("controller", loginControllerName);
- doLogin.addParam("state", "promptLogin");
+ doLogin.addParam(Controller.CONTROLLER_PARAM_KEY, loginControllerName);
+ doLogin.addParam(STATE_PARAM_KEY, "promptLogin");
doLogin.addParam("dbContext", request.getDataContext());
response.add(doLogin);
}
@@ -1121,32 +1122,32 @@
Transition login = new Transition();
login.setName("promptLogin");
- login.addParam("controller", loginController);
+ login.addParam(CONTROLLER_PARAM_KEY, loginController);
login.addParam("dbContext", dbname);
response.add(login);
Transition editPref = new Transition();
editPref.setName("editPreferences");
- editPref.addParam("controller",
+ editPref.addParam(CONTROLLER_PARAM_KEY,
"com.jcorporate.expresso.services.controller.EditUserPreference");
- editPref.addParam("state", "edit");
+ editPref.addParam(STATE_PARAM_KEY, "edit");
response.add(editPref);
Transition showDBMenu = new Transition();
showDBMenu.setName("showDBMenu");
- showDBMenu.addParam("controller", registrationController);
- showDBMenu.addParam("state", "showDBMenu");
+ showDBMenu.addParam(CONTROLLER_PARAM_KEY, registrationController);
+ showDBMenu.addParam(STATE_PARAM_KEY, "showDBMenu");
response.add(showDBMenu);
Transition sendPW = new Transition();
sendPW.setName("promptSendPassword");
- sendPW.addParam("controller", loginController);
- sendPW.addParam("state", "promptSendPassword");
+ sendPW.addParam(CONTROLLER_PARAM_KEY, loginController);
+ sendPW.addParam(STATE_PARAM_KEY, "promptSendPassword");
response.add(sendPW);
Transition logout = new Transition();
logout.setName("processLogout");
- logout.addParam("controller", loginController);
+ logout.addParam(CONTROLLER_PARAM_KEY, loginController);
response.add(logout);
} else {
response.saveErrors(errors);
@@ -1631,7 +1632,7 @@
if (rom.getField("AllowEdit").equals("Y")) {
Transition edit = new Transition("Update", "Update",
registrationControllerName);
- edit.addParam("state", "promptUpdateRecord");
+ edit.addParam(STATE_PARAM_KEY, "promptUpdateRecord");
edit.addParam("dbobj", dbname);
edit.addParam("keys", s.toString());
edit.addParam("loginController", loginControllerName);
@@ -1641,7 +1642,7 @@
if (rom.getField("AllowDel").equals("Y")) {
Transition delete = new Transition("Delete", "Delete",
registrationControllerName);
- delete.addParam("state", "promptDeleteRecord");
+ delete.addParam(STATE_PARAM_KEY, "promptDeleteRecord");
delete.addParam("dbobj", dbname);
delete.addParam("keys", s.toString());
delete.addParam("loginController", loginControllerName);
@@ -2068,7 +2069,7 @@
dbMaint.setName("dbMaint");
dbMaint.setLabel("View Registration Record");
dbMaint.setControllerObject(com.jcorporate.expresso.services.controller.DBMaint.class);
- dbMaint.addParam("state", "Update");
+ dbMaint.addParam(STATE_PARAM_KEY, "Update");
dbMaint.addParam("key", s.toString());
dbMaint.addParam("dbobj",
oneDB.getClass().getName());
@@ -2151,7 +2152,7 @@
Transition cancel = new Transition("Cancel", "Cancel",
this.getClass().getName());
- cancel.addParam("state", "showDBMenu");
+ cancel.addParam(STATE_PARAM_KEY, "showDBMenu");
cancel.addParam("dbobj", dbname);
cancel.addParam("loginController", loginControllerName);
formBlock.add(cancel);
@@ -2321,7 +2322,7 @@
Block formBlock = buildForm(rd, db, response);
Transition cancel = new Transition("Cancel", "Cancel",
this.getClass().getName());
- cancel.addParam("state", "showDBMenu");
+ cancel.addParam(STATE_PARAM_KEY, "showDBMenu");
cancel.addParam("dbobj", dbname);
cancel.addParam("loginController", loginControllerName);
formBlock.add(cancel);
Index: JobSecurityMatrix.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/JobSecurityMatrix.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/JobSecurityMatrix.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/JobSecurityMatrix.java -u -r1.16 -r1.17
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/JobSecurityMatrix.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/JobSecurityMatrix.java
@@ -403,7 +403,7 @@
Transition again = new Transition("Start Again",
getClass().getName());
again.setName("again");
- again.addParam("state", "prompt");
+ again.addParam(STATE_PARAM_KEY, "prompt");
myResponse.addTransition(again);
}
@@ -566,7 +566,7 @@
Transition selfunctions = new Transition("Select Allowed Functions",
getClass().getName());
selfunctions.setName("selfunctions");
- selfunctions.addParam("state", "selfunctions");
+ selfunctions.addParam(STATE_PARAM_KEY, "selfunctions");
selfunctions.addParam("GroupName", params.getParameter("GroupName"));
selfunctions.addParam("SchemaClass",
params.getParameter("SchemaClass"));
@@ -607,7 +607,7 @@
Transition updstates = new Transition("Update", getClass().getName());
updstates.setName("updstates");
- updstates.addParam("state", "updstates");
+ updstates.addParam(STATE_PARAM_KEY, "updstates");
updstates.addParam("GroupName", params.getParameter("GroupName"));
updstates.addParam("JobClass", params.getParameter("JobClass"));
myResponse.addTransition(updstates);
@@ -660,7 +660,7 @@
Transition updjob = new Transition("Update", getClass().getName());
updjob.setName("updjob");
- updjob.addParam("state", "updjob");
+ updjob.addParam(STATE_PARAM_KEY, "updjob");
updjob.addParam("GroupName", params.getParameter("GroupName"));
updjob.addParam("SchemaClass", params.getParameter("SchemaClass"));
myResponse.addTransition(updjob);
Index: Status.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Status.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Status.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Status.java -u -r1.20 -r1.21
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Status.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Status.java
@@ -585,7 +585,7 @@
* @throws ControllerException upon error
*/
protected void showTransitions(ControllerRequest request, ControllerResponse response) throws ControllerException {
- String currentState = StringUtil.notNull(request.getParameter("state"));
+ String currentState = StringUtil.notNull(request.getParameter(STATE_PARAM_KEY));
if (currentState.length() == 0) {
currentState = "show";
}
Index: DBSecurityMatrix.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBSecurityMatrix.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBSecurityMatrix.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBSecurityMatrix.java -u -r1.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBSecurityMatrix.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBSecurityMatrix.java
@@ -291,7 +291,7 @@
getClass().getName());
again.setAttribute("button", "");
again.setName("again");
- again.addParam("state", "prompt");
+ again.addParam(STATE_PARAM_KEY, "prompt");
myResponse.addTransition(again);
myResponse.add(dbUpdatedPara);
} catch (DBException e) {
@@ -432,7 +432,7 @@
Transition doUpdateDB = new Transition("Update", getClass().getName());
doUpdateDB.setName("updateDBobj");
- doUpdateDB.addParam("state", "dbobjupdate");
+ doUpdateDB.addParam(STATE_PARAM_KEY, "dbobjupdate");
doUpdateDB.addParam("SchemaClass", params.getParameter("SchemaClass"));
doUpdateDB.addParam("GroupName", params.getParameter("GroupName"));
myResponse.add(doUpdateDB);
@@ -440,7 +440,7 @@
//myPara.setFormTransition(doUpdateDB);
Transition again = new Transition("Start Again", getClass().getName());
again.setName("again");
- again.addParam("state", "prompt");
+ again.addParam(STATE_PARAM_KEY, "prompt");
myResponse.add(again);
myResponse.add(myPara);
} /* getDBObjMatrix() */
@@ -578,7 +578,7 @@
Transition doDBObj = new Transition("Set Security",
getClass().getName());
doDBObj.setName("adminDBobj");
- doDBObj.addParam("state", "dbobjmatrix");
+ doDBObj.addParam(STATE_PARAM_KEY, "dbobjmatrix");
myResponse.addTransition(doDBObj);
} catch (DBException de) {
throw new ControllerException(de.getMessage());
Index: DBMaint.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java -u -r1.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java
@@ -220,7 +220,7 @@
Transition doDBObj = new Transition("Choose Database Object",
getClass().getName());
doDBObj.setName("selDBObj");
- doDBObj.addParam("state", "selDBObj");
+ doDBObj.addParam(STATE_PARAM_KEY, "selDBObj");
response.addTransition(doDBObj);
} catch (DBException de) {
throw new ControllerException(de.getMessage());
Index: SimpleLoginController.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java -u -r1.24 -r1.25
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java
@@ -75,6 +75,7 @@
import com.jcorporate.expresso.core.controller.ServletControllerRequest;
import com.jcorporate.expresso.core.controller.State;
import com.jcorporate.expresso.core.controller.Transition;
+import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.controller.session.PersistentSession;
import com.jcorporate.expresso.core.dataobjects.Securable;
import com.jcorporate.expresso.core.db.DBException;
@@ -276,7 +277,7 @@
Transition login = new Transition();
login.setLabel("Log In");
login.setName("promptLogin");
- login.addParam("controller",
+ login.addParam(Controller.CONTROLLER_PARAM_KEY,
loginController);
login.addParam("dbContext", dbname);
response.add(login);
@@ -284,7 +285,7 @@
Transition register = new Transition();
register.setLabel("Register");
register.setName("promptSelfRegister");
- register.addParam("controller",
+ register.addParam(Controller.CONTROLLER_PARAM_KEY,
registrationController);
register.addParam("dbContext", dbname);
response.add(register);
@@ -376,16 +377,16 @@
Transition editPref = new Transition();
editPref.setName("editPreferences");
- editPref.addParam("controller",
+ editPref.addParam(Controller.CONTROLLER_PARAM_KEY,
"com.jcorporate.expresso.services.controller.EditUserPreference");
- editPref.addParam("state", "edit");
+ editPref.addParam(STATE_PARAM_KEY, "edit");
response.add(editPref);
Transition showDBMenu = new Transition();
showDBMenu.setName("showDBMenu");
- showDBMenu.addParam("controller",
+ showDBMenu.addParam(Controller.CONTROLLER_PARAM_KEY,
this.getDefaultRegistrationController().getClass().getName());
- showDBMenu.addParam("state", "showDBMenu");
+ showDBMenu.addParam(STATE_PARAM_KEY, "showDBMenu");
response.add(showDBMenu);
} else {
response.saveErrors(errors);
@@ -526,18 +527,18 @@
Transition editPref = new Transition();
editPref.setName("editPreferences");
- editPref.addParam("controller",
+ editPref.addParam(Controller.CONTROLLER_PARAM_KEY,
com.jcorporate.expresso.services
.controller.EditUserPreference.class.getName());
- editPref.addParam("state", "edit");
+ editPref.addParam(STATE_PARAM_KEY, "edit");
response.add(editPref);
Transition showDBMenu = new Transition();
showDBMenu.setName("showDBMenu");
- showDBMenu.addParam("controller",
+ showDBMenu.addParam(Controller.CONTROLLER_PARAM_KEY,
this.getDefaultRegistrationController()
.getClass().getName());
- showDBMenu.addParam("state", "showDBMenu");
+ showDBMenu.addParam(STATE_PARAM_KEY, "showDBMenu");
response.add(showDBMenu);
} else {
@@ -822,16 +823,16 @@
Transition editPref = new Transition();
editPref.setName("editPreferences");
- editPref.addParam("controller",
+ editPref.addParam(Controller.CONTROLLER_PARAM_KEY,
"com.jcorporate.expresso.services.controller.EditUserPreference");
- editPref.addParam("state", "edit");
+ editPref.addParam(STATE_PARAM_KEY, "edit");
response.add(editPref);
Transition showDBMenu = new Transition();
showDBMenu.setName("showDBMenu");
- showDBMenu.addParam("controller",
+ showDBMenu.addParam(Controller.CONTROLLER_PARAM_KEY,
this.getDefaultRegistrationController().getClass().getName());
- showDBMenu.addParam("state", "showDBMenu");
+ showDBMenu.addParam(STATE_PARAM_KEY, "showDBMenu");
response.add(showDBMenu);
}
@@ -1014,16 +1015,16 @@
Transition showDBMenu = new Transition();
showDBMenu.setName("showDBMenu");
- showDBMenu.addParam("controller",
+ showDBMenu.addParam(Controller.CONTROLLER_PARAM_KEY,
this.getDefaultRegistrationController().getClass().getName());
- showDBMenu.addParam("state", "showDBMenu");
+ showDBMenu.addParam(STATE_PARAM_KEY, "showDBMenu");
response.add(showDBMenu);
Transition editPref = new Transition();
editPref.setName("editPreferences");
- editPref.addParam("controller",
+ editPref.addParam(Controller.CONTROLLER_PARAM_KEY,
"com.jcorporate.expresso.services.controller.EditUserPreference");
- editPref.addParam("state", "edit");
+ editPref.addParam(STATE_PARAM_KEY, "edit");
response.add(editPref);
//
Index: WizardFormStack.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/WizardFormStack.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/WizardFormStack.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/WizardFormStack.java -u -r1.3 -r1.4
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/WizardFormStack.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/WizardFormStack.java
@@ -176,7 +176,7 @@
}
current = (Transition) formStack.pop();
} else {
- if (current != null && current.getState().equals(request.getParameter("state"))) {
+ if (current != null && current.getState().equals(request.getParameter(Controller.STATE_PARAM_KEY))) {
//we've gotten back to the same state through an error probably
//don't push this value again.
return;
@@ -186,7 +186,7 @@
formStack.push(current);
}
- String curState = request.getParameter("state");
+ String curState = request.getParameter(Controller.STATE_PARAM_KEY);
if (curState == null) {
curState = c.getInitialState();
}
Index: ControllerSecurityMatrix.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ControllerSecurityMatrix.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ControllerSecurityMatrix.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ControllerSecurityMatrix.java -u -r1.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ControllerSecurityMatrix.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ControllerSecurityMatrix.java
@@ -161,7 +161,7 @@
Transition again = new Transition("Start Again",
getClass().getName());
again.setName("again");
- again.addParam("state", "prompt");
+ again.addParam(STATE_PARAM_KEY, "prompt");
response.addTransition(again);
}
@@ -483,13 +483,13 @@
Transition setcon = new Transition("Select Allowed Controllers",
getClass().getName());
setcon.setName("setcon");
- setcon.addParam("state", "setcon");
+ setcon.addParam(STATE_PARAM_KEY, "setcon");
myResponse.addTransition(setcon);
Transition selcon = new Transition("Select Allowed States",
getClass().getName());
selcon.setName("selcon");
- selcon.addParam("state", "selcon");
+ selcon.addParam(STATE_PARAM_KEY, "selcon");
myResponse.addTransition(selcon);
} /* promptState() */
@@ -551,7 +551,7 @@
Transition selstates = new Transition("Select Allowed States",
getClass().getName());
selstates.setName("selstates");
- selstates.addParam("state", "selstates");
+ selstates.addParam(STATE_PARAM_KEY, "selstates");
selstates.addParam("GroupName", params.getParameter("GroupName"));
selstates.addParam("SchemaClass", params.getParameter("SchemaClass"));
myResponse.addTransition(selstates);
@@ -594,7 +594,7 @@
Transition updstates = new Transition("Update", getClass().getName());
updstates.setName("updstates");
- updstates.addParam("state", "updstates");
+ updstates.addParam(STATE_PARAM_KEY, "updstates");
updstates.addParam("GroupName", params.getParameter("GroupName"));
updstates.addParam("ControllerClass",
params.getParameter("ControllerClass"));
@@ -650,7 +650,7 @@
Transition updcon = new Transition("Update", getClass().getName());
updcon.setName("updcon");
- updcon.addParam("state", "updcon");
+ updcon.addParam(STATE_PARAM_KEY, "updcon");
updcon.addParam("GroupName", params.getParameter("GroupName"));
updcon.addParam("SchemaClass", params.getParameter("SchemaClass"));
myResponse.addTransition(updcon);
Index: EditUserPreference.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/EditUserPreference.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/EditUserPreference.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/EditUserPreference.java -u -r1.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/EditUserPreference.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/EditUserPreference.java
@@ -217,7 +217,7 @@
Transition update = new Transition("Update", getClass().getName());
- update.addParam("state", "update");
+ update.addParam(STATE_PARAM_KEY, "update");
myResponse.addTransition(update);
} /* editState() */
Index: QueueJob.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/QueueJob.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/QueueJob.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/QueueJob.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/QueueJob.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/QueueJob.java
@@ -80,6 +80,7 @@
import com.jcorporate.expresso.core.controller.Output;
import com.jcorporate.expresso.core.controller.State;
import com.jcorporate.expresso.core.controller.Transition;
+import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.Schema;
import com.jcorporate.expresso.core.dbobj.SchemaFactory;
@@ -230,7 +231,7 @@
Transition queuejob = new Transition("Queue Job", getClass().getName());
queuejob.setName("queuejob");
- queuejob.addParam("state", "queuejob");
+ queuejob.addParam(STATE_PARAM_KEY, "queuejob");
queuejob.addParam("JobClass", cparams.getParameter("JobClass"));
myResponse.addTransition(queuejob);
} /* jobParamsState() */
@@ -264,7 +265,7 @@
Transition again = new Transition("Start Again",
getClass().getName());
again.setName("again");
- again.addParam("state", "prompt");
+ again.addParam(STATE_PARAM_KEY, "prompt");
myResponse.addTransition(again);
}
@@ -317,7 +318,7 @@
Transition seljob = new Transition("Select Job", getClass().getName());
seljob.setName("seljob");
- seljob.addParam("state", "seljob");
+ seljob.addParam(STATE_PARAM_KEY, "seljob");
myResponse.addTransition(seljob);
} /* promptState() */
@@ -358,9 +359,9 @@
oneParamName = (String) par.nextElement();
/* skip params used for management of this controller */
- if ((!oneParamName.equals("state")) &&
+ if ((!oneParamName.equals(STATE_PARAM_KEY)) &&
(!oneParamName.equals("cmd")) &&
- (!oneParamName.equals("controller")) &&
+ (!oneParamName.equals(Controller.CONTROLLER_PARAM_KEY)) &&
(!oneParamName.equals("next")) &&
(!oneParamName.equals("JobClass")) &&
(oneParamName.indexOf("_") == -1)) {
@@ -465,7 +466,7 @@
Transition jobparams = new Transition("Enter Job Parameters",
getClass().getName());
jobparams.setName("queuejob");
- jobparams.addParam("state", "jobparams");
+ jobparams.addParam(STATE_PARAM_KEY, "jobparams");
myResponse.addTransition(jobparams);
} /* selJobState() */
Index: GetBase.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java -u -r1.16 -r1.17
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java
@@ -68,6 +68,7 @@
import com.jcorporate.expresso.core.controller.Input;
import com.jcorporate.expresso.core.controller.Output;
import com.jcorporate.expresso.core.controller.Transition;
+import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.dataobjects.DataObject;
import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
import com.jcorporate.expresso.core.db.DBException;
@@ -83,7 +84,6 @@
* Base class for search/add & update operations that
* were previously carried out in DBMaint.doGet().
*
- * @version $Revision$ $Date$
* @author Michael Nash, contributions by Kevin King
*/
public abstract class GetBase
@@ -212,7 +212,7 @@
if (definitionName.length() > 0) {
lookup.addParam("definition",definitionName);
}
- lookup.addParam("state", "Search");
+ lookup.addParam(Controller.STATE_PARAM_KEY, "Search");
lookup.setDescription("Look up Values");
oneField.addNested(lookup);
}
@@ -238,4 +238,3 @@
} /* GetBase */
-/* GetBase */
\ No newline at end of file
Index: DynamicCmd.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java -u -r1.35 -r1.36
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java
@@ -73,6 +73,7 @@
import com.jcorporate.expresso.core.controller.Output;
import com.jcorporate.expresso.core.controller.State;
import com.jcorporate.expresso.core.controller.Transition;
+import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.controller.session.PersistentSession;
import com.jcorporate.expresso.core.dataobjects.DataObject;
import com.jcorporate.expresso.core.dataobjects.Defineable;
@@ -322,7 +323,7 @@
this.countTotalRecords = false;
}
- String thisCommand = StringUtil.notNull(getParameter("state"));
+ String thisCommand = StringUtil.notNull(getParameter(Controller.STATE_PARAM_KEY));
/* if any key values present then recover them */
String allKeys = URLUTF8Encoder.decode(StringUtil.notNull(getParameter("key")));
@@ -419,7 +420,7 @@
prevSet.setName("prevSet");
prevSet.setDescription("Previous " + pageLimit + " records");
prevSet.addParam("dbobj", myDBObjName);
- prevSet.addParam("state", "List");
+ prevSet.addParam(Controller.STATE_PARAM_KEY, "List");
prevSet.addParam("page",
new Integer(getPageNumber() - 1).toString());
@@ -460,7 +461,7 @@
listAction.setName("List");
listAction.setLabel("List");
listAction.addParam("dbobj", myDBObjName);
- listAction.addParam("state", "SearchList");
+ listAction.addParam(Controller.STATE_PARAM_KEY, "SearchList");
tempParam = getFieldsParam();
if (tempParam.length() > 0) {
@@ -513,7 +514,7 @@
addAction.setName("Add");
addAction.setLabel("Add");
addAction.addParam("dbobj", myDBObjName);
- addAction.addParam("state", "Add");
+ addAction.addParam(Controller.STATE_PARAM_KEY, "Add");
if (myDBObj instanceof Defineable) {
addAction.addParam("definition",((Defineable)myDBObj).getDefinitionName());
}
@@ -550,7 +551,7 @@
searchAction.setName("Search");
searchAction.setLabel("Search");
searchAction.addParam("dbobj", myDBObjName);
- searchAction.addParam("state", "Search");
+ searchAction.addParam(Controller.STATE_PARAM_KEY, "Search");
if (myDBObj instanceof Defineable) {
searchAction.addParam("definition",((Defineable)myDBObj).getDefinitionName());
}
@@ -597,7 +598,7 @@
if (myDBObj instanceof Defineable) {
nextSet.addParam("definition",((Defineable)myDBObj).getDefinitionName());
}
- nextSet.addParam("state", "List");
+ nextSet.addParam(Controller.STATE_PARAM_KEY, "List");
nextSet.addParam("page",
new Integer(getPageNumber() + 1).toString());
@@ -1072,7 +1073,7 @@
}
Transition editLink = new Transition("edit", controller);
- editLink.addParam("state", "Update");
+ editLink.addParam(Controller.STATE_PARAM_KEY, "Update");
addParams(editLink);
FastStringBuffer keyString = FastStringBuffer.getInstance();
Index: Search.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java -u -r1.22 -r1.23
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java
@@ -70,6 +70,7 @@
import com.jcorporate.expresso.core.controller.Input;
import com.jcorporate.expresso.core.controller.NonHandleableException;
import com.jcorporate.expresso.core.controller.Transition;
+import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.dataobjects.DataFieldMetaData;
import com.jcorporate.expresso.core.dataobjects.DataObject;
import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
@@ -255,7 +256,7 @@
Transition lookup = new Transition();
lookup.setName("lookup");
lookup.addParam("dbobj", lookupObjectName);
- lookup.addParam("state", "Search");
+ lookup.addParam(Controller.STATE_PARAM_KEY, "Search");
lookup.setDescription("Look up Values");
oneField.addNested(lookup);
} /* if there was a lookup object */
Index: ListBase.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java -u -r1.28 -r1.29
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java
@@ -69,6 +69,7 @@
import com.jcorporate.expresso.core.controller.ControllerRequest;
import com.jcorporate.expresso.core.controller.Output;
import com.jcorporate.expresso.core.controller.Transition;
+import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.dataobjects.DataFieldMetaData;
import com.jcorporate.expresso.core.dataobjects.DataObject;
import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
@@ -400,9 +401,9 @@
Class controllerClass = this.getController().getClass();
java.util.Hashtable allParameters = request.getParameters();
- allParameters.remove("controller");
- String state = (String)allParameters.get("state");
- allParameters.remove("state");
+ allParameters.remove(Controller.CONTROLLER_PARAM_KEY);
+ String state = (String)allParameters.get(Controller.STATE_PARAM_KEY);
+ allParameters.remove(Controller.STATE_PARAM_KEY);
if (curPage != 1) {
Transition t = new Transition();
Index: Add.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java -u -r1.20 -r1.21
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java
@@ -71,6 +71,7 @@
import com.jcorporate.expresso.core.controller.Input;
import com.jcorporate.expresso.core.controller.NonHandleableException;
import com.jcorporate.expresso.core.controller.Transition;
+import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.dataobjects.DataFieldMetaData;
import com.jcorporate.expresso.core.dataobjects.DataObject;
import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
@@ -91,7 +92,6 @@
* the default values of the given DBObject.</p>
* <p>The actual class that does the updating is <code>AddUpdate</code></p>
*
- * @version $Revision$ $Date$
* @author Michael Nash, contributions by Kevin King
* @see com.jcorporate.expresso.services.controller.dbmaint.AddUpdate
*/
@@ -134,8 +134,6 @@
"initialized before calling autoField");
}
- String oneFieldValue = myDBObj.getDataField(oneFieldName).asString();
-
DataFieldMetaData metadata = myDBObj.getFieldMetaData(oneFieldName);
DataObjectMetaData objMetadata = myDBObj.getMetaData();
@@ -156,7 +154,6 @@
String fixedValue = (String) fixedFields.get(oneFieldName);
if (fixedValue != null) {
- oneFieldValue = fixedValue;
readOnly = true;
}
@@ -193,7 +190,7 @@
Transition lookup = new Transition();
lookup.setName("lookup");
lookup.addParam("dbobj", lookupObjectName);
- lookup.addParam("state", "Search");
+ lookup.addParam(Controller.STATE_PARAM_KEY, "Search");
lookup.setDescription("Look up Values");
i.addNested(lookup);
} /* if there was a lookup object */
@@ -240,6 +237,4 @@
throw new ControllerException(de);
}
} /* run(ControllerRequest, ControllerResponse) */
-}
-
-/* Add */
\ No newline at end of file
+} /* Add */
\ No newline at end of file
Index: Update.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java -u -r1.22 -r1.23
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java
@@ -71,6 +71,7 @@
import com.jcorporate.expresso.core.controller.Input;
import com.jcorporate.expresso.core.controller.NonHandleableException;
import com.jcorporate.expresso.core.controller.Transition;
+import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.controller.session.PersistentSession;
import com.jcorporate.expresso.core.dataobjects.DataObject;
import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
@@ -182,7 +183,7 @@
Transition lookup = new Transition();
lookup.setName("lookup");
lookup.addParam("dbobj", lookupObjectName);
- lookup.addParam("state", "Search");
+ lookup.addParam(Controller.STATE_PARAM_KEY, "Search");
lookup.setDescription("Look up Values");
oneField.addNested(lookup);
} /* if there was a lookup object */
@@ -289,7 +290,7 @@
masterTrans.setLabel(metadata.getDescription(req.getLocale()));
masterTrans.setAttribute("dbobj",className);
masterTrans.addParam("dbobj", className);
- masterTrans.addParam("state", "Update");
+ masterTrans.addParam(Controller.STATE_PARAM_KEY, "Update");
masterTrans.addParam("key",
URLUTF8Encoder.encode(
keyParam));
@@ -328,7 +329,7 @@
oneTrans.setAttribute("dbobj",
((Object)detDBObj).getClass().getName());
oneTrans.addParam("dbobj", oneDet);
- oneTrans.addParam("state", "SearchList");
+ oneTrans.addParam(Controller.STATE_PARAM_KEY, "SearchList");
oneTrans.addParam("details", "y");
StringBuffer fieldsString = new StringBuffer();
Index: ControllerJob.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ControllerJob.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ControllerJob.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ControllerJob.java -u -r1.11 -r1.12
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ControllerJob.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ControllerJob.java
@@ -84,7 +84,6 @@
* specified state of the controller, and includes the
* controller's outputs in the email notification to the requestor
*
- * @version $Revision$ $Date$
* @author Michael Nash
*/
public class ControllerJob
@@ -108,7 +107,7 @@
try {
StringBuffer mailMsg = new StringBuffer("");
String controllerName = StringUtil.notNull(getJobParameter(
- "controller"));
+ Controller.CONTROLLER_PARAM_KEY));
if (controllerName.equals("")) {
throw new ServerException("Parameter 'controller' " +
@@ -128,7 +127,7 @@
}
cparams.setParameters(namesValues);
- String newState = StringUtil.notNull(getJobParameter("state"));
+ String newState = StringUtil.notNull(getJobParameter(Controller.STATE_PARAM_KEY));
ControllerResponse myResponse = myController.newState(newState,
cparams);
Output oneOutput = null;
Index: ControllerTestCase.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java
@@ -188,7 +188,7 @@
theState = state;
request.addParameter("style", "xml");
request.addParameter("xsl", "none");
- request.addParameter("state", state);
+ request.addParameter(Controller.STATE_PARAM_KEY, state);
}
/**
More information about the cvs
mailing list