cvs commit: jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl ContrivedStringFunctionColumn.java StringConstantColumn.java

[hammant]

hammant     01/11/17 05:46:50

  Modified:    apps/db/src/java/org/apache/avalon/db/data/impl
                        ContrivedStringFunctionColumn.java
                        StringConstantColumn.java
  Log:
  removal of dead methods and fixing return value of StringConst column
  
  Revision  Changes    Path
  1.2       +1 -11     
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/ContrivedStringFunctionColumn.java
  
  Index: ContrivedStringFunctionColumn.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/ContrivedStringFunctionColumn.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContrivedStringFunctionColumn.java        2001/11/17 08:52:56     1.1
  +++ ContrivedStringFunctionColumn.java        2001/11/17 13:46:50     1.2
  @@ -20,7 +20,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL 
PROTECTED]</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public class ContrivedStringFunctionColumn extends AbstractContrivedColumn 
implements StringType {
   
  @@ -41,15 +41,5 @@
   
       public Object getValue(Row row) {
           return mStringFunction.getValue(row);
  -    }
  -
  -
  -    public void test(Object obj) throws ValidationException {
  -        throw new ValidationException("ContrivedStringFunctionColumn is not 
settable");
  -    }
  -
  -    public Object convertFromString(String str) throws ValidationException {
  -        test(str);
  -        return str;
       }
   }
  
  
  
  1.2       +4 -8      
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/StringConstantColumn.java
  
  Index: StringConstantColumn.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/StringConstantColumn.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StringConstantColumn.java 2001/11/17 08:52:56     1.1
  +++ StringConstantColumn.java 2001/11/17 13:46:50     1.2
  @@ -9,6 +9,7 @@
   package org.apache.avalon.db.data.impl;
   
   import org.apache.avalon.db.data.ValidationException;
  +import org.apache.avalon.db.data.Row;
   import org.apache.avalon.db.data.types.StringType;
   
   
  @@ -18,7 +19,7 @@
    *
    * @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL 
PROTECTED]</a>
    * @author Gerhard Froehlich <a href="mailto:[EMAIL PROTECTED]">[EMAIL 
PROTECTED]</a>*
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public class StringConstantColumn extends AbstractColumn implements 
StringType {
   
  @@ -37,12 +38,7 @@
           mStrConstant = strConstant;
       }
   
  -    public void test(Object obj) throws ValidationException {
  -        throw new ValidationException("StringConstantColumn is not 
settable");
  -    }
  -
  -    public Object convertFromString(String str) throws ValidationException {
  -        test(str);
  -        return str;
  +    public Object getValue(Row row) {
  +        return mStrConstant;
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>