[cvs] expresso commit by lhamel: revert getValidValuesList() impl to call

JCorporate Ltd jcorp at jcorporate.com
Tue Jun 14 16:10:20 UTC 2005


Log Message:
-----------
revert getValidValuesList() impl to call getValidValues() because latter can be overridden in subclasses, and we need to call it

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj:
        DBObject.java

Revision Data
-------------
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.252
retrieving revision 1.253
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.252 -r1.253
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java
@@ -3838,16 +3838,19 @@
      * @throws DBException upon error
      */
     public java.util.List getValidValuesList(String fieldName) throws DBException {
-        Vector valVector = getValidValuesPriv(fieldName);
-        ArrayList result = null;
-        if ( valVector == null ) {
-            result = new ArrayList();
-        }
-        else {
-            result = new ArrayList(valVector);
-        }
+        return new ArrayList(getValidValues(fieldName));
 
-        return result;
+        // cannot use this impl. because getValidValues() can be overridden in subclasses, and we need to call it 
+//        Vector valVector = getValidValuesPriv(fieldName);
+//        ArrayList result = null;
+//        if ( valVector == null ) {
+//            result = new ArrayList();
+//        }
+//        else {
+//            result = new ArrayList(valVector);
+//        }
+//
+//        return result;
     }
 
     /**


More information about the cvs mailing list