[cvs] expresso commit by rimovm: -Input.get/setValidValues
@deprecated in
JCorporate Ltd
jcorp at jcorporate.com
Thu Apr 28 14:17:19 UTC 2005
Log Message:
-----------
-Input.get/setValidValues @deprecated in favor of List based version.
-Migrated new code throughout Expresso
-New Radio Tag
-Added baseline Aggregate DBObject test cases.
-Renamed SuperUser.SUPER_USER to SuperUser.INSTANCE
-Fixed issue in new SecuredDBObject(ReadOnlyUser);
-Properly marked @deprecated old DBObject(int)-style constructors.
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core:
ExpressoSchema.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller:
ControllerElement.java
Input.java
SecureIfSetController.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects:
Securable.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc:
JoinedDataObject.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db:
TableCreator.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj:
DBObject.java
DBSequence.java
RowSecuredDBObject.java
Schema.java
SecuredDBObject.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/job:
Job.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging:
Log.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc:
ConfigManager.java
RecordPaginator.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/registry:
RequestRegistryFilter.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security:
SuperUser.java
User.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet:
CheckLogin.java
StdServlet.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/viewhandler:
DefaultViewHandler.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility:
ControllerRun.java
DBTool.java
DBToolTests.java
JobHandler.java
QueueJob.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller:
ComponentManager.java
DataTransfer.java
Download.java
ReportServer.java
RunSQL.java
TestController.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj:
AppIntegration.java
DownloadFiles.java
DownloadLog.java
ISOCountryCodes.java
PerfTestSet.java
PerfTestSetDet.java
PerfTestStat.java
PerfTests.java
RegisteredUser.java
RestrictedCountries.java
RestrictedOverrides.java
ReverseLookupDomains.java
SingleDBUserInfo.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj:
Address.java
Contact.java
Person.java
Phone.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/job:
SendNotice.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/report:
DownloadUsers.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html:
ExComboBoxTag.java
ExSelectTag.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib:
IfMemberOfGroup.java
InputTag.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/velocity:
ExpressoTool.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/controller:
XMLController.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/dbobj:
ControllerXSLMap.java
UserAgent.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller:
CacheControl.java
ControllerSecurityMatrix.java
CronController.java
DBMaint.java
DBSecurityMatrix.java
ErrorHandler.java
JobSecurityMatrix.java
Log.java
QueueJob.java
Registration.java
SimpleLoginController.java
SimpleRegistration.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint:
Add.java
DynamicCmd.java
List.java
Search.java
Update.java
UpdateUpdate.java
ViewBlob.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ui:
DefaultAutoElement.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/crontab:
CronDaemon.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj:
ControllerDefault.java
ControllerSecurity.java
DBMessage.java
DBObjImpl.java
DBObjLimit.java
DBObjSecurity.java
DBOtherMap.java
DefaultUserInfo.java
Event.java
EventMail.java
GroupMembers.java
GroupNest.java
JobHandlerControl.java
JobHandlerRegistry.java
JobQueue.java
JobQueueParam.java
JobSecurity.java
LogEntry.java
MediaDBObject.java
MimeTypes.java
RegistrationDBObject.java
RegistrationDomain.java
RegistrationObjectMap.java
SchemaList.java
SecurityDBObject.java
Setup.java
TmpUser.java
UserGroup.java
UserPreference.java
UserPreferenceDef.java
UserPreferenceVal.java
ValidationQueue.java
ValidationQueueParam.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job:
ClearOldValidation.java
TestJob.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/servlet:
DBCreate.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/taglib:
SelectOptions.java
TransitionName.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test:
DBTestSuite.java
SchemaCreator.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/validation:
ValidationEntry.java
expresso/expresso-web/WEB-INF/test-src/com/jcorporate/expresso/core:
ExpressoTestSuite.java
ServerSideTestSuite.java
expresso/expresso-web/WEB-INF/test-src/com/jcorporate/expresso/core/dataobjects/jdbc/tests:
JoinedObjectTest.java
TestJoinUtil.java
expresso/expresso-web/WEB-INF/test-src/com/jcorporate/expresso/core/dataobjects/test:
TestDataTransferObject.java
expresso/expresso-web/WEB-INF/test-src/com/jcorporate/expresso/core/dbobj/tests:
AutoDBObjTest.java
SerializationTest.java
expresso/expresso-web/WEB-INF/test-src/com/jcorporate/expresso/core/registry:
TestExpressoThread.java
TestMutableRequestRegistry.java
expresso/expresso-web/WEB-INF/test-src/com/jcorporate/expresso/ext/tests:
DBObjStressTest.java
RetrieveThroughputTest.java
StressTestObject.java
expresso/expresso-web/WEB-INF/test-src/com/jcorporate/expresso/services/controller/tests:
DBMaintTests.java
DBSecurityMatrixTests.java
expresso/expresso-web/WEB-INF/test-src/com/jcorporate/expresso/services/dbobj/tests:
DBObjSecurityTests.java
MimeTypesTests.java
SetupTests.java
expresso/expresso-web/WEB-INF/tld:
expresso-el.tld
expresso/expresso-web/expresso/doc:
ChangeLog.xml
Added Files:
-----------
expresso/expresso-web/WEB-INF/test-src/com/jcorporate/expresso/core/dbobj/tests:
TestDBObjectAggregrateFunctions.java
Revision Data
-------------
Index: expresso-el.tld
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/tld/expresso-el.tld,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lexpresso-web/WEB-INF/tld/expresso-el.tld -Lexpresso-web/WEB-INF/tld/expresso-el.tld -u -r1.1 -r1.2
--- expresso-web/WEB-INF/tld/expresso-el.tld
+++ expresso-web/WEB-INF/tld/expresso-el.tld
@@ -5,7 +5,7 @@
<tlibversion>1.0</tlibversion>
<jspversion>1.1</jspversion>
<shortname>expresso_el</shortname>
- <uri>http://www.jcorporate.com/taglib/expresso-el</uri>
+ <uri>http://www.jcorporate.com/taglib/expresso-el</uri>
<tag>
<name>action</name>
<tagclass>com.jcorporate.expresso.services.taglib.FormActionTag</tagclass>
@@ -48,6 +48,61 @@
<attribute>
<name>value</name>
<required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>radio</name>
+ <tagclass>com.jcorporate.expresso.services.taglib.Radio</tagclass>
+ <bodycontent>empty</bodycontent>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>input</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>onClick</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>onBlur</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>styleClass</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>onMouseDown</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>onMouseMove</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>onMouseOut</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>onMouseOver</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>onMouseUp</name>
+ <required>false</required>
<rtexprvalue>false</rtexprvalue>
</attribute>
</tag>
Index: ExpressoSchema.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java -u -r1.57 -r1.58
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java
@@ -195,7 +195,7 @@
public synchronized void otherSetup(InstallLog installLog,
String dataContext) throws com.jcorporate.expresso.core.db.DBException {
//Add a recurring 'Clear old validation entries job'
- JobQueue jq = new JobQueue(SuperUser.SUPER_USER);
+ JobQueue jq = new JobQueue(SuperUser.INSTANCE);
jq.setDataContext(dataContext);
jq.setField(JobQueue.FLD_JOBCODE,
com.jcorporate.expresso.services.job.ClearOldValidation.class.getName());
Index: ControllerElement.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerElement.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerElement.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerElement.java -u -r1.30 -r1.31
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerElement.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerElement.java
@@ -67,18 +67,16 @@
*/
package com.jcorporate.expresso.core.controller;
-import com.jcorporate.expresso.core.misc.StringUtil;
-import com.jcorporate.expresso.kernel.util.ClassLocator;
-import com.jcorporate.expresso.kernel.util.FastStringBuffer;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Vector;
+import com.jcorporate.expresso.core.misc.StringUtil;
+import com.jcorporate.expresso.kernel.util.FastStringBuffer;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
@@ -174,7 +172,7 @@
*
* @param e A ControllerElement to nest inside this element
*/
- public void addNested(ControllerElement e) {
+ public void addNested(final ControllerElement e) {
if (nested == null) {
nested = new Vector(3);
}
@@ -202,7 +200,7 @@
* @param t the source ControllerElement to return from
* @return java.util.Vector
*/
- private Vector addNestedFrom(ControllerElement t) {
+ private Vector addNestedFrom(final ControllerElement t) {
Vector v = new Vector();
Vector tVec = t.getNestedOrNull();
@@ -245,31 +243,14 @@
/**
* Shouldn't be normally called directly.
*
- * @return created or null of the creation fails.
+ * @return the cloned node.
* @throws CloneNotSupportedException as per the API spec.
*/
public Object clone()
throws java.lang.CloneNotSupportedException {
- Object o = null;
- String className = getClass().getName();
- try {
- Class c = ClassLocator.loadClass(className);
- o = c.newInstance();
- } catch (ClassNotFoundException cn) {
- throw new IllegalArgumentException("State object '" + className +
- "' not found");
- } catch (InstantiationException ie) {
- throw new IllegalArgumentException("State object '" + className +
- "' cannot be instantiated");
- } catch (IllegalArgumentException e) {
- throw new IllegalArgumentException("State object '" + className +
- "' cannot be instantiated (IllegalArgumentException)");
- } catch (IllegalAccessException iae) {
- throw new IllegalArgumentException("llegal access loading " +
- "State object '" + className +
- "'");
- }
+ Object o = super.clone();
+
synchronized (this) {
ControllerElement ce = (ControllerElement) o;
Vector v = this.getNestedOrNull();
@@ -309,8 +290,9 @@
*
* @param n A <code>DOM Node</code> object.
* @return an instantiated ControllerElement
+ * @throws ControllerException upon parsing error.
*/
- public static ControllerElement fromXML(Node n)
+ public static ControllerElement fromXML(final Node n)
throws ControllerException {
ControllerElement ce = new ControllerElement();
@@ -325,7 +307,7 @@
* @return an instantiated ControllerElement
* @throws ControllerException if fragment is not a controller element
*/
- protected static ControllerElement fromXML(Node n, ControllerElement ce)
+ protected static ControllerElement fromXML(final Node n, final ControllerElement ce)
throws ControllerException {
if (!n.getNodeName().equals("controller-element")) {
throw new ControllerException("Failed To Get DOM Node of " +
@@ -476,7 +458,7 @@
* @return The value of the specified attribtue, if it exists, else
* null
*/
- public String getAttribute(String att) {
+ public String getAttribute(final String att) {
if (attributes == null) {
return "";
}
@@ -509,7 +491,7 @@
* @param name name of item to be fetched
* @return content associated with name, or null
*/
- public ControllerElement getContent(String name) {
+ public ControllerElement getContent(final String name) {
ControllerElement t = null;
Vector v = this.getNestedOrNull();
if (v != null) {
@@ -681,7 +663,7 @@
* nested items.
* @throws ControllerException if there is no such item nested in this item
*/
- public void removeNested(ControllerElement elementToRemove)
+ public void removeNested(final ControllerElement elementToRemove)
throws ControllerException {
if (nested.removeElement(elementToRemove)) {
return;
@@ -701,7 +683,7 @@
* @param attrib The name of an "attribtue" for this ControllerElement item
* @param val The value for this attribute
*/
- public void setAttribute(String attrib, String val) {
+ public void setAttribute(final String attrib, final String val) {
if (attributes == null) {
attributes = new HashMap();
}
@@ -713,7 +695,7 @@
*
* @param newDescription The description being set by this object
*/
- public void setDescription(String newDescription) {
+ public void setDescription(final String newDescription) {
description = newDescription;
} /* setDescription(String) */
@@ -723,7 +705,7 @@
*
* @param newLength The specified length for display of this element
*/
- public void setDisplayLength(int newLength) {
+ public void setDisplayLength(final int newLength) {
displayLength = newLength;
} /* setDisplayLength(int) */
@@ -732,7 +714,7 @@
*
* @param newLabel The new label for this element
*/
- public void setLabel(String newLabel) {
+ public void setLabel(final String newLabel) {
label = newLabel;
} /* setLabel(String) */
@@ -741,7 +723,7 @@
*
* @param newLines The number of lines to specify
*/
- public void setLines(int newLines) {
+ public void setLines(final int newLines) {
lines = newLines;
} /* setLines(int) */
@@ -750,7 +732,7 @@
*
* @param newName The new name for this element
*/
- public void setName(String newName) {
+ public void setName(final String newName) {
name = newName;
} /* setName(String) */
@@ -760,7 +742,7 @@
*
* @param t The ControllerElement that has this element as a nested item
*/
- public void setParent(ControllerElement t) {
+ public void setParent(final ControllerElement t) {
parent = t;
} /* setParent(ControllerElement) */
@@ -769,7 +751,7 @@
*
* @param s a new java.lang.String
*/
- public void setType(String s) {
+ public void setType(final String s) {
type = s;
}
@@ -931,8 +913,9 @@
*
* @param nestedName the name of the element to retrieve
* @return An Element with the specified name or null if it doesn't exist
+ * @throws ControllerException (never thrown)
*/
- public ControllerElement getNested(String nestedName)
+ public ControllerElement getNested(final String nestedName)
throws ControllerException {
ControllerElement oneElement = null;
Vector v = getNestedOrNull();
@@ -956,7 +939,7 @@
/**
* Return a Map of all nested elements keyed by controllerElement name.
* Useful for JSTL iteration of the Map.
- *
+ *
* @return Map nested elements
*/
public Map getNestedMap() {
@@ -973,7 +956,7 @@
*
* @param newResponse the new Response.
*/
- public synchronized void setControllerResponse(ControllerResponse newResponse) {
+ public synchronized void setControllerResponse(final ControllerResponse newResponse) {
myResponse = newResponse;
Vector allNested = getNestedOrNull();
Index: SecureIfSetController.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/SecureIfSetController.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/SecureIfSetController.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/SecureIfSetController.java -u -r1.8 -r1.9
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/SecureIfSetController.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/SecureIfSetController.java
@@ -126,7 +126,7 @@
DBConnectionPool pool = DBConnectionPool.getInstance(dataContext);
DBConnection connection = pool.getConnection("Security Check");
try {
- ControllerSecurity cs = new ControllerSecurity(SuperUser.SUPER_USER);
+ ControllerSecurity cs = new ControllerSecurity(SuperUser.INSTANCE);
cs.setDataContext(dataContext);
cs.count();
} finally {
Index: Input.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java -u -r1.33 -r1.34
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java
@@ -81,6 +81,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
+import java.util.Collections;
/**
@@ -122,7 +123,7 @@
/**
* Vector of value/description pairs that are valid for this item
*/
- private Vector validValues = null;
+ private List validValues = null;
/**
* Object name that can be used to look up valid values for
@@ -289,7 +290,7 @@
i.lookup = (lookup);
i.key = key;
if (validValues != null) {
- i.validValues = (Vector) validValues.clone();
+ i.validValues = new ArrayList(validValues);
}
if (getAttributes().size() > 0) {
i.getAttributes().putAll(getAttributes());
@@ -373,12 +374,8 @@
* @return FastStringBuffer( usually the same one passed in)
* @todo adapt to support multiple default values
*/
- public FastStringBuffer toXML(FastStringBuffer stream) {
- Vector vv = this.getValidValues();
-
- if (vv == null) {
- vv = new Vector();
- }
+ public FastStringBuffer toXML(final FastStringBuffer stream) {
+ List vv = this.getValidValuesList();
stream.append("<input");
@@ -411,8 +408,8 @@
ValidValue oneValue = null;
stream.append(" <valid-values>\n");
- for (Enumeration e = vv.elements(); e.hasMoreElements();) {
- oneValue = (ValidValue) e.nextElement();
+ for (Iterator e = vv.iterator(); e.hasNext();) {
+ oneValue = (ValidValue) e.next();
stream.append(" <valid-value value=\"" +
StringUtil.xmlEscape(oneValue.getValue()) +
"\" description=\"" +
@@ -439,7 +436,7 @@
* nodes)
* @throws ControllerException upon error
*/
- public static ControllerElement fromXML(Node n)
+ public static ControllerElement fromXML(final Node n)
throws ControllerException {
//If we're at the root node, then it'll be doc instead of input.
@@ -541,22 +538,43 @@
* * to select one of these values, but the presentation of the
* * list is up to the client (e.g. could be a drop-down, radio
* * buttons, etc). Can be empty, but Never null.
+ * @deprecated Since Expresso 5.7 (April 28,2005) use getValidValuesList
+ * instead.
*/
public Vector getValidValues() {
if (validValues == null) {
return new Vector();
}
- return validValues;
+ return new Vector(validValues);
+ }
+
+
+ /**
+ * Return the list of Valid Values that are allowed for this Input item.
+ *
+ * @return A <tt>java.util.List</tt> of value/description pairs that enumerate
+ * the valid values for this Input item. The user is expected
+ * to select one of these values, but the presentation of the
+ * list is up to the client (e.g. could be a drop-down, radio
+ * buttons, etc). Can be empty, but Never null.
+ * @return List of ValidValue objects.
+ */
+ public List getValidValuesList() {
+ if (validValues == null) {
+ return new ArrayList();
+ }
+
+ return Collections.unmodifiableList(validValues);
}
/**
- * supply a default value for this
+ * Supply a default value for this
* Input object; appropriate for single selection items; sets the 0th item in underlying list
*
* @param newValue The new default value for this Input item
* @see #addDefaultValue for multiple selection
*/
- public void setDefaultValue(String newValue) {
+ public void setDefaultValue(final String newValue) {
if (newValue == null) {
// is this trying to unset a value?
if (defaultValue != null) {
@@ -584,7 +602,7 @@
* @param list The new list of default values (strings) for this Input item
* @see #addDefaultValue for adding multiple selection defaults one at a time
*/
- public void setDefaultValue(List list) {
+ public void setDefaultValue(final List list) {
if (list == null) {
// is this trying to unset a value?
if (defaultValue != null) {
@@ -627,7 +645,7 @@
* @param response The controller response where the form cache may exist
* @throws ControllerException upon error
*/
- public void setDefaultValue(ControllerResponse response)
+ public void setDefaultValue(final ControllerResponse response)
throws ControllerException {
setDefaultValue(response.getFormCache(this.getName()));
}
@@ -639,7 +657,7 @@
*
* @param s the lookup class name to associate with the Input
*/
- public void setLookup(String s) {
+ public void setLookup(final String s) {
lookup = s;
} /* setLookup(String) */
@@ -660,7 +678,7 @@
* @throws IllegalArgumentException if the name is a 'reserved word' as
* defined by ConfigManager.
*/
- public void setName(String newName) {
+ public void setName(final String newName) {
if (ConfigManager.isParameterReservedWord(newName)) {
throw new IllegalArgumentException("You cannot have a input name of " + newName +
". It is a reserved word. Check " +
@@ -677,14 +695,14 @@
* @param value the 'key' part of the valid value
* @param descrip the description part of the valid value.
*/
- public synchronized void addValidValue(String value, String descrip) {
+ public synchronized void addValidValue(final String value, final String descrip) {
ValidValue v = new ValidValue(value, descrip);
if (validValues == null) {
validValues = new Vector();
}
- validValues.addElement(v);
+ validValues.add(v);
}
/**
@@ -692,7 +710,7 @@
*
* @param newType the new type as appears in an Input tag
*/
- public void setType(String newType) {
+ public void setType(final String newType) {
if (newType == null) {
super.setType("C");
} else {
@@ -704,19 +722,27 @@
* Method for the Controller to specify the valid values for this
* Input item
*
- * @param v The value/description pairs that make up the
- * * valid values for this Input object.
+ * @param v The value/description pairs that make up the valid values for this Input object.
+ * @deprecated Since Expresso 5.7
*/
- public void setValidValues(Vector v) {
+ public void setValidValues(final Vector v) {
validValues = v;
- } /* setValidValues(Vector) */
+ }
+
+ /**
+ * Sets a list of valid value objects all at once.
+ * @param valueList List a java.util.List object.
+ */
+ public void setValidValues(final List valueList) {
+ validValues = valueList;
+ }
/**
* The Key of the Input
*
* @param newKey the new value
*/
- public synchronized void setKey(String newKey) {
+ public synchronized void setKey(final String newKey) {
key = newKey;
} /* setKey(String) */
@@ -735,7 +761,7 @@
*
* @param newMultiple Specify if true or false the input will accept multiple selects.
*/
- public void setMultiple(String newMultiple) {
+ public void setMultiple(final String newMultiple) {
multiple = newMultiple;
} /* setMultiple(String) */
Index: JoinedDataObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObject.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObject.java -u -r1.47 -r1.48
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObject.java
@@ -187,7 +187,7 @@
/**
* Security context. To replace uid.
*/
- private ReadOnlyUser userSecurity = SuperUser.SUPER_USER;
+ private ReadOnlyUser userSecurity = SuperUser.INSTANCE;
/**
@@ -2010,7 +2010,7 @@
public void setRequestingUid(int newUid) {
if (newUid == SYSTEM_ACCOUNT) {
- userSecurity = SuperUser.SUPER_USER;
+ userSecurity = SuperUser.INSTANCE;
} else {
try {
User u = new User();
@@ -2067,7 +2067,7 @@
- if (getRequestingUser() == SuperUser.SUPER_USER || getRequestingUser().isAdmin()) {
+ if (getRequestingUser() == SuperUser.INSTANCE || getRequestingUser().isAdmin()) {
// all access ok
return;
}
Index: Securable.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/Securable.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/Securable.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/Securable.java -u -r1.9 -r1.10
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/Securable.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/Securable.java
@@ -96,7 +96,7 @@
* ID for system account. System account bypasses all security checking
* in the system for the particular dbobject. So often you need to use
* it with caution.
- * @deprecated Since Expresso 5.6.1. Use com.jcorporate.expresso.core.security.SuperUser.SUPER_USER
+ * @deprecated Since Expresso 5.6.1. Use com.jcorporate.expresso.core.security.SuperUser.INSTANCE
* for indicating system account instead.
*/
static final int SYSTEM_ACCOUNT = -1;
Index: TableCreator.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java -u -r1.24 -r1.25
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java
@@ -393,7 +393,7 @@
for (Enumeration e = oneSchema.getMembers(); e.hasMoreElements();) {
oneMember = (DBObject) e.nextElement();
if (oneMember instanceof Securable) {
- ((Securable) oneMember).setRequestingUser(SuperUser.SUPER_USER);
+ ((Securable) oneMember).setRequestingUser(SuperUser.INSTANCE);
}
metadata = oneMember.getJDBCMetaData();
Index: Schema.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/Schema.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/Schema.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/Schema.java -u -r1.54 -r1.55
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/Schema.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/Schema.java
@@ -460,7 +460,7 @@
StringTokenizer stk = new StringTokenizer(oneHolder, "|");
try {
- Setup oneSetup = new Setup(SuperUser.SUPER_USER);
+ Setup oneSetup = new Setup(SuperUser.INSTANCE);
oneSetup.setField("SchemaClass", stk.nextToken());
oneSetup.setField("SetupCode", stk.nextToken());
oneSetup.setField("Descrip", stk.nextToken());
@@ -664,7 +664,7 @@
if (getRequestingUser() != 0) {
((SecuredDBObject) oneDBObject).setRequestingUid(getRequestingUser());
} else {
- ((SecuredDBObject) oneDBObject).setRequestingUser(SuperUser.SUPER_USER);
+ ((SecuredDBObject) oneDBObject).setRequestingUser(SuperUser.INSTANCE);
}
}
Index: RowSecuredDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java -u -r1.45 -r1.46
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java
@@ -161,7 +161,7 @@
// by default, the superclass sets requesting user ID
// to 'system' == superuser,
// so reset the requesting user here
- super.setRequestingUid(User.getIdFromLogin(User.UNKNOWN_USER,
+ super.setRequestingUser(User.getUserFromLogin(User.UNKNOWN_USER,
getDataContext()));
// no error for now if filter not found.
@@ -414,7 +414,7 @@
/**
* If we're superuser then for sure we're set.
*/
- if (getRequestingUser() == SuperUser.SUPER_USER) {
+ if (getRequestingUser() == SuperUser.INSTANCE) {
return true;
} else if (getRequestingUser().isAdmin()) {
return true;
@@ -605,7 +605,7 @@
ReadOnlyUser user = getRequestingUser();
int userId = user.getUid();
- if (user == SuperUser.SUPER_USER) {
+ if (user == SuperUser.INSTANCE) {
return true;
}
@@ -642,7 +642,7 @@
ReadOnlyUser user = getRequestingUser();
int userId = user.getUid();
- if (user == SuperUser.SUPER_USER) {
+ if (user == SuperUser.INSTANCE) {
return true;
}
@@ -693,7 +693,7 @@
ReadOnlyUser user = getRequestingUser();
int userId = user.getUid();
- if (user == SuperUser.SUPER_USER) {
+ if (user == SuperUser.INSTANCE) {
return true;
}
Index: DBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java,v
retrieving revision 1.249
retrieving revision 1.250
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java -u -r1.249 -r1.250
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java
@@ -4124,7 +4124,7 @@
//Default expiration of valid values = 15 minutes
//
long expiration = 60 * 1000 * 15;
- DBObjLimit limit = new DBObjLimit(SuperUser.SUPER_USER);
+ DBObjLimit limit = new DBObjLimit(SuperUser.INSTANCE);
limit.setDataContext(getDataContext());
limit.setField(DBObjLimit.DB_OBJECT_NAME, thisObj.myClassName);
if (limit.find()) {
@@ -4333,7 +4333,7 @@
//Default expiration of valid values = 15 minutes
//
long expiration = 60 * 1000 * 15;
- DBObjLimit limit = new DBObjLimit(SuperUser.SUPER_USER);
+ DBObjLimit limit = new DBObjLimit(SuperUser.INSTANCE);
limit.setField("DBObjectName", thisObj.myClassName);
if (limit.find()) {
String ttl = limit.getField("TTL");
@@ -4877,7 +4877,7 @@
long num = count();
long target = num * ( Integer.parseInt(percent) / 100 );
target = Math.max(50, target);
- DBObjLimit dbl = new DBObjLimit(SuperUser.SUPER_USER);
+ DBObjLimit dbl = new DBObjLimit(SuperUser.INSTANCE);
dbl.setField(DBObjLimit.DB_OBJECT_NAME, getClass().getName());
boolean found = dbl.find();
if (!found) {
@@ -7828,7 +7828,7 @@
* cache limit dbobject.
*/
public void setCacheLimit(int maxNumInstances) throws DBException {
- DBObjLimit dbl = new DBObjLimit(SuperUser.SUPER_USER);
+ DBObjLimit dbl = new DBObjLimit(SuperUser.INSTANCE);
dbl.setField(DBObjLimit.DB_OBJECT_NAME, myClassName);
boolean found = dbl.find();
if ( !found ) {
@@ -7854,7 +7854,7 @@
* to the database table.
*/
public void setCacheLimit(int maxNumInstances, int minutesToLive) throws DBException {
- DBObjLimit dbl = new DBObjLimit(SuperUser.SUPER_USER);
+ DBObjLimit dbl = new DBObjLimit(SuperUser.INSTANCE);
dbl.setField(DBObjLimit.DB_OBJECT_NAME, myClassName);
boolean found = dbl.find();
if ( !found ) {
Index: SecuredDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/SecuredDBObject.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/SecuredDBObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/SecuredDBObject.java -u -r1.63 -r1.64
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/SecuredDBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/SecuredDBObject.java
@@ -158,7 +158,7 @@
/**
* Security Reference.
*/
- private ReadOnlyUser userSecurity = SuperUser.SUPER_USER;
+ private ReadOnlyUser userSecurity = SuperUser.INSTANCE;
/**
@@ -229,7 +229,7 @@
*/
public void setRequestingUid(int newUid) {
if (newUid == SuperUser.SYSTEM_UID) {
- userSecurity = SuperUser.SUPER_USER;
+ userSecurity = SuperUser.INSTANCE;
} else {
try {
User u = new User();
@@ -508,7 +508,7 @@
}
/* User 'SYSTEM' or 'Admin' is always allowed permissions */
- if (userToTest == SuperUser.SUPER_USER) {
+ if (userToTest == SuperUser.INSTANCE) {
if (log.isDebugEnabled()) {
log.debug("User was SYSTEM - permission granted");
}
@@ -936,7 +936,7 @@
ReadOnlyUser user = this.getRequestingUser();
- if (user == SuperUser.SUPER_USER) {
+ if (user == SuperUser.INSTANCE) {
return true;
}
@@ -966,7 +966,7 @@
ReadOnlyUser user = this.getRequestingUser();
- if (user == SuperUser.SUPER_USER) {
+ if (user == SuperUser.INSTANCE) {
return true;
}
@@ -996,7 +996,7 @@
ReadOnlyUser user = this.getRequestingUser();
- if (user == SuperUser.SUPER_USER) {
+ if (user == SuperUser.INSTANCE) {
return true;
}
@@ -1029,7 +1029,7 @@
ReadOnlyUser user = this.getRequestingUser();
- if (user == SuperUser.SUPER_USER) {
+ if (user == SuperUser.INSTANCE) {
return true;
}
Index: DBSequence.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBSequence.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBSequence.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBSequence.java -u -r1.19 -r1.20
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBSequence.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBSequence.java
@@ -144,6 +144,12 @@
} /* DBSequence(DBConnection) */
+ /**
+ *
+ * @param uid int
+ * @throws DBException
+ * @deprecated Since Expresso 5.7 Use <tt>ReadOnlyUser</tt>-based constructor instead.
+ */
public DBSequence(int uid)
throws DBException {
super(uid);
Index: Job.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java -u -r1.38 -r1.39
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java
@@ -656,7 +656,7 @@
protected boolean hasParameters()
throws DBException {
if (m_jobParamsNum == -1) {
- JobQueueParam jqp = new JobQueueParam(SuperUser.SUPER_USER);
+ JobQueueParam jqp = new JobQueueParam(SuperUser.INSTANCE);
jqp.setDataContext(getDataContext());
jqp.setField(JobQueueParam.FLD_JOB_NUMBER, getJobNumber());
m_jobParamsEntries = jqp.searchAndRetrieveList();
Index: Log.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/Log.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/Log.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/Log.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/Log.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/Log.java
@@ -152,7 +152,7 @@
if (checkLog()) {
myConnection = myPool.getConnection(myName);
- LogEntry myLog = new LogEntry(SuperUser.SUPER_USER);
+ LogEntry myLog = new LogEntry(SuperUser.INSTANCE);
myConnection.executeUpdate("DELETE FROM " +
myLog.getJDBCMetaData().getTargetSQLTable(myLog.getDataContext()));
} else {
@@ -213,7 +213,7 @@
try {
myConnection = myPool.getConnection(myName);
- LogEntry myLog = new LogEntry(SuperUser.SUPER_USER);
+ LogEntry myLog = new LogEntry(SuperUser.INSTANCE);
myLog.setField("MessageText", msg);
myLog.setField("MessageLevel", "" + newLevel);
myLog.add();
@@ -259,7 +259,7 @@
try {
myConnection = myPool.getConnection(myName);
- LogEntry myLog = new LogEntry(SuperUser.SUPER_USER);
+ LogEntry myLog = new LogEntry(SuperUser.INSTANCE);
myLog.setField("ObjectName", objectName);
myLog.setField("MessageText", msg);
myLog.setField("MessageLevel", "" + newLevel);
@@ -307,7 +307,7 @@
try {
myConnection = myPool.getConnection(myName);
- LogEntry myLog = new LogEntry(SuperUser.SUPER_USER);
+ LogEntry myLog = new LogEntry(SuperUser.INSTANCE);
myLog.setField("ObjectName", objectName);
myLog.setField("MessageText", msg);
myLog.setField("MessageColor", encode(color));
@@ -359,7 +359,7 @@
try {
myConnection = myPool.getConnection(myName);
- LogEntry myLog = new LogEntry(SuperUser.SUPER_USER);
+ LogEntry myLog = new LogEntry(SuperUser.INSTANCE);
myLog.setField("ObjectName", objectName);
myLog.setField("MessageText", msg);
myLog.setField("MessageColor", encode(color));
@@ -412,7 +412,7 @@
try {
myConnection = myPool.getConnection(myName);
- LogEntry myLog = new LogEntry(SuperUser.SUPER_USER);
+ LogEntry myLog = new LogEntry(SuperUser.INSTANCE);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
e.printStackTrace(new PrintStream(bos));
myLog.setField("MessageText", bos.toString());
@@ -471,7 +471,7 @@
try {
myConnection = myPool.getConnection(myName);
- LogEntry myLog = new LogEntry(SuperUser.SUPER_USER);
+ LogEntry myLog = new LogEntry(SuperUser.INSTANCE);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
e.printStackTrace(new PrintStream(bos));
myLog.setField("MessageText", bos.toString());
Index: RecordPaginator.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/RecordPaginator.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/RecordPaginator.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/RecordPaginator.java -u -r1.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/RecordPaginator.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/RecordPaginator.java
@@ -378,7 +378,7 @@
throws DBException {
/* Now see if there is a "page limit" for this object */
- DBObjLimit dl = new DBObjLimit(SuperUser.SUPER_USER);
+ DBObjLimit dl = new DBObjLimit(SuperUser.INSTANCE);
dl.setDataContext(dbObj.getDataContext());
dl.setField("DBObjectName", ((Object) dbObj).getClass().getName());
@@ -428,7 +428,7 @@
throws DBException {
/* Now see if there is a "page limit" for this object */
- DBObjLimit dl = new DBObjLimit(SuperUser.SUPER_USER);
+ DBObjLimit dl = new DBObjLimit(SuperUser.INSTANCE);
dl.setDataContext(dbObj.getDataContext());
dl.setField("DBObjectName", ((Object) dbObj).getClass().getName());
Index: ConfigManager.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java,v
retrieving revision 1.85
retrieving revision 1.86
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java -u -r1.85 -r1.86
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java
@@ -463,11 +463,11 @@
//We set it as a superuser instance for initialization purposes
//only. Once the first requests come through, we initialize it
//through the Filter.
- new MutableRequestRegistry(oneDBName, SuperUser.SUPER_USER);
+ new MutableRequestRegistry(oneDBName, SuperUser.INSTANCE);
if (oneContext.hasSetupTables()) {
try {
- SchemaList sl = new SchemaList(SuperUser.SUPER_USER);
+ SchemaList sl = new SchemaList(SuperUser.INSTANCE);
sl.setDataContext(oneDBName);
sl.count(); /** count in order to see if table is ok **/
} catch (DBException e) {
@@ -484,7 +484,7 @@
expressoInitialized = true;
}
- SchemaList sl = new SchemaList(SuperUser.SUPER_USER);
+ SchemaList sl = new SchemaList(SuperUser.INSTANCE);
sl.setDataContext(oneDBName);
ArrayList al = sl.searchAndRetrieveList();
@@ -1271,10 +1271,10 @@
//We set it as a superuser instance for initialization purposes
//only. Once the first requests come through, we initialize it
//through the Filter.
- new MutableRequestRegistry(oneKey, SuperUser.SUPER_USER);
+ new MutableRequestRegistry(oneKey, SuperUser.INSTANCE);
try {
- SchemaList sl = new SchemaList(SuperUser.SUPER_USER);
+ SchemaList sl = new SchemaList(SuperUser.INSTANCE);
sl.setDataContext(oneKey);
sl.count();
} catch (DBException e) {
Index: RequestRegistryFilter.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/registry/RequestRegistryFilter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/registry/RequestRegistryFilter.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/registry/RequestRegistryFilter.java -u -r1.8 -r1.9
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/registry/RequestRegistryFilter.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/registry/RequestRegistryFilter.java
@@ -121,7 +121,7 @@
try {
HttpServletRequest req = (HttpServletRequest) request;
RequestRegistry superUserSettings =
- new MutableRequestRegistry("default", SuperUser.SUPER_USER);
+ new MutableRequestRegistry("default", SuperUser.INSTANCE);
CurrentLogin cl;
User u;
try {
@@ -141,7 +141,7 @@
} catch (DBException ex1) {
//We have a potential situation where the User
//table might not exist yet.
- DataObject dao = new DefaultUserInfo(SuperUser.SUPER_USER);
+ DataObject dao = new DefaultUserInfo(SuperUser.INSTANCE);
dao.setDataContext(cl.getDBName());
try {
dao.count();
Index: User.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java -u -r1.57 -r1.58
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java
@@ -669,10 +669,10 @@
if (myUserInfo instanceof Securable) {
try {
//Normally this needs to be a superuser object.
- ((Securable) myUserInfo).setRequestingUser(SuperUser.SUPER_USER);
+ ((Securable) myUserInfo).setRequestingUser(SuperUser.INSTANCE);
} catch (IllegalStateException ex) {
log.error("Error accessing request registry. Creating new request registry.", ex);
- new MutableRequestRegistry("default", SuperUser.SUPER_USER);
+ new MutableRequestRegistry("default", SuperUser.INSTANCE);
}
}
@@ -886,7 +886,7 @@
public void postLogin()
throws DBException, LogException {
UserInfo myInfo = getUserInfo();
- UserGroup oneGroup = new UserGroup(SuperUser.SUPER_USER);
+ UserGroup oneGroup = new UserGroup(SuperUser.INSTANCE);
oneGroup.setDataContext(getDataContext());
String theEvent = null;
@@ -1427,6 +1427,38 @@
throw new DBException("cannot find user: " + uid);
}
return user;
+ }
+
+
+ /**
+ * Factory method that creates a user given the login name. Searches
+ * the current database set by the request registry.
+ * @param login String the login name.
+ * @return User instance.
+ * @throws DBException if unable to locate the given user.
+ */
+ public static User getUserFromLogin(final String login) throws DBException {
+ String dbname = getDataContextFromRegistry();
+ return getUserFromLogin(login,dbname);
+ }
+
+ /**
+ * Factory method that creates a user given the login name.
+ * @param login String the login name.
+ * @param dataContext The datacontext to use for the user searches.
+ * @return User instance.
+ * @throws DBException if unable to locate the given user.
+ */
+ public static User getUserFromLogin(final String login, final String dataContext) throws DBException {
+ User user = new User();
+ user.setDataContext(dataContext);
+ user.setLoginName(login);
+ if (!user.find()) {
+ throw new DBException("cannot find user: " + login);
+ }
+
+ return user;
+
}
/**
Index: SuperUser.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/SuperUser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/SuperUser.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/SuperUser.java -u -r1.5 -r1.6
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/SuperUser.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/SuperUser.java
@@ -77,11 +77,11 @@
final public class SuperUser extends User {
/**
- * The one and only instance of the super user. You can check for SUPER_USER
+ * The one and only instance of the super user. You can check for INSTANCE
* by comparing object references instead of per field checks. ie:
- * <tt>User myUser .... <br/>if (myUser == SuperUser.SUPER_USER){} </tt>
+ * <tt>User myUser .... <br/>if (myUser == SuperUser.INSTANCE){} </tt>
*/
- public static final User SUPER_USER;
+ public static final User INSTANCE;
/**
* The System Uid. Used to be Securable.SYSTEM_ACCOUNT
@@ -98,15 +98,15 @@
static {
try {
- SUPER_USER = new User(new MapBasedUserInfo());
- SUPER_USER.setDBName("default");
- SUPER_USER.setUid(SYSTEM_UID);
- SUPER_USER.setLoginName("$NONE$");
+ INSTANCE = new User(new MapBasedUserInfo());
+ INSTANCE.setDBName("default");
+ INSTANCE.setUid(SYSTEM_UID);
+ INSTANCE.setLoginName("$NONE$");
//We need to do this JUST IN CASE somebody tries to log
//in with it.
- SUPER_USER.setAccountStatus(User.INACTIVE_ACCOUNT_STATUS);
- SUPER_USER.setDisplayName("System Account");
- SUPER_USER.setEmail("noname at example.org");
+ INSTANCE.setAccountStatus(User.INACTIVE_ACCOUNT_STATUS);
+ INSTANCE.setDisplayName("System Account");
+ INSTANCE.setEmail("noname at example.org");
} catch (DBException ex) {
throw new RuntimeException("Error setting up super user");
}
Index: StdServlet.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/StdServlet.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/StdServlet.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/StdServlet.java -u -r1.18 -r1.19
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/StdServlet.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/StdServlet.java
@@ -278,7 +278,7 @@
if (!ConfigManager.isInitialized()) {
// establish a threadlocal superuser status for initialization
- new MutableRequestRegistry(DBConnection.DEFAULT_DB_CONTEXT_NAME, SuperUser.SUPER_USER);
+ new MutableRequestRegistry(DBConnection.DEFAULT_DB_CONTEXT_NAME, SuperUser.INSTANCE);
ConfigManager.config(sc);
}
Index: CheckLogin.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/CheckLogin.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/CheckLogin.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/CheckLogin.java -u -r1.27 -r1.28
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/CheckLogin.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/CheckLogin.java
@@ -234,7 +234,7 @@
//Establish a superuser request registry for this request that will
//then be established as other identities.
- new MutableRequestRegistry("default", SuperUser.SUPER_USER);
+ new MutableRequestRegistry("default", SuperUser.INSTANCE);
if (SystemMacros.getInstance().getServerPrefix() == null) {
SystemMacros.getInstance().setServerPrefix(request.getServerName()
Index: DefaultViewHandler.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/viewhandler/DefaultViewHandler.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/viewhandler/DefaultViewHandler.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/viewhandler/DefaultViewHandler.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/viewhandler/DefaultViewHandler.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/servlet/viewhandler/DefaultViewHandler.java
@@ -64,6 +64,15 @@
package com.jcorporate.expresso.core.servlet.viewhandler;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import com.jcorporate.expresso.core.controller.Block;
import com.jcorporate.expresso.core.controller.ControllerElement;
import com.jcorporate.expresso.core.controller.ControllerException;
@@ -102,15 +111,6 @@
import org.apache.log4j.Logger;
import org.apache.struts.action.ActionMessage;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-
/**
* ViewHandler designed to generate a default view in HTML when no other view is specified
@@ -443,7 +443,7 @@
}
/* if the input is multi-valued, use a drop-down list */
- Vector validValues = i.getValidValues();
+ List validValues = i.getValidValuesList();
ValidValue oneValue = null;
if (validValues != null && !validValues.isEmpty()) {
@@ -451,9 +451,9 @@
i.getAttributes().containsKey("radio-vertical")) {
Radio radio = new Radio(i.getName(), defaultValue);
- for (Enumeration vv = validValues.elements();
- vv.hasMoreElements();) {
- ValidValue v = (ValidValue) vv.nextElement();
+ for (Iterator vv = validValues.iterator();
+ vv.hasNext();) {
+ ValidValue v = (ValidValue) vv.next();
radio.addOption(v.getValue(), v.getDescription());
}
if (i.getAttributes().containsKey("radio-vertical")) {
@@ -465,9 +465,9 @@
i.getAttributes().containsKey("checkbox-vertical")) {
CheckBox check = new CheckBox(i.getName(), defaultValue);
- for (Enumeration vv = validValues.elements();
- vv.hasMoreElements();) {
- ValidValue v = (ValidValue) vv.nextElement();
+ for (Iterator vv = validValues.iterator();
+ vv.hasNext();) {
+ ValidValue v = (ValidValue) vv.next();
check.addOption(v.getValue(), v.getDescription());
}
@@ -479,9 +479,9 @@
} else {
DropDown d = new DropDown(i.getName());
- for (Enumeration vv = validValues.elements();
- vv.hasMoreElements();) {
- oneValue = (ValidValue) vv.nextElement();
+ for (Iterator vv = validValues.iterator();
+ vv.hasNext();) {
+ oneValue = (ValidValue) vv.next();
d.addOption(oneValue.getValue(), oneValue.getDescription());
}
@@ -808,4 +808,4 @@
} /* addBlock(ControllerResponse, myPage, thisBlock) */
-}
\ No newline at end of file
+}
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.18
retrieving revision 1.19
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.18 -r1.19
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/ControllerRun.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/ControllerRun.java
@@ -108,6 +108,8 @@
import java.util.StringTokenizer;
import java.util.Vector;
import com.jcorporate.expresso.core.db.*;
+import java.util.List;
+import java.util.Iterator;
/**
@@ -208,15 +210,15 @@
}
/* if the input is multi-valued, use a drop-down list */
- Vector validValues = i.getValidValues();
+ List validValues = i.getValidValuesList();
ValidValue oneValue = null;
if (validValues != null) {
DropDown d = new DropDown(i.getName());
- for (Enumeration vv = validValues.elements();
- vv.hasMoreElements();) {
- oneValue = (ValidValue) vv.nextElement();
+ for (Iterator vv = validValues.iterator();
+ vv.hasNext();) {
+ oneValue = (ValidValue) vv.next();
d.addOption(oneValue.getValue(), oneValue.getDescription());
}
@@ -323,11 +325,11 @@
System.out.println(" " + i.getName());
ValidValue oneValue = null;
- Vector v = i.getValidValues();
+ List v = i.getValidValuesList();
if (v != null) {
- for (Enumeration e = v.elements(); e.hasMoreElements();) {
- oneValue = (ValidValue) e.nextElement();
+ for (Iterator e = v.iterator(); e.hasNext();) {
+ oneValue = (ValidValue) e.next();
System.out.println(" " + oneValue.getValue() + "/" +
oneValue.getDescription());
}
@@ -520,7 +522,7 @@
//call the LoadLists method and load up the lists used by this application
String dbName = (String) commandArgs.get("db");
new MutableRequestRegistry(dbName,
- SuperUser.SUPER_USER);
+ SuperUser.INSTANCE);
String conName = (String) commandArgs.get("controller");
System.out.println("Running Controller " + conName);
Index: DBTool.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java -u -r1.60 -r1.61
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java
@@ -639,7 +639,7 @@
try {
//First remove the schema entries
- SchemaList schemaEntry = new SchemaList(SuperUser.SUPER_USER);
+ SchemaList schemaEntry = new SchemaList(SuperUser.INSTANCE);
schemaEntry.setDataContext(dbName);
schemaEntry.setField("SchemaClass", schemaName);
schemaEntry.delete();
@@ -648,7 +648,7 @@
}
//Now remove the setup values
- Setup setupList = new Setup(SuperUser.SUPER_USER);
+ Setup setupList = new Setup(SuperUser.INSTANCE);
setupList.setDataContext(dbName);
setupList.setField("SchemaClass", schemaName);
@@ -1333,7 +1333,7 @@
ExpressoSchema jcs = new ExpressoSchema();
allSchemas.addElement(jcs);
- SchemaList sl = new SchemaList(SuperUser.SUPER_USER);
+ SchemaList sl = new SchemaList(SuperUser.INSTANCE);
List list = sl.searchAndRetrieveList();
for (Iterator iterator = list.iterator(); iterator.hasNext();) {
SchemaList oneSchema = (SchemaList) iterator.next();
@@ -1539,7 +1539,7 @@
//Set the permission of the request context.
new MutableRequestRegistry(dbName,
- SuperUser.SUPER_USER);
+ SuperUser.INSTANCE);
String setup = (String) commandArgs.get("setup");
String schemaClass = (String) commandArgs.get("register");
@@ -1834,7 +1834,7 @@
boolean noOtherSchemas = true;
try {
- sl = new SchemaList(SuperUser.SUPER_USER);
+ sl = new SchemaList(SuperUser.INSTANCE);
sl.setDataContext(dbName);
if (sl.count() > 0) {
@@ -1902,7 +1902,7 @@
ExpressoSchema jcs = new ExpressoSchema();
allSchemas.addElement(jcs);
- SchemaList sl = new SchemaList(SuperUser.SUPER_USER);
+ SchemaList sl = new SchemaList(SuperUser.INSTANCE);
List list = sl.searchAndRetrieveList();
@@ -2017,7 +2017,7 @@
theLog.info(Messages.getString("Creating_Tables_for_databa") + " '" + dataContext + "'");
- RequestRegistry.superUser(SuperUser.SUPER_USER);
+ RequestRegistry.superUser(SuperUser.INSTANCE);
try {
TableCreator tc = TableCreator.getInstance();
@@ -2071,7 +2071,7 @@
String dbName)
throws DBException {
Schema oneSchema = null;
- RequestRegistry.superUser(SuperUser.SUPER_USER);
+ RequestRegistry.superUser(SuperUser.INSTANCE);
try {
for (Enumeration e = allSchemas.elements(); e.hasMoreElements(); ) {
oneSchema = (Schema) e.nextElement();
@@ -2117,7 +2117,7 @@
Schema oneSchema = null;
Vector errors = new Vector();
- RequestRegistry.superUser(SuperUser.SUPER_USER);
+ RequestRegistry.superUser(SuperUser.INSTANCE);
try {
for (Enumeration e = allSchemas.elements(); e.hasMoreElements(); ) {
oneSchema = (Schema) e.nextElement();
@@ -2136,7 +2136,7 @@
//
//Setup cache settings for all the dbobjects.
//
- DBObjLimit cacheSettings = new DBObjLimit(Securable.SYSTEM_ACCOUNT);
+ DBObjLimit cacheSettings = new DBObjLimit(SuperUser.INSTANCE);
cacheSettings.setDataContext(dbName);
for (Enumeration dbobjects = oneSchema.getMembers(); dbobjects.hasMoreElements(); ) {
DBObject oneObj = (DBObject) dbobjects.nextElement();
@@ -2188,7 +2188,7 @@
Setup oneSetup = null;
Setup findSetup = null;
- RequestRegistry.superUser(SuperUser.SUPER_USER);
+ RequestRegistry.superUser(SuperUser.INSTANCE);
try {
for (Enumeration e = allSchemas.elements(); e.hasMoreElements(); ) {
oneSchema = (Schema) e.nextElement();
@@ -2240,7 +2240,7 @@
Vector allSchemas,
String dbName)
throws DBException {
- RequestRegistry.superUser(SuperUser.SUPER_USER);
+ RequestRegistry.superUser(SuperUser.INSTANCE);
try {
/* Group 'Everybody' */
@@ -2551,7 +2551,7 @@
/* for every object in the schema */
Controller con;
- ControllerSecurity oneControllerSecurity = new ControllerSecurity(SuperUser.SUPER_USER);
+ ControllerSecurity oneControllerSecurity = new ControllerSecurity(SuperUser.INSTANCE);
oneControllerSecurity.setDataContext(dbName);
//
@@ -2681,7 +2681,7 @@
//Set up the default Job security
//
Job j;
- JobSecurity oneJobSecurity = new JobSecurity(SuperUser.SUPER_USER); //$NON-NLS-1$
+ JobSecurity oneJobSecurity = new JobSecurity(SuperUser.INSTANCE); //$NON-NLS-1$
oneJobSecurity.setDataContext(dbName);
for (Enumeration ej = oneSchema.getJobs(); ej.hasMoreElements(); ) {
Index: JobHandler.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/JobHandler.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/JobHandler.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/JobHandler.java -u -r1.37 -r1.38
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/JobHandler.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/JobHandler.java
@@ -354,7 +354,7 @@
*/
public static void resetQ(String dbName) throws DBException {
// reset JobQueue
- JobQueue jql = new JobQueue(SuperUser.SUPER_USER);
+ JobQueue jql = new JobQueue(SuperUser.INSTANCE);
jql.setDataContext(dbName);
jql.setField("StatusCode", JobQueue.JOB_STATUS_RUNNING);
@@ -368,7 +368,7 @@
}
// reset ControlQ
- JobHandlerControl jhc = new JobHandlerControl(SuperUser.SUPER_USER);
+ JobHandlerControl jhc = new JobHandlerControl(SuperUser.INSTANCE);
jhc.setDataContext(dbName);
jhc.setField(JobHandlerControl.FLD_STATUS_CODE,
JobHandlerControl.JOB_STATUS_RUNNING);
@@ -472,7 +472,7 @@
//Set the default statuses for this thread to superuser
//and the context specified.
- new MutableRequestRegistry(dbName, SuperUser.SUPER_USER);
+ new MutableRequestRegistry(dbName, SuperUser.INSTANCE);
try {
resetCurrentJobs();
@@ -528,7 +528,7 @@
*/
protected synchronized void resetCurrentJobs() throws DBException {
/* Reset any current jobs */
- JobQueue jql = new JobQueue(SuperUser.SUPER_USER);
+ JobQueue jql = new JobQueue(SuperUser.INSTANCE);
jql.setDataContext(getDataContext());
try {
@@ -772,7 +772,7 @@
}
try {
- JobQueue myQueueList = new JobQueue(SuperUser.SUPER_USER);
+ JobQueue myQueueList = new JobQueue(SuperUser.INSTANCE);
myQueueList.setDataContext(getDataContext());
JobQueue oneQueueEntry = null;
Index: QueueJob.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/QueueJob.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/QueueJob.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/QueueJob.java -u -r1.14 -r1.15
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/QueueJob.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/QueueJob.java
@@ -209,7 +209,7 @@
*/
public void queueJob(Hashtable args)
throws DBException {
- JobQueue myQueue = new JobQueue(SuperUser.SUPER_USER);
+ JobQueue myQueue = new JobQueue(SuperUser.INSTANCE);
myQueue.setDataContext((String) args.get("db"));
myQueue.setField("ExpUid", (String) args.get("uid"));
myQueue.setField("JobCode", (String) args.get("job"));
@@ -217,7 +217,7 @@
myQueue.add();
/* parameters */
- JobQueueParam myParam = new JobQueueParam(SuperUser.SUPER_USER);
+ JobQueueParam myParam = new JobQueueParam(SuperUser.INSTANCE);
myParam.setDataContext((String) args.get("db"));
myParam.setField("JobNumber", myQueue.getField("JobNumber"));
Index: DBToolTests.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBToolTests.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBToolTests.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBToolTests.java -u -r1.22 -r1.23
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBToolTests.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBToolTests.java
@@ -72,9 +72,6 @@
import java.util.Enumeration;
import java.util.TreeSet;
import java.util.Vector;
-
-import junit.framework.TestSuite;
-
import com.jcorporate.expresso.core.db.DBConnection;
import com.jcorporate.expresso.core.db.DBConnectionPool;
import com.jcorporate.expresso.core.db.DBException;
@@ -89,6 +86,7 @@
import com.jcorporate.expresso.services.test.ExpressoTestCase;
import com.jcorporate.expresso.services.test.SchemaDeleter;
import com.jcorporate.expresso.services.test.TestSystemInitializer;
+import junit.framework.TestSuite;
/**
@@ -192,7 +190,7 @@
Schema s = (Schema) e.nextElement();
if (!s.getClass().getName().equals("com.jcorporate.expresso.core.ExpressoSchema")) {
- SchemaList sl = new SchemaList(SuperUser.SUPER_USER);
+ SchemaList sl = new SchemaList(SuperUser.INSTANCE);
sl.setDataContext(TestSystemInitializer.getTestContext());
sl.setField("SchemaClass", s.getClass().getName());
sl.setField("Descrip", s.getDefaultDescription());
Index: ReportServer.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ReportServer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ReportServer.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ReportServer.java -u -r1.6 -r1.7
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ReportServer.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ReportServer.java
@@ -88,6 +88,9 @@
import com.jcorporate.expresso.ext.report.ReportException;
import com.jcorporate.expresso.kernel.util.ClassLocator;
import com.jcorporate.expresso.services.dbobj.SchemaList;
+import java.util.List;
+import java.util.Arrays;
+import java.util.ArrayList;
/**
@@ -269,11 +272,11 @@
chooseSchema.setLabel("Choose Schema");
chooseSchema.setName("SchemaClass");
- Vector v2 = new Vector(2);
- v2.addElement(new ValidValue("com.jcorporate.expresso." +
+ List v2 = new ArrayList(2);
+ v2.add(new ValidValue("com.jcorporate.expresso." +
"core.ExpressoSchema", "General"));
- SchemaList sl = new SchemaList(SuperUser.SUPER_USER);
+ SchemaList sl = new SchemaList(SuperUser.INSTANCE);
sl.setDataContext(request.getDataContext());
SchemaList oneSchema = null;
@@ -281,7 +284,7 @@
for (Iterator e = sl.searchAndRetrieveList("Descrip").iterator();
e.hasNext();) {
oneSchema = (SchemaList) e.next();
- v2.addElement(new ValidValue(oneSchema.getField("SchemaClass"),
+ v2.add(new ValidValue(oneSchema.getField("SchemaClass"),
oneSchema.getField("Descrip")));
}
@@ -320,7 +323,7 @@
try {
//Check that the schema is indeed installed.
- SchemaList mySchema = new SchemaList(SuperUser.SUPER_USER);
+ SchemaList mySchema = new SchemaList(SuperUser.INSTANCE);
mySchema.setDataContext(request.getDataContext());
String schemaClass = com.jcorporate.expresso.core.ExpressoSchema.class.getName();
@@ -359,7 +362,7 @@
return;
}
- Vector vv = new Vector(v.size());
+ List vv = new ArrayList(v.size());
for (Iterator i = v.iterator(); i.hasNext();) {
ExpressoReport oneReport = (ExpressoReport) i.next();
@@ -441,7 +444,7 @@
java.util.List l = ((MultiFormatReport) report).getReportFormats();
Input reportFormats = new Input("ReportFormat",
"Select Output Format");
- reportFormats.setValidValues(new Vector(l));
+ reportFormats.setValidValues(new ArrayList(0));
}
Transition t = new Transition("prompt", "Start Again",
Index: DataTransfer.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/DataTransfer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/DataTransfer.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/DataTransfer.java -u -r1.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/DataTransfer.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/DataTransfer.java
@@ -64,12 +64,11 @@
package com.jcorporate.expresso.ext.controller;
+import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Iterator;
+import java.util.List;
import java.util.Vector;
-
-import org.apache.log4j.Logger;
-
import com.jcorporate.expresso.core.controller.ControllerException;
import com.jcorporate.expresso.core.controller.ControllerRequest;
import com.jcorporate.expresso.core.controller.ControllerResponse;
@@ -89,6 +88,7 @@
import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.services.dbobj.SchemaList;
+import org.apache.log4j.Logger;
/**
@@ -130,11 +130,11 @@
chooseSchema.setLabel("Choose Schema");
chooseSchema.setName("SchemaClass");
- Vector v2 = new Vector(2);
- v2.addElement(new ValidValue("com.jcorporate.expresso." + "core.ExpressoSchema",
+ List v2 = new ArrayList(2);
+ v2.add(new ValidValue("com.jcorporate.expresso." + "core.ExpressoSchema",
"General"));
- SchemaList sl = new SchemaList(SuperUser.SUPER_USER);
+ SchemaList sl = new SchemaList(SuperUser.INSTANCE);
sl.setDataContext(req.getDataContext());
SchemaList oneSchema = null;
@@ -142,7 +142,7 @@
for (Iterator e = sl.searchAndRetrieveList("Descrip").iterator();
e.hasNext();) {
oneSchema = (SchemaList) e.next();
- v2.addElement(new ValidValue(oneSchema.getField("SchemaClass"),
+ v2.add(new ValidValue(oneSchema.getField("SchemaClass"),
oneSchema.getField("Descrip")));
}
@@ -161,8 +161,8 @@
chooseDBobj.setLabel("Choose Database Object");
chooseDBobj.setName("dbobj");
- Vector v2 = new Vector();
- v2.addElement(new ValidValue("All", "All Objects in Schema"));
+ List v2 = new ArrayList();
+ v2.add(new ValidValue("All", "All Objects in Schema"));
DBObject oneDBObject = null;
Schema mySchema = SchemaFactory.getInstance().getSchema(req.getParameter("SchemaClass"));
@@ -174,7 +174,7 @@
for (Enumeration e = mySchema.getMembers(); e.hasMoreElements();) {
oneDBObject = (DBObject) e.nextElement();
- v2.addElement(new ValidValue(oneDBObject.getClass().getName(),
+ v2.add(new ValidValue(oneDBObject.getClass().getName(),
oneDBObject.getMetaData().getDescription()));
}
@@ -191,7 +191,7 @@
String oneConfigKey = null;
String oneDescrip = null;
- Vector v = new Vector();
+ List v = new ArrayList();
for (Enumeration ie = ConfigManager.getAllConfigKeys();
ie.hasMoreElements();) {
@@ -206,7 +206,7 @@
}
/* If it's not an expresso context, you can't log in to it */
if (ConfigManager.getContext(oneConfigKey).hasSetupTables()) {
- v.addElement(new ValidValue(oneConfigKey, oneDescrip));
+ v.add(new ValidValue(oneConfigKey, oneDescrip));
}
} catch (ConfigurationException ce) {
throw new ControllerException(ce);
@@ -219,11 +219,11 @@
res.addInput(toContext);
Input handleDups = new Input("handleDups", "Duplicate Key Handling");
- Vector hdv = new Vector();
- hdv.addElement(new ValidValue("S", "Skip Duplicate Records"));
- hdv.addElement(new ValidValue("R", "Replace Duplicate Records"));
- hdv.addElement(new ValidValue("A", "Add New Records"));
- hdv.addElement(new ValidValue("I", "Insert Records"));
+ List hdv = new ArrayList();
+ hdv.add(new ValidValue("S", "Skip Duplicate Records"));
+ hdv.add(new ValidValue("R", "Replace Duplicate Records"));
+ hdv.add(new ValidValue("A", "Add New Records"));
+ hdv.add(new ValidValue("I", "Insert Records"));
handleDups.setValidValues(hdv);
res.addInput(handleDups);
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.18
retrieving revision 1.19
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.18 -r1.19
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/TestController.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/TestController.java
@@ -109,6 +109,8 @@
import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.services.controller.Registration;
import com.jcorporate.expresso.services.dbobj.SchemaList;
+import java.util.List;
+import java.util.ArrayList;
/**
@@ -733,11 +735,11 @@
chooseSchema.setLabel("Choose Schema");
chooseSchema.setName("SchemaClass");
- Vector v2 = new Vector(2);
- v2.addElement(new ValidValue("com.jcorporate.expresso." + "core.ExpressoSchema",
+ List v2 = new ArrayList(2);
+ v2.add(new ValidValue("com.jcorporate.expresso." + "core.ExpressoSchema",
"General"));
- SchemaList sl = new SchemaList(SuperUser.SUPER_USER);
+ SchemaList sl = new SchemaList(SuperUser.INSTANCE);
sl.setDataContext(params.getDataContext());
SchemaList oneSchema = null;
@@ -745,7 +747,7 @@
for (Iterator e = sl.searchAndRetrieveList("Descrip").iterator();
e.hasNext();) {
oneSchema = (SchemaList) e.next();
- v2.addElement(new ValidValue(oneSchema.getField("SchemaClass"),
+ v2.add(new ValidValue(oneSchema.getField("SchemaClass"),
oneSchema.getField("Descrip")));
}
Index: RunSQL.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/RunSQL.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/RunSQL.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/RunSQL.java -u -r1.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/RunSQL.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/RunSQL.java
@@ -85,6 +85,8 @@
import java.util.Vector;
import com.jcorporate.expresso.core.controller.NonHandleableException;
import java.sql.*;
+import java.util.List;
+import java.util.ArrayList;
/**
* RunSQL allows any arbitrary SQL string to be sent to the database & executed
@@ -131,10 +133,10 @@
style.setLabel("Choose Style Of Results");
style.setName("styleType");
- Vector v2 = new Vector();
- v2.addElement(new ValidValue("", "Default"));
- v2.addElement(new ValidValue("xml", "XML Document"));
- v2.addElement(new ValidValue("excel", "Excel Spreadsheet"));
+ List v2 = new ArrayList();
+ v2.add(new ValidValue("", "Default"));
+ v2.add(new ValidValue("xml", "XML Document"));
+ v2.add(new ValidValue("excel", "Excel Spreadsheet"));
style.setValidValues(v2);
response.addInput(style);
Index: Download.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/Download.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/Download.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/Download.java -u -r1.29 -r1.30
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/Download.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/Download.java
@@ -166,7 +166,7 @@
protected DownloadFiles getThisDownloadFile(ControllerRequest request, User u)
throws ControllerException {
try {
- DownloadFiles thisFile = new DownloadFiles(SuperUser.SUPER_USER);
+ DownloadFiles thisFile = new DownloadFiles(SuperUser.INSTANCE);
thisFile.setDataContext(request.getDataContext());
thisFile.setField("FileNumber", request.getParameter("file"));
@@ -257,7 +257,7 @@
EventHandler.Event(request.getDataContext(), "DOWNLOAD",
eventString, true);
- DownloadLog dll = new DownloadLog(SuperUser.SUPER_USER);
+ DownloadLog dll = new DownloadLog(SuperUser.INSTANCE);
dll.setDataContext(request.getDataContext());
dll.setField("ExpUid", request.getUid());
dll.setField("FileNumber", thisFile.getField("FileNumber"));
@@ -541,7 +541,7 @@
EventHandler.Event(controllerRequest.getDataContext(), "DOWNLOAD",
eventString, true);
- DownloadLog dll = new DownloadLog(SuperUser.SUPER_USER);
+ DownloadLog dll = new DownloadLog(SuperUser.INSTANCE);
dll.setDataContext(controllerRequest.getDataContext());
dll.setField("ExpUid", controllerRequest.getUid());
dll.setField("FileNumber", fileNumber);
@@ -556,7 +556,7 @@
response.setHeader("Content-Type", "application/x-unknown");
} else {
try {
- MimeTypes contentType = new MimeTypes(SuperUser.SUPER_USER);
+ MimeTypes contentType = new MimeTypes(SuperUser.INSTANCE);
contentType.setField("MimeNumber", mimeNumber);
contentType.retrieve();
// response.setContentType(contentType.getField("MimeType"));
Index: ComponentManager.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ComponentManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ComponentManager.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ComponentManager.java -u -r1.20 -r1.21
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ComponentManager.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ComponentManager.java
@@ -468,7 +468,7 @@
boolean noOtherSchemas = true;
try {
- sl = new SchemaList(SuperUser.SUPER_USER);
+ sl = new SchemaList(SuperUser.INSTANCE);
sl.setDataContext(dbContext);
sl.search();
Index: SingleDBUserInfo.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/SingleDBUserInfo.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/SingleDBUserInfo.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/SingleDBUserInfo.java -u -r1.26 -r1.27
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/SingleDBUserInfo.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/SingleDBUserInfo.java
@@ -149,6 +149,7 @@
*
* @param uid the Uid of the user context
* @throws DBException if there's an initialization problem
+ * @deprecated Since Expresso 5.7 use <tt>ReadOnlyUser</tt> constructor instead.
*/
public SingleDBUserInfo(int uid)
throws DBException {
@@ -668,7 +669,7 @@
*/
public void postLogin()
throws DBException, LogException {
- UserGroup oneGroup = new UserGroup(SuperUser.SUPER_USER);
+ UserGroup oneGroup = new UserGroup(SuperUser.INSTANCE);
oneGroup.setDataContext(getDataContext());
String theEvent = null;
Index: PerfTestSetDet.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestSetDet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestSetDet.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestSetDet.java -u -r1.9 -r1.10
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestSetDet.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestSetDet.java
@@ -96,7 +96,8 @@
*
* @param uid the Uid of the user context
* @throws DBException if there's an initialization problem
- */
+ * @deprecated Since Expresso 5.7 use <tt>ReadOnlyUser</tt> constructor instead.
+ */
public PerfTestSetDet(int uid)
throws DBException {
super(uid);
Index: AppIntegration.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/AppIntegration.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/AppIntegration.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/AppIntegration.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/AppIntegration.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/AppIntegration.java
@@ -173,7 +173,7 @@
v2.addElement(new ValidValue("com.jcorporate.expresso.core.ExpressoSchema",
"General"));
- SchemaList sl = new SchemaList(SuperUser.SUPER_USER);
+ SchemaList sl = new SchemaList(SuperUser.INSTANCE);
sl.setDataContext(getDataContext());
SchemaList oneSchema = null;
@@ -187,7 +187,7 @@
return v2;
} else if (fieldName.equals("FromObj") || fieldName.equals("ToObj")) {
- SchemaList myList = new SchemaList(SuperUser.SUPER_USER);
+ SchemaList myList = new SchemaList(SuperUser.INSTANCE);
myList.setDataContext(getDataContext());
SchemaList oneList = null;
Index: DownloadLog.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/DownloadLog.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/DownloadLog.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/DownloadLog.java -u -r1.12 -r1.13
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/DownloadLog.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/DownloadLog.java
@@ -126,7 +126,9 @@
*
* @param uid the Uid of the user context
* @throws DBException if there's an initialization problem
- */
+ * @deprecated since 5.7 use the <tt>ReadOnlyUser</tt> based constructor
+ * instead.
+ */
public DownloadLog(int uid)
throws DBException {
super(uid);
Index: RestrictedCountries.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RestrictedCountries.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RestrictedCountries.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RestrictedCountries.java -u -r1.12 -r1.13
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RestrictedCountries.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RestrictedCountries.java
@@ -118,7 +118,9 @@
*
* @param uid the Uid of the user context
* @throws DBException if there's an initialization problem
- */
+ * @deprecated since 5.7 use the <tt>ReadOnlyUser</tt> based constructor
+ * instead.
+ */
public RestrictedCountries(int uid)
throws DBException {
super(uid);
Index: ISOCountryCodes.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/ISOCountryCodes.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/ISOCountryCodes.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/ISOCountryCodes.java -u -r1.21 -r1.22
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/ISOCountryCodes.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/ISOCountryCodes.java
@@ -146,6 +146,7 @@
*
* @param uid the Uid of the user context
* @throws DBException if there's an initialization problem
+ * @deprecated Since Expresso 5.7 use <tt>ReadOnlyUser</tt> constructor instead.
*/
public ISOCountryCodes(int uid)
throws DBException {
Index: RestrictedOverrides.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RestrictedOverrides.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RestrictedOverrides.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RestrictedOverrides.java -u -r1.13 -r1.14
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RestrictedOverrides.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RestrictedOverrides.java
@@ -136,7 +136,9 @@
*
* @param uid the Uid of the user context
* @throws DBException if there's an initialization problem
- */
+ * @deprecated since 5.7 use the <tt>ReadOnlyUser</tt> based constructor
+ * instead.
+ */
public RestrictedOverrides(int uid)
throws DBException {
super(uid);
Index: RegisteredUser.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RegisteredUser.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RegisteredUser.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RegisteredUser.java -u -r1.27 -r1.28
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RegisteredUser.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RegisteredUser.java
@@ -78,6 +78,7 @@
import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.core.security.User;
import com.jcorporate.expresso.kernel.util.FastStringBuffer;
+import com.jcorporate.expresso.core.security.ReadOnlyUser;
/**
* Extention to the normal user object to record some additional information
@@ -110,6 +111,7 @@
*
* @param uid the Uid of the user context
* @throws DBException if there's an initialization problem
+ * @deprecated Since Expresso 5.7 use <tt>ReadOnlyUser</tt> constructor instead.
*/
public RegisteredUser(int uid)
throws DBException {
@@ -117,6 +119,18 @@
}
/**
+ * Constructs this data object using the specified user security
+ * context. You can often get this parameter using the <tt>RequestRegistry</tt>
+ * objects. Use this constructor instead of the old integer uid constructor
+ * since ultimately it results in performance gains for the application.
+ * @param userSecuityContext ReadOnlyUser user security credentials.
+ * @throws DBException upon construction error.
+ */
+ public RegisteredUser(final ReadOnlyUser userSecuityContext) throws DBException {
+ super(userSecuityContext);
+ }
+
+ /**
* For using DBObjects within Controllers. Initializes based upon the current
* user and the requested db. [Of course this can be modified later]
*
@@ -271,7 +285,7 @@
return h;
} else if (fieldName.equals("Country")) {
- ISOCountryCodes countries = new ISOCountryCodes(SuperUser.SUPER_USER);
+ ISOCountryCodes countries = new ISOCountryCodes(SuperUser.INSTANCE);
countries.setDataContext(this.getDataContext());
Vector v = countries.getValues();
return v;
Index: DownloadFiles.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/DownloadFiles.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/DownloadFiles.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/DownloadFiles.java -u -r1.20 -r1.21
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/DownloadFiles.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/DownloadFiles.java
@@ -117,7 +117,9 @@
*
* @param uid the Uid of the user context
* @throws DBException if there's an initialization problem
- */
+ * @deprecated since 5.7 use the <tt>ReadOnlyUser</tt> based constructor
+ * instead.
+ */
public DownloadFiles(int uid)
throws DBException {
super(uid);
@@ -233,7 +235,7 @@
* @throws DBException upon error.
*/
private void setMimeAsUnknown() throws DBException {
- MimeTypes mt = new MimeTypes(SuperUser.SUPER_USER);
+ MimeTypes mt = new MimeTypes(SuperUser.INSTANCE);
mt.set(MimeTypes.FLD_MIMETYPE, "application/unknown");
if (!mt.find()) {
throw new DBException("Unable to determine mime type of: " +
Index: PerfTests.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTests.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTests.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTests.java -u -r1.16 -r1.17
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTests.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTests.java
@@ -118,7 +118,9 @@
*
* @param uid the Uid of the user context
* @throws DBException if there's an initialization problem
- */
+ * @deprecated since 5.7 use the <tt>ReadOnlyUser</tt> based constructor
+ * instead.
+ */
public PerfTests(int uid)
throws DBException {
super(uid);
Index: PerfTestStat.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestStat.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestStat.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestStat.java -u -r1.8 -r1.9
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestStat.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestStat.java
@@ -92,7 +92,8 @@
*
* @param the Uid of the user context
* @throws DBException if there's an initialization problem
- */
+ * @deprecated Since Expresso 5.7 use <tt>ReadOnlyUser</tt> constructor instead.
+ */
public PerfTestStat(int uid)
throws DBException {
super(uid);
Index: PerfTestSet.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestSet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestSet.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestSet.java -u -r1.10 -r1.11
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestSet.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/PerfTestSet.java
@@ -96,7 +96,9 @@
*
* @param uid the Uid of the user context
* @throws DBException if there's an initialization problem
- */
+ * @deprecated since 5.7 use the <tt>ReadOnlyUser</tt> based constructor
+ * instead.
+ */
public PerfTestSet(int uid)
throws DBException {
super(uid);
Index: ReverseLookupDomains.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/ReverseLookupDomains.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/ReverseLookupDomains.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/ReverseLookupDomains.java -u -r1.12 -r1.13
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/ReverseLookupDomains.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/ReverseLookupDomains.java
@@ -122,7 +122,8 @@
*
* @param uid the Uid of the user context
* @throws DBException if there's an initialization problem
- */
+ * @deprecated Since Expresso 5.7 use <tt>ReadOnlyUser</tt> constructor instead.
+ */
public ReverseLookupDomains(int uid)
throws DBException {
super(uid);
@@ -287,4 +288,4 @@
" in your security manager", se);
}
}
-}
\ No newline at end of file
+}
Index: Phone.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Phone.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Phone.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Phone.java -u -r1.18 -r1.19
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Phone.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Phone.java
@@ -72,6 +72,7 @@
import com.jcorporate.expresso.services.dbobj.RegistrationDBObject;
import java.util.Vector;
+import com.jcorporate.expresso.core.security.ReadOnlyUser;
/**
@@ -114,6 +115,7 @@
*
* @param uid the Uid of the user context
* @throws DBException if there's an initialization problem
+ * @deprecated Since Expresso 5.7 use <tt>ReadOnlyUser</tt> constructor instead.
*/
public Phone(int uid)
throws DBException {
@@ -121,6 +123,17 @@
}
/**
+ * Constructs this data object using the specified user security
+ * context. You can often get this parameter using the <tt>RequestRegistry</tt>
+ * objects. Use this constructor instead of the old integer uid constructor
+ * since ultimately it results in performance gains for the application.
+ * @param userSecuityContext ReadOnlyUser user security credentials.
+ * @throws DBException upon construction error.
+ */
+ public Phone(final ReadOnlyUser userSecuityContext) throws DBException {
+ super(userSecuityContext);
+ }
+ /**
* For using DBObjects within Controllers. Initializes based upon the current
* user and the requested db. [Of course this can be modified later]
*
@@ -210,4 +223,4 @@
} /* PersonalData */
-/* PersonalData */
\ No newline at end of file
+/* PersonalData */
Index: Address.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Address.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Address.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Address.java -u -r1.16 -r1.17
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Address.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Address.java
@@ -69,6 +69,7 @@
import com.jcorporate.expresso.core.dbobj.RequestContext;
import com.jcorporate.expresso.core.misc.DateTime;
import com.jcorporate.expresso.services.dbobj.RegistrationDBObject;
+import com.jcorporate.expresso.core.security.ReadOnlyUser;
/**
* Creation date: 2001-08-24 11:57:54
@@ -106,12 +107,24 @@
*
* @param uid the Uid of the user context
* @throws DBException if there's an initialization problem
+ * @deprecated Since Expresso 5.7 use <tt>ReadOnlyUser</tt> constructor instead.
*/
public Address(int uid) throws DBException {
super(uid);
}
/**
+ * Constructs this data object using the specified user security
+ * context. You can often get this parameter using the <tt>RequestRegistry</tt>
+ * objects. Use this constructor instead of the old integer uid constructor
+ * since ultimately it results in performance gains for the application.
+ * @param userSecuityContext ReadOnlyUser user security credentials.
+ * @throws DBException upon construction error.
+ */
+ public Address(final ReadOnlyUser userSecuityContext) throws DBException {
+ super(userSecuityContext);
+ }
+ /**
* For using DBObjects within Controllers. Initializes based upon the current
* user and the requested db. [Of course this can be modified later]
*
@@ -177,4 +190,4 @@
super.update();
} /* update() */
-} /* PersonalData */
\ No newline at end of file
+} /* PersonalData */
Index: Person.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Person.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Person.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Person.java -u -r1.11 -r1.12
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Person.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Person.java
@@ -72,6 +72,7 @@
import com.jcorporate.expresso.services.dbobj.RegistrationDBObject;
import java.util.Vector;
+import com.jcorporate.expresso.core.security.ReadOnlyUser;
/**
* Creation date: 2001-08-24 11:57:54
@@ -110,12 +111,25 @@
*
* @param uid Uid of the user context
* @throws DBException if there's an initialization problem
+ * @deprecated Since Expresso 5.7 use <tt>ReadOnlyUser</tt> constructor instead.
*/
public Person(int uid) throws DBException {
super(uid);
}
/**
+ * Constructs this data object using the specified user security
+ * context. You can often get this parameter using the <tt>RequestRegistry</tt>
+ * objects. Use this constructor instead of the old integer uid constructor
+ * since ultimately it results in performance gains for the application.
+ * @param userSecuityContext ReadOnlyUser user security credentials.
+ * @throws DBException upon construction error.
+ */
+ public Person(final ReadOnlyUser userSecuityContext) throws DBException {
+ super(userSecuityContext);
+ }
+
+ /**
* For using DBObjects within Controllers. Initializes based upon the current
* user and the requested db. [Of course this can be modified later]
*
@@ -196,4 +210,4 @@
super.update();
} /* update() */
-} /* PersonalData */
\ No newline at end of file
+} /* PersonalData */
Index: Contact.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Contact.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Contact.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Contact.java -u -r1.18 -r1.19
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Contact.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj/Contact.java
@@ -72,6 +72,7 @@
import com.jcorporate.expresso.services.dbobj.RegistrationDBObject;
import java.util.Vector;
+import com.jcorporate.expresso.core.security.ReadOnlyUser;
/**
@@ -81,8 +82,7 @@
* HOWEVER - Most of the code included in this file is derived from code
* created directly by Michael Nash of jCorporate, or Adam Rossi of Platinum Solutions
*/
-public class Contact
- extends RegistrationDBObject {
+public class Contact extends RegistrationDBObject {
/**
* Constructor
@@ -123,13 +123,27 @@
*
* @param uid the Uid of the user context
* @throws DBException if there's an initialization problem
- */
+ * @deprecated Since Expresso 5.7 use <tt>ReadOnlyUser</tt> constructor instead.
+ */
public Contact(int uid)
throws DBException {
super(uid);
}
/**
+ * Constructs this data object using the specified user security
+ * context. You can often get this parameter using the <tt>RequestRegistry</tt>
+ * objects. Use this constructor instead of the old integer uid constructor
+ * since ultimately it results in performance gains for the application.
+ * @param userSecuityContext ReadOnlyUser user security credentials.
+ * @throws DBException upon construction error.
+ */
+ public Contact(final ReadOnlyUser userSecuityContext) throws DBException {
+ super(userSecuityContext);
+ }
+
+
+ /**
* @throws DBException upon add error
*/
public void add()
@@ -211,4 +225,4 @@
} /* PersonalData */
-/* PersonalData */
\ No newline at end of file
+/* PersonalData */
Index: SendNotice.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/job/SendNotice.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/job/SendNotice.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/job/SendNotice.java -u -r1.13 -r1.14
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/job/SendNotice.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/job/SendNotice.java
@@ -152,7 +152,7 @@
String subject = jq.getParamValue("Subject");
String fileNumber = jq.getParamValue("FileNumber");
StringBuffer noticeTextBuffer = new StringBuffer();
- JobQueueParam jqp = new JobQueueParam(SuperUser.SUPER_USER);
+ JobQueueParam jqp = new JobQueueParam(SuperUser.INSTANCE);
jqp.setField("JobNumber", jq.getField("JobNumber"));
jqp.setField("ParamCode", "NoticeText%");
@@ -178,7 +178,7 @@
User oneUser = new User();
/* Build the unique list of people who have downloaded */
- DownloadLog dll = new DownloadLog(SuperUser.SUPER_USER);
+ DownloadLog dll = new DownloadLog(SuperUser.INSTANCE);
dll.setField("FileNumber", fileNumber);
DownloadLog oneDl = null;
Index: DownloadUsers.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/report/DownloadUsers.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/report/DownloadUsers.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/report/DownloadUsers.java -u -r1.16 -r1.17
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/report/DownloadUsers.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/report/DownloadUsers.java
@@ -133,7 +133,7 @@
userList.setDataContext(this.getDBName());
UserInfo oneUser = null;
- DownloadLog dl = new DownloadLog(SuperUser.SUPER_USER);
+ DownloadLog dl = new DownloadLog(SuperUser.INSTANCE);
dl.setDataContext(this.getDataContext());
addLine("Users who have downloaded at least " +
getParam("CountMin") + " times, and no more than " +
Index: ExSelectTag.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExSelectTag.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExSelectTag.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExSelectTag.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExSelectTag.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExSelectTag.java
@@ -78,6 +78,8 @@
import com.jcorporate.expresso.core.dbobj.ValidValue;
import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.ext.struts.taglib.ControllerUtils;
+import java.util.List;
+import java.util.Iterator;
/**
@@ -196,7 +198,7 @@
results.append(">\n");
ValidValue oneValue = null;
- Vector allValues = myInput.getValidValues();
+ List allValues = myInput.getValidValuesList();
if (allValues == null) {
throw new JspException("No valid values for input '" +
@@ -209,8 +211,8 @@
// myInput.getName() + "'");
}
- for (Enumeration ae = allValues.elements(); ae.hasMoreElements();) {
- oneValue = (ValidValue) ae.nextElement();
+ for (Iterator ae = allValues.iterator(); ae.hasNext();) {
+ oneValue = (ValidValue) ae.next();
if (oneValue.getValue().equals(myInput.getDefaultValue())) {
results.append("<option selected value=\"" +
Index: ExComboBoxTag.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExComboBoxTag.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExComboBoxTag.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExComboBoxTag.java -u -r1.14 -r1.15
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExComboBoxTag.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExComboBoxTag.java
@@ -79,6 +79,8 @@
import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.ext.struts.taglib.ControllerUtils;
import com.jcorporate.expresso.services.dbobj.Setup;
+import java.util.List;
+import java.util.Iterator;
/*
@@ -250,15 +252,15 @@
}
ValidValue oneValue = null;
- Vector allValues = myInput.getValidValues();
+ List allValues = myInput.getValidValuesList();
int compteurLab = 1;
if ((allValues != null) && (allValues.size() != 0)) {
- Enumeration ae = allValues.elements();
- Enumeration aeCss = allValues.elements();
+ Iterator ae = allValues.iterator();
+ Iterator aeCss = allValues.iterator();
- while (aeCss.hasMoreElements()) {
- oneValue = (ValidValue) aeCss.nextElement();
+ while (aeCss.hasNext()) {
+ oneValue = (ValidValue) aeCss.next();
int lenghtValue = oneValue.getDescription().length();
@@ -274,11 +276,11 @@
myInput.getName() + "\")\n");
results.append(" " + myInput.getName() + ".add(\n");
- while (ae.hasMoreElements()) {
- oneValue = (ValidValue) ae.nextElement();
+ while (ae.hasNext()) {
+ oneValue = (ValidValue) ae.next();
results.append(" new ComboBoxItem(\"" +
oneValue.getDescription() + "\"," + compteurLab + ")" +
- ((ae.hasMoreElements()) ? "," : "") + "\n");
+ ((ae.hasNext()) ? "," : "") + "\n");
compteurLab++;
}
/* for each valid value */
Index: InputTag.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/InputTag.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/InputTag.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/InputTag.java -u -r1.25 -r1.26
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/InputTag.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib/InputTag.java
@@ -74,6 +74,7 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.Tag;
import java.util.Vector;
+import java.util.List;
/**
@@ -261,10 +262,10 @@
/**
* Generates HTML attributes for style, class, and style id
- * @param buf
- * @return
+ * @param buf FastStringBuffer
+ * @return resulting fast string buffer.
*/
- protected FastStringBuffer generateStyleClass( FastStringBuffer buf )
+ protected FastStringBuffer generateStyleClass( final FastStringBuffer buf )
{
if ( style != null )
buf.append( "style=\""+style+"\" ");
@@ -277,10 +278,10 @@
/**
* Generates HTML attributes for the JavaScript event handler
- * @param buf
- * @return
+ * @param buf FastStringBuffer
+ * @return resulting fast string buffer.
*/
- protected FastStringBuffer generateEventHandler( FastStringBuffer buf )
+ protected FastStringBuffer generateEventHandler(final FastStringBuffer buf )
{
if ( onclick != null )
buf.append( "=\""+onclick+"\" ");
@@ -388,19 +389,20 @@
*
* @param writer The JspWriter
* @param vertical true if you want vertically aligned check boxes
+ * @throws java.lang.Exception upon error.
*/
- private void buildCheckBox(JspWriter writer, boolean vertical)
+ private void buildCheckBox(final JspWriter writer, final boolean vertical)
throws Exception {
if (writer == null) {
throw new Exception("JspWriter was null");
}
- Vector validVector = oneInput.getValidValues();
+ List validVector = oneInput.getValidValuesList();
ValidValue oneValue = null;
String checkFlag = null;
for (int i = 0; i < validVector.size(); i++) {
- oneValue = (ValidValue) validVector.elementAt(i);
+ oneValue = (ValidValue) validVector.get(i);
if (valueToUse.equals(oneValue.getValue())) {
checkFlag = "CHECKED";
@@ -487,12 +489,12 @@
throw new Exception("JspWriter was null");
}
- Vector validVector = oneInput.getValidValues();
+ List validVector = oneInput.getValidValuesList();
ValidValue oneV