[cvs]
expresso commit by lhamel: rename method in dbobject metadata,
JCorporate Ltd
jcorp at jcorporate.com
Tue Feb 22 02:14:47 UTC 2005
Log Message:
-----------
rename method in dbobject metadata, deprecating old
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller:
ControllerRequest.java
ControllerResponse.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects:
BaseDataObject.java
DataObjectMetaData.java
SynchronizedDataObject.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc:
JDBCDataObject.java
JDBCExecutor.java
JDBCUtil.java
JoinedDataObject.java
JoinedDataObjectMetaData.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:
CacheUtils.java
DBObjectDef.java
DBSequence.java
HistAuditSecuredDBObject.java
MultiDBObject.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility:
DBTool.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller:
DataTransfer.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj:
RegisteredUser.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller:
SimpleRegistration.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint:
GetBase.java
ListBase.java
SearchList.java
UpdateBase.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ui:
DefaultAutoElement.java
Revision Data
-------------
Index: JoinedDataObjectMetaData.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObjectMetaData.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObjectMetaData.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObjectMetaData.java -u -r1.24 -r1.25
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObjectMetaData.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObjectMetaData.java
@@ -660,11 +660,19 @@
/**
* Retrieve a list of all the field names
+ * @deprecated 2/05 v.5.6; use getFieldNamesList instead (renaming)
*
* @return java.util.ArrayList
*/
public synchronized ArrayList getFieldListArray() {
-
+ return (ArrayList) getFieldNamesList();
+ }
+ /**
+ * Retrieve a list of all the field names
+ *
+ * @return java.util.ArrayList
+ */
+ public synchronized List getFieldNamesList() {
//
//Check if we need to build the all field list.
//
@@ -672,7 +680,7 @@
ArrayList newList = new ArrayList(10);
for (Iterator i = this.dataObjects.iterator(); i.hasNext();) {
DataObject oneObj = (DataObject) i.next();
- ArrayList fieldList = oneObj.getMetaData().getFieldListArray();
+ List fieldList = oneObj.getMetaData().getFieldNamesList();
String dbobjName = null;
//
@@ -1026,7 +1034,7 @@
* author Peter Pilgrim <peter.pilgrim at db.com>
*/
public String[] getFields() {
- ArrayList list = this.getFieldListArray();
+ List list = this.getFieldNamesList();
String returnValue[] = new String[list.size()];
Index: JDBCUtil.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCUtil.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCUtil.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCUtil.java -u -r1.33 -r1.34
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCUtil.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCUtil.java
@@ -452,7 +452,7 @@
FastStringBuffer myStatement = allocatedBuffer;
if (useAllFields) {
- fieldsToUse = criteria.getMetaData().getFieldListArray().iterator();
+ fieldsToUse = criteria.getMetaData().getFieldNamesList().iterator();
} else {
fieldsToUse = criteria.getMetaData().getKeyFieldListArray().iterator();
}
@@ -944,19 +944,16 @@
* setCustomWhereClause for information on specifying a more complex where clause.
*
* @param criteria the JDBCDataObject to build from
- * @param useAllFields True if all fields are to be used,
- * false for only key fields
- * @param allocatedBuffer - An already allocated FastStringBuffer to fill out.
- * This allows for compatability with, for example, object pools.
* @return A FastStringBuffer containing the "where" clause for the SQL statement
* @throws DataException upon error
*/
- public void buildStoreProcedureCallableStatement(JDBCDataObject criteria, CallableStatement myCallableStatement)
+ public void buildStoreProcedureCallableStatement(
+ JDBCDataObject criteria, CallableStatement myCallableStatement)
throws DataException {
Iterator fieldsToUse = null;
FastStringBuffer myStatement = FastStringBuffer.getInstance();
- fieldsToUse = criteria.getMetaData().getFieldListArray().iterator();
+ fieldsToUse = criteria.getMetaData().getFieldNamesList().iterator();
/* Now go thru each field - if it is non-empty, add it's criteria */
Index: JDBCExecutor.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCExecutor.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCExecutor.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCExecutor.java -u -r1.66 -r1.67
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCExecutor.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCExecutor.java
@@ -673,7 +673,7 @@
sqlCommand.append(" SET ");
- for (Iterator i = valueObject.getMetaData().getFieldListArray().iterator(); i.hasNext();) {
+ for (Iterator i = valueObject.getMetaData().getFieldNamesList().iterator(); i.hasNext();) {
String oneFieldName = (String) i.next();
oneField = theObject.getFieldMetaData(oneFieldName);
@@ -1011,7 +1011,7 @@
Object tmpData = null;
if (myConnection.next()) {
//Clear all non-key fields
- for (Iterator allFields = theObject.getMetaData().getFieldListArray().iterator();
+ for (Iterator allFields = theObject.getMetaData().getFieldNamesList().iterator();
allFields.hasNext();) {
String oneFieldName = (String) allFields.next();
DataFieldMetaData fieldMetaData = theObject.getFieldMetaData(oneFieldName);
@@ -1200,7 +1200,7 @@
boolean needComma = false;
boolean needWhereComma = false;
- for (Iterator i = theObject.getMetaData().getFieldListArray().iterator(); i.hasNext();) {
+ for (Iterator i = theObject.getMetaData().getFieldNamesList().iterator(); i.hasNext();) {
String oneFieldName = (String) i.next();
oneField = theObject.getFieldMetaData(oneFieldName);
@@ -1281,7 +1281,7 @@
boolean needComma = false;
boolean needWhereComma = false;
- for (Iterator i = theObject.getMetaData().getFieldListArray().iterator(); i.hasNext();) {
+ for (Iterator i = theObject.getMetaData().getFieldNamesList().iterator(); i.hasNext();) {
String oneFieldName = (String) i.next();
oneField = theObject.getFieldMetaData(oneFieldName);
@@ -1364,7 +1364,7 @@
DataFieldMetaData oneField = null;
boolean needCommaValues = false;
- for (Iterator i = theObject.getMetaData().getFieldListArray().iterator(); i.hasNext();) {
+ for (Iterator i = theObject.getMetaData().getFieldNamesList().iterator(); i.hasNext();) {
String oneFieldName = (String) i.next();
oneField = theObject.getFieldMetaData(oneFieldName);
@@ -1567,7 +1567,7 @@
FastStringBuffer valuesCommand = FastStringBuffer.getInstance();
String returnValue = null;
try {
- int nbParams = theObject.getDef().getFieldListArray().size();
+ int nbParams = theObject.getDef().getFieldNamesList().size();
if (theObject.getDef().isReturningValue()) {
sqlCommand.append("{? = call ");
@@ -1612,7 +1612,7 @@
Iterator fieldsToUse = null;
FastStringBuffer myStatement = FastStringBuffer.getInstance();
- fieldsToUse = criteria.getMetaData().getFieldListArray().iterator();
+ fieldsToUse = criteria.getMetaData().getFieldNamesList().iterator();
/* Now go thru each field - if it is non-empty, add it's criteria */
@@ -1776,7 +1776,7 @@
try {
if (myConnection.getResultSet() != null) {
//Clear all non-key fields
- for (Iterator allFields = theObject.getMetaData().getFieldListArray().iterator(); allFields.hasNext();) {
+ for (Iterator allFields = theObject.getMetaData().getFieldNamesList().iterator(); allFields.hasNext();) {
oneFieldName = (String) allFields.next();
DataFieldMetaData fieldMetaData = theObject.getFieldMetaData(oneFieldName);
if (!fieldMetaData.isKey() && !fieldMetaData.isBinaryObjectType() && !fieldMetaData.isVirtual()) {
@@ -1940,7 +1940,7 @@
//
//Now we iterate through and set all the parameters
//
- for (Iterator j = metadata.getFieldListArray().iterator(); j.hasNext();) {
+ for (Iterator j = metadata.getFieldNamesList().iterator(); j.hasNext();) {
String oneFieldName = (String) j.next();
// Only include changed fields in the update if required
@@ -2237,7 +2237,7 @@
//
//Now we iterate through and set all the parameters
//
- for (Iterator j = metadata.getFieldListArray().iterator(); j.hasNext();) {
+ for (Iterator j = metadata.getFieldNamesList().iterator(); j.hasNext();) {
String oneFieldName = (String) j.next();
// Only include changed fields in the update if required
@@ -2536,7 +2536,7 @@
//
//Now we iterate through and set all the parameters
//
- for (Iterator j = metadata.getFieldListArray().iterator(); j.hasNext();) {
+ for (Iterator j = metadata.getFieldNamesList().iterator(); j.hasNext();) {
String oneFieldName = (String) j.next();
// Only include changed fields in the update if required
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.44
retrieving revision 1.45
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.44 -r1.45
--- 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
@@ -1373,7 +1373,7 @@
test.setRequestingUid(this.getRequestingUid());
test.setDataContext(this.getDataContext());
- ArrayList fieldList = this.getMetaData().getFieldListArray();
+ List fieldList = this.getMetaData().getFieldNamesList();
for (Iterator i = fieldList.iterator(); i.hasNext();) {
String fieldName = (String) i.next();
test.set(fieldName, this.getDataField(fieldName).getValue());
@@ -1502,7 +1502,7 @@
}
/* for each field */
} else {
- for (Iterator i = metadata.getFieldListArray().iterator();
+ for (Iterator i = metadata.getFieldNamesList().iterator();
i.hasNext();
) {
fieldName = (String) i.next();
@@ -1803,7 +1803,7 @@
// special case: if there are no fields besides key
// fields, then do nothing since key fields never update this way
if (testObject.getMetaData().getKeyFieldListArray().size()
- == testObject.getMetaData().getFieldListArray().size()) {
+ == testObject.getMetaData().getFieldNamesList().size()) {
// do nothing
// @todo add logic for virtual fields
} else {
@@ -2207,7 +2207,7 @@
boolean needComma = false;
FastStringBuffer fsb = FastStringBuffer.getInstance();
try {
- for (Iterator i = this.getMetaData().getFieldListArray().iterator();
+ for (Iterator i = this.getMetaData().getFieldNamesList().iterator();
i.hasNext();) {
if (needComma) {
fsb.append(", ");
@@ -2252,7 +2252,7 @@
try {
DataFieldMetaData oneField = null;
JoinedDataObjectMetaData metadata = this.getJoinMetaData();
- for (Iterator i = this.getMetaData().getFieldListArray().iterator();
+ for (Iterator i = this.getMetaData().getFieldNamesList().iterator();
i.hasNext();) {
String oneFieldName = (String) i.next();
oneField = this.getFieldMetaData(oneFieldName);
@@ -2375,7 +2375,7 @@
byTableName.put(oneObj.getJDBCMetaData().getTargetSQLTable(oneObj.getDataContext()), oneObj);
- for (Iterator i = oneObj.getMetaData().getFieldListArray().
+ for (Iterator i = oneObj.getMetaData().getFieldNamesList().
iterator(); i.hasNext();) {
fieldName = (String) i.next();
Index: JDBCDataObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java -u -r1.46 -r1.47
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java
@@ -1153,7 +1153,7 @@
if (distinctFields == null) {
return arl;
}
- for (Iterator i = this.getMetaData().getFieldListArray().iterator(); i.hasNext();) {
+ for (Iterator i = this.getMetaData().getFieldNamesList().iterator(); i.hasNext();) {
String fieldName = (String) i.next();
if (distinctFields.containsKey(fieldName)) {
@@ -1360,7 +1360,7 @@
myConnection = this.getConnectionPool().getConnection(this.myClassName);
}
- int nbParams = this.getDef().getFieldListArray().size();
+ int nbParams = this.getDef().getFieldNamesList().size();
if (this.getDef().isReturningValue()) {
myStatement.append("{? = call ");
nbParams--;
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.22
retrieving revision 1.23
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.22 -r1.23
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java
@@ -326,7 +326,7 @@
sqlStatement.append(metadata.getTargetSQLTable(dbObj.getDataContext()));
sqlStatement.append("(");
- for (Iterator lf = metadata.getFieldListArray().iterator(); lf.hasNext();) {
+ for (Iterator lf = metadata.getFieldNamesList().iterator(); lf.hasNext();) {
String fieldName = (String) lf.next();
if (!dbObj.getJDBCMetaData().isVirtual(fieldName)) {
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.56
retrieving revision 1.57
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.56 -r1.57
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java
@@ -776,7 +776,7 @@
rc.hasNext();) {
oneObj = (DBObject) rc.next();
- for (Iterator e = myObj.getJDBCMetaData().getFieldListArray().iterator(); e.hasNext();) {
+ for (Iterator e = myObj.getJDBCMetaData().getFieldNamesList().iterator(); e.hasNext();) {
fieldName = (String) e.next();
out.print(oneObj.getField(fieldName) + "\t");
} /* for each field */
@@ -1133,7 +1133,7 @@
myConnection = myPool.getConnection();
DatabaseMetaData dm = myConnection.getDBMetaData();
- ArrayList allFieldsFromObj = oneDBObject.getMetaData().getFieldListArray();
+ List allFieldsFromObj = oneDBObject.getMetaData().getFieldNamesList();
ArrayList allFields = new ArrayList();
String oneFieldName = null;
@@ -1460,7 +1460,7 @@
StringTokenizer stk = new StringTokenizer(oneLine, "\t");
- for (Iterator e = myObj.getJDBCMetaData().getFieldListArray().iterator(); e.hasNext();) {
+ for (Iterator e = myObj.getJDBCMetaData().getFieldNamesList().iterator(); e.hasNext();) {
fieldName = (String) e.next();
if (!stk.hasMoreTokens()) {
Index: MultiDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java -u -r1.68 -r1.69
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java
@@ -978,7 +978,7 @@
// 2003-11-05 /ebn-ma: ...added
// ----------------------------------------------------
- for (Iterator i = oneObj.getMetaData().getFieldListArray().iterator();
+ for (Iterator i = oneObj.getMetaData().getFieldNamesList().iterator();
i.hasNext();) {
fieldName = (String) i.next();
@@ -1785,7 +1785,7 @@
}
/* for each field */
} else {
- for (Iterator i = oneObj.getMetaData().getFieldListArray().iterator();
+ for (Iterator i = oneObj.getMetaData().getFieldNamesList().iterator();
i.hasNext();
) {
fieldName = (String) i.next();
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.17
retrieving revision 1.18
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.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBSequence.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBSequence.java
@@ -304,7 +304,7 @@
if (myConnection.next()) {
int i = 1;
- for (Iterator e = metadata.getFieldListArray().iterator();
+ for (Iterator e = metadata.getFieldNamesList().iterator();
e.hasNext();) {
oneFieldName = (String) e.next();
Index: DBObjectDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObjectDef.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObjectDef.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObjectDef.java -u -r1.51 -r1.52
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObjectDef.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObjectDef.java
@@ -93,6 +93,7 @@
import java.util.Set;
import java.util.StringTokenizer;
import java.util.Vector;
+import java.util.List;
/**
@@ -1077,11 +1078,22 @@
/**
* Get a list of all of the fields in this object This is threadsafe in that
* it makes a new copy of the fieldNamesInOrder ArrayList
+ * @deprecated 2/05 v.5.6; use getFieldNamesList instead (renaming)
*
- * @return A Vector of all of the fieldNames in this object
+ * @return A list of all of the fieldNames in this object
*/
synchronized public ArrayList getFieldListArray() {
return (ArrayList) fieldNamesInOrder.clone();
+ }
+
+ /**
+ * Get a list of all of the fields in this object This is threadsafe in that
+ * it makes a new copy of the fieldNamesInOrder ArrayList
+ *
+ * @return A list of all of the fieldNames in this object
+ */
+ synchronized public List getFieldNamesList() {
+ return (List) fieldNamesInOrder.clone();
}
/**
Index: CacheUtils.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/CacheUtils.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/CacheUtils.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/CacheUtils.java -u -r1.16 -r1.17
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/CacheUtils.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/CacheUtils.java
@@ -338,6 +338,8 @@
* uses because the actual cached item is returned without making a copy. will retrieve
* record from database if necessary.
* All PK (primary keys) must be provided in a single parameter, in format like "getKey()".
+ * If the dbobjClass is a subclass of SecurDBObject, requesting UID is set via the RequestRegistry
+ * before any DB retrieval. However, simple SecuredDBObject subclasses use the default 'admin' privileges.
*
* @see DBObject#getKey()
* @param dbobjClass class of desired DBObject
@@ -359,8 +361,8 @@
if ( result == null ) {
try {
DBObject o = (DBObject) dbobjClass.newInstance();
- if ( o instanceof SecuredDBObject ) {
- ((SecuredDBObject)o).setRequestingUid(RequestRegistry.getUser().getUid());
+ if ( o instanceof SecurDBObject ) {
+ ((SecuredDBObject) o).setRequestingUid(RequestRegistry.getUser().getUid());
}
o.setKey(keyValues);
if ( o.find() ) {
Index: HistAuditSecuredDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/HistAuditSecuredDBObject.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/HistAuditSecuredDBObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/HistAuditSecuredDBObject.java -u -r1.11 -r1.12
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/HistAuditSecuredDBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/HistAuditSecuredDBObject.java
@@ -152,7 +152,7 @@
throw new DBException("The history object is null.");
}
- Iterator fieldsIterator = this.getJDBCMetaData().getFieldListArray().iterator();
+ Iterator fieldsIterator = this.getJDBCMetaData().getFieldNamesList().iterator();
String fieldName = null;
while (fieldsIterator.hasNext()) {
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.14
retrieving revision 1.15
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.14 -r1.15
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/DataTransfer.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/DataTransfer.java
@@ -380,7 +380,7 @@
throws DBException {
String oneField = null;
- for (Iterator i = fromObj.getMetaData().getFieldListArray().iterator(); i.hasNext();) {
+ for (Iterator i = fromObj.getMetaData().getFieldNamesList().iterator(); i.hasNext();) {
oneField = (String) i.next();
if (!fromObj.getMetaData().getFieldMetadata(oneField).isVirtual()) {
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.24
retrieving revision 1.25
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.24 -r1.25
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RegisteredUser.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RegisteredUser.java
@@ -158,7 +158,7 @@
String oneField = null;
- for (Iterator ef = this.getMetaData().getFieldListArray().iterator(); ef.hasNext();) {
+ for (Iterator ef = this.getMetaData().getFieldNamesList().iterator(); ef.hasNext();) {
oneField = (String) ef.next();
theMessage.append(getString(getMetaData().getDescription(oneField)) + ":" +
getField(oneField) + "\n");
Index: SimpleRegistration.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java -u -r1.40 -r1.41
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleRegistration.java
@@ -377,7 +377,7 @@
block.add(new Output("block-title",
metaData.getDescription(response.getRequest().getLocale())));
- for (Iterator e = metaData.getFieldListArray().iterator();
+ for (Iterator e = metaData.getFieldNamesList().iterator();
e.hasNext();) {
fieldName = (String) e.next();
@@ -1571,7 +1571,7 @@
Output col = new Output("");
String fieldName = null;
- for (Iterator k = oneRec.getMetaData().getFieldListArray()
+ for (Iterator k = oneRec.getMetaData().getFieldNamesList()
.iterator(); k.hasNext();) {
fieldName = (String) k.next();
@@ -1778,7 +1778,7 @@
response.setFormCache();
-// for (Iterator e = metadata.getFieldListArray().iterator();
+// for (Iterator e = metadata.getFieldNamesList().iterator();
// e.hasNext();) {
// fieldName = (String) e.next();
//
@@ -2030,7 +2030,7 @@
regRec.add(fldTbl);
for (Iterator fldIter = oneDB.getMetaData()
- .getFieldListArray()
+ .getFieldNamesList()
.iterator();
fldIter.hasNext();) {
String fn = (String) fldIter.next();
Index: GetBase.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java -u -r1.18 -r1.19
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java
@@ -130,7 +130,7 @@
showUserName(metadata.getDescription(this.getControllerRequest().getLocale()));
addOutput(new Output("title", metadata.getDescription(this.getControllerRequest().getLocale())));
- for (Iterator e = metadata.getFieldListArray().iterator(); e.hasNext();) {
+ for (Iterator e = metadata.getFieldNamesList().iterator(); e.hasNext();) {
oneFieldName = (String) e.next();
autoField(oneFieldName);
}
Index: UpdateBase.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateBase.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateBase.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateBase.java -u -r1.16 -r1.17
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateBase.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateBase.java
@@ -221,7 +221,7 @@
//for any of the fields that are Binary types, then separately save
//that data to the database
//
- for (Iterator i = myDBObj.getMetaData().getFieldListArray().iterator(); i.hasNext();) {
+ for (Iterator i = myDBObj.getMetaData().getFieldNamesList().iterator(); i.hasNext();) {
String nextField = (String) i.next();
DataFieldMetaData metadata = myDBObj.getFieldMetaData(nextField);
Index: SearchList.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/SearchList.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/SearchList.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/SearchList.java -u -r1.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/SearchList.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/SearchList.java
@@ -140,7 +140,7 @@
try {
/* Build the "search" param for subsequent pages, if any */
- for (Iterator e = myDBObj.getMetaData().getFieldListArray().iterator(); e.hasNext();) {
+ for (Iterator e = myDBObj.getMetaData().getFieldNamesList().iterator(); e.hasNext();) {
oneFieldName = (String) e.next();
if (!metadata.isVirtual(oneFieldName)) {
Index: ListBase.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java -u -r1.31 -r1.32
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java
@@ -155,7 +155,7 @@
}
for (Iterator e = (hasBrowseArrayList)
? browseArrayList.iterator()
- : myDBObj.getMetaData().getFieldListArray().iterator(); e.hasNext();) {
+ : myDBObj.getMetaData().getFieldNamesList().iterator(); e.hasNext();) {
oneFieldName = (String) e.next();
DataFieldMetaData fieldMetadata = myDBObj.getFieldMetaData(oneFieldName);
if (!fieldMetadata.isSecret()) {
@@ -497,7 +497,7 @@
/* for each field in this kind of obect */
for (Iterator e2 = (hasBrowseArrayList)
? browseArrayList.iterator()
- : myDBObj.getMetaData().getFieldListArray().iterator();
+ : myDBObj.getMetaData().getFieldNamesList().iterator();
e2.hasNext();) {
oneFieldName = (String) e2.next();
DataFieldMetaData metaData = myDBObj.getFieldMetaData(oneFieldName);
Index: BaseDataObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/BaseDataObject.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/BaseDataObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/BaseDataObject.java -u -r1.14 -r1.15
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/BaseDataObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/BaseDataObject.java
@@ -169,8 +169,7 @@
public void setFieldsWithDefaults() throws DataException {
DataObjectMetaData metadata = this.getMetaData();
- for (Iterator it = metadata.getFieldListArray()
- .iterator(); it.hasNext();) {
+ for (Iterator it = metadata.getFieldNamesList().iterator(); it.hasNext();) {
String fieldname = (String) it.next();
String fieldValue = null;
try {
Index: SynchronizedDataObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/SynchronizedDataObject.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/SynchronizedDataObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/SynchronizedDataObject.java -u -r1.10 -r1.11
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/SynchronizedDataObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/SynchronizedDataObject.java
@@ -125,7 +125,7 @@
* @return java.util.Iterator
*/
public synchronized Iterator getFieldListIterator() {
- return (new ArrayList(target.getMetaData().getFieldListArray())).iterator();
+ return (new ArrayList(target.getMetaData().getFieldNamesList())).iterator();
}
/**
Index: DataObjectMetaData.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DataObjectMetaData.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DataObjectMetaData.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DataObjectMetaData.java -u -r1.13 -r1.14
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DataObjectMetaData.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DataObjectMetaData.java
@@ -69,6 +69,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Set;
+import java.util.List;
/**
* This interface contains the "definition" of the DBObject, while the DBObject
@@ -286,10 +287,19 @@
/**
* Get a list of all of the fields in this object This is threadsafe in that
* it makes a new copy of the fieldNamesInOrder ArrayList
+ * @deprecated 2/05 v.5.6; use getFieldNamesList instead (renaming)
*
* @return An array of all of the fieldNames in this object
*/
public ArrayList getFieldListArray();
+
+ /**
+ * Get a list of all of the fields in this object This is threadsafe in that
+ * it makes a new copy of the fieldNamesInOrder ArrayList
+ *
+ * @return An array of all of the fieldNames in this object
+ */
+ public List getFieldNamesList();
/**
Index: ControllerRequest.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerRequest.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerRequest.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerRequest.java -u -r1.34 -r1.35
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerRequest.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerRequest.java
@@ -561,7 +561,7 @@
try {
String oneFieldName = null;
- for (Iterator e = myDBObj.getJDBCMetaData().getFieldListArray().iterator()
+ for (Iterator e = myDBObj.getJDBCMetaData().getFieldNamesList().iterator()
; e.hasNext();) {
oneFieldName = (String) e.next();
@@ -645,7 +645,7 @@
throws ControllerException, ValidationException {
try {
String oneFieldName = null;
- for (Iterator af = oneObject.getMetaData().getFieldListArray().iterator(); af.hasNext();) {
+ for (Iterator af = oneObject.getMetaData().getFieldNamesList().iterator(); af.hasNext();) {
oneFieldName = (String) af.next();
validateDBField(oneFieldName, oneObject, ec);
}
Index: ControllerResponse.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java -u -r1.57 -r1.58
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java
@@ -1304,7 +1304,7 @@
DataObjectMetaData metadata = myDBObj.getMetaData();
String className = myDBObj.getClass().getName();
- for (Iterator e = metadata.getFieldListArray().iterator();
+ for (Iterator e = metadata.getFieldNamesList().iterator();
e.hasNext();) {
oneFieldName = (String) e.next();
@@ -1787,7 +1787,7 @@
DataObjectMetaData metadata = dbobj.getMetaData();
Iterator it = null;
- it = metadata.getFieldListArray().iterator();
+ it = metadata.getFieldNamesList().iterator();
boolean requireField = false;
Index: DefaultAutoElement.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ui/DefaultAutoElement.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ui/DefaultAutoElement.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ui/DefaultAutoElement.java -u -r1.56 -r1.57
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ui/DefaultAutoElement.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ui/DefaultAutoElement.java
@@ -282,7 +282,7 @@
String oneFieldName = null;
DataObjectMetaData objMetaData = dbobj2.getMetaData();
- for (Iterator e = objMetaData.getFieldListArray().iterator();
+ for (Iterator e = objMetaData.getFieldNamesList().iterator();
e.hasNext();) {
oneFieldName = (String) e.next();
@@ -392,7 +392,7 @@
//their value is simply not submitted.
//
try {
- for (Iterator it = oneObject.getMetaData().getFieldListArray()
+ for (Iterator it = oneObject.getMetaData().getFieldNamesList()
.iterator(); it.hasNext();) {
String fieldName = (String) it.next();
DataFieldMetaData metadata = oneObject.getFieldMetaData(fieldName);
@@ -453,7 +453,7 @@
continue;
}
- for (Iterator it = theObjects[i].getMetaData().getFieldListArray()
+ for (Iterator it = theObjects[i].getMetaData().getFieldNamesList()
.iterator(); it.hasNext();) {
String fieldName = (String) it.next();
@@ -514,7 +514,7 @@
//their value is simply not submitted.
//
try {
- for (Iterator it = oneObject.getMetaData().getFieldListArray()
+ for (Iterator it = oneObject.getMetaData().getFieldNamesList()
.iterator(); it.hasNext();) {
String fieldName = (String) it.next();
DataFieldMetaData metadata = oneObject.getFieldMetaData(fieldName);
@@ -538,7 +538,7 @@
//patterns and load them into the appropriate DBObject by calling
//parseSingleInput for each matching paramter.
//
- for (Iterator i = oneObject.getMetaData().getFieldListArray().iterator();
+ for (Iterator i = oneObject.getMetaData().getFieldNamesList().iterator();
i.hasNext();) {
String oneFieldName = (String) i.next();
String oneParameterValue = request.getParameter(oneFieldName);
@@ -549,7 +549,7 @@
}
if (validate) {
- for (Iterator it = oneObject.getMetaData().getFieldListArray()
+ for (Iterator it = oneObject.getMetaData().getFieldNamesList()
.iterator(); it.hasNext();) {
String fieldName = (String) it.next();
More information about the cvs
mailing list