[cvs]
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects
BaseDataObject.java DataExecutorInterface.java DataField.java
DataFieldMetaData.java DataObject.java
DataObjectMetaData.java DefaultDataField.java
SynchronizedDataObject.java
JCorporate Ltd
jcorp at jcorp2.servlets.net
Mon Sep 20 12:20:48 PDT 2004
Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects
In directory jcorp2.servlets.net:/tmp/cvs-serv776
Modified Files:
BaseDataObject.java DataExecutorInterface.java DataField.java
DataFieldMetaData.java DataObject.java DataObjectMetaData.java
DefaultDataField.java SynchronizedDataObject.java
Log Message:
<Aucun commentaire entré>
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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SynchronizedDataObject.java 18 Sep 2004 00:06:08 -0000 1.5
--- SynchronizedDataObject.java 20 Sep 2004 19:20:46 -0000 1.6
***************
*** 68,72 ****
import com.jcorporate.expresso.core.db.DBException;
- import org.apache.oro.text.regex.Pattern;
import java.util.ArrayList;
--- 68,71 ----
***************
*** 509,540 ****
}
- /**
- * Set a regular expression "mask" for this base data object that specifies it's
- * valid values. The mask should already be compiled by the regular
- * expression compiler
- * @param newMask The compiled regular expression mask
- *
- */
- public void setGlobalMask(Pattern newMask) {
- target.setGlobalMask(newMask);
- }
-
- /**
- * Get the compiled regular expression for this base data object.
- * @return the precompiled regular expression mask
- */
- public Pattern getGlobalMask() {
- return target.getGlobalMask();
- }
-
-
- /**
- * Return boolean if the data object has a mask set
- *
- * @return True if the data object mask is set, else false if it is not
- */
- public boolean isGlobalMasked() {
- return target.isGlobalMasked();
- } /* isMasked() */
}
--- 508,511 ----
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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DataObjectMetaData.java 18 Sep 2004 00:06:08 -0000 1.9
--- DataObjectMetaData.java 20 Sep 2004 19:20:46 -0000 1.10
***************
*** 473,500 ****
*/
public String getDescription(java.util.Locale l);
-
-
- /**
- * Retrieve the database schema name associated with this data object
- *
- * @return the className of the schema associated with this DBObject
- */
- public String getTargetDbSchema();
-
- /**
- * Retrieve the database catalogue name associated with this data object
- *
- * @return the className of the schema associated with this DBObject
- */
- public String getTargetDbCatalog();
-
-
- /**
- * Retrieve the full table name associated with this data object
- *
- * @return the className of the schema associated with this DBObject
- */
- public String getTargetSQLTable(String dataContext) throws DataException;
-
-
}
--- 473,475 ----
Index: DataExecutorInterface.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DataExecutorInterface.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DataExecutorInterface.java 18 Sep 2004 00:06:08 -0000 1.9
--- DataExecutorInterface.java 20 Sep 2004 19:20:46 -0000 1.10
***************
*** 125,154 ****
public void addBatch(List valueObjectList) throws DataException, DuplicateKeyException;
- /**
- * Updates an entire batch of <code>DataObject</code>s
- * @param valueObjectList A list of <code>DataObject</code>s to update to the underlying
- * data source
- * @throws DataException upon error updating the data source
- */
- public void deleteBatch(List valueObjectList) throws DataException;
-
- /**
- * Updates an entire batch of <code>DataObject</code>s
- * @param valueObjectList A list of <code>DataObject</code>s to update to the underlying
- * data source
- * @param updateChangedFieldsOnly flag to signify if only fields whose value
- * has changed should be included in the update.
- * @throws DataException upon error updating the data source
- */
- public void deleteBatch(List valueObjectList, boolean deleteWithSetFieldsOnly) throws DataException;
-
- /**
- * Takes a <code>DataObject</code> and updates it to the underlying data source
- * @param valueObject the <code>DataObject</code> to update.
- * @param updateChangedFieldsOnly flag to signify if only fields whose value
- * has changed should be included in the update.
- * @throws DataException upon error updating the object to the data source
- */
-
/**
* Updates an entire batch of <code>DataObject</code>s
--- 125,128 ----
***************
*** 158,195 ****
*/
public void updateBatch(List valueObjectList) throws DataException;
-
- /**
- * Updates an entire batch of <code>DataObject</code>s
- * @param valueObjectList A list of <code>DataObject</code>s to update to the underlying
- * data source
- * @param updateChangedFieldsOnly flag to signify if only fields whose value
- * has changed should be included in the update.
- * @throws DataException upon error updating the data source
- */
- public void updateBatch(List valueObjectList, boolean updateChangedFieldsOnly) throws DataException;
-
- /**
- * Takes a <code>DataObject</code> and updates it to the underlying data source
- * @param valueObject the <code>DataObject</code> to update.
- * @param updateChangedFieldsOnly flag to signify if only fields whose value
- * has changed should be included in the update.
- * @throws DataException upon error updating the object to the data source
- */
- public void updateAll(DataObject valueObject, boolean updateChangedCache) throws DataException;
-
- /**
- * Takes a <code>DataObject</code> and deletes it from the underlying data source
- * @param valueObject the <code>DataObject</code> to delete.
- * @throws DataException upon error deleting the objects to the data source
- */
- public void deleteAll(DataObject valueObject, boolean deleteChangedCache) throws DataException;
- /**
- * Takes a <code>DataObject</code> and run it from the underlying data source
- * @param valueObject the <code>DataObject</code> to run.
- * @throws DataException upon error retriving the object from the data source
- */
- public void runStoreProcedure(DataObject valueObject) throws DataException;
-
-
-
}
--- 132,134 ----
Index: DataObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DataObject.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DataObject.java 18 Sep 2004 00:06:08 -0000 1.18
--- DataObject.java 20 Sep 2004 19:20:46 -0000 1.19
***************
*** 67,71 ****
import com.jcorporate.expresso.core.cache.Cacheable;
import com.jcorporate.expresso.core.db.DBException;
- import org.apache.oro.text.regex.Pattern;
import java.util.ArrayList;
--- 67,70 ----
***************
*** 401,422 ****
*/
public int count() throws DBException;
-
- /**
- * Sets the DataObject's global mask
- * @param newGlobalMask the New global mask object
- */
- public void setGlobalMask(Pattern newGlobalMask);
-
- /**
- * Retrieve the DBObject's current global mask
- * @return String
- */
- public Pattern getGlobalMask();
-
- /**
- * Return boolean if the data object has a mask set
- *
- * @return True if the data object mask is set, else false if it is not
- */
- public boolean isGlobalMasked();
}
--- 400,402 ----
Index: DataField.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DataField.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DataField.java 18 Sep 2004 00:06:08 -0000 1.16
--- DataField.java 20 Sep 2004 19:20:46 -0000 1.17
***************
*** 75,79 ****
* value, and attribute holdings.
* @author Michael Rimov
- * @version $Revision$ on $Date$
* @since Expresso 5.0.1
*/
--- 75,78 ----
***************
*** 154,163 ****
public boolean isValueSet();
! /**
! * Make sure the value of the field is valid.
! *
! * @throws DataException if the field value is not valid
! */
! public void checkValue() throws DataException;
/**
--- 153,162 ----
public boolean isValueSet();
! /**
! * Make sure the value of the field is valid.
! *
! * @throws DataException if the field value is not valid
! */
! public void checkValue() throws DataException;
/**
Index: DataFieldMetaData.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DataFieldMetaData.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DataFieldMetaData.java 18 Sep 2004 00:06:08 -0000 1.10
--- DataFieldMetaData.java 20 Sep 2004 19:20:46 -0000 1.11
***************
*** 201,218 ****
public boolean isBinaryObjectType();
- /**
- * Is it a BLOB? This is calculated by if it is a long object
- * and is NOT a character long object.
- * @return boolean True if it is
- */
- public boolean isLongBinaryType();
-
- /**
- * Is it a BLOB? This is calculated by if it is a long object
- * and is NOT a character long object.
- * @return boolean True if it is
- */
- public boolean isLongCharacterType();
-
/**
* is the field a quoted text field?
--- 201,204 ----
***************
*** 297,307 ****
*/
public boolean isVirtual();
-
- /**
- * Return boolean if the field has a mask set
- *
- * @return True if the field mask is set, else false if it is not
- */
- public boolean isMasked();
/**
--- 283,286 ----
Index: DefaultDataField.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DefaultDataField.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** DefaultDataField.java 18 Sep 2004 00:06:08 -0000 1.31
--- DefaultDataField.java 20 Sep 2004 19:20:46 -0000 1.32
***************
*** 97,104 ****
/**
* Default implementation of the DataField interface. This class provides some
! * basic conversion capabilities between different Java types as well as provides
! * all use change logging capabilities.
* @author Michael Rimov
- * @version $Revision$ on $Date$
* @since Expresso 5.0
*/
--- 97,104 ----
/**
[...1288 lines suppressed...]
! *
! * @param pattern the format pattern to look up
! * @return an instantiated SimpleDateFormat object. SimpleDateFormat is
! * NOT threadsafe, so make sure you do your parsing while still in
! * the synchronized block. Perhaps in the future a keyed Object
! * pool will be better.
*/
! private SimpleDateFormat getSimpleDateFormat(String pattern) {
! SimpleDateFormat aFormat = null;
! aFormat = (SimpleDateFormat) dateConvertFormatMap.get(pattern);
!
! if (aFormat == null) {
! aFormat = new SimpleDateFormat(pattern);
! dateConvertFormatMap.put(pattern, aFormat);
! }
!
! return aFormat;
}
}
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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** BaseDataObject.java 18 Sep 2004 00:06:08 -0000 1.9
--- BaseDataObject.java 20 Sep 2004 19:20:46 -0000 1.10
***************
*** 64,68 ****
package com.jcorporate.expresso.core.dataobjects;
- import org.apache.oro.text.regex.Pattern;
--- 64,67 ----
***************
*** 81,85 ****
protected String currentStatus = BaseDataObject.STATUS_NEW;
- protected Pattern globalMask = null;
public BaseDataObject() {
--- 80,83 ----
***************
*** 127,166 ****
return currentStatus;
} /* getStatus() */
-
- /**
- * Set a regular expression "mask" for this base data object that specifies it's
- * valid values. The mask should already be compiled by the regular
- * expression compiler
- * @param newMask The compiled regular expression mask
- *
- *
- * author Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- */
- public void setGlobalMask(Pattern newMask) {
- globalMask = newMask;
- }
-
- /**
- * Get the compiled regular expression for this base data object.
- * @return the precompiled regular expression mask
- *
- * author Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- */
- public Pattern getGlobalMask() {
- return globalMask;
- }
-
-
- /**
- * Return boolean if the data object has a mask set
- *
- * @return True if the data object mask is set, else false if it is not
- *
- * author Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- */
- public boolean isGlobalMasked() {
- return globalMask != null;
- } /* isMasked() */
-
-
}
--- 125,127 ----
More information about the cvs
mailing list