cvs diff Value.java (in directory D:\CVS_projects\village_release_1_5_1\village\com\workingdogs\village\)
Index: Value.java
===================================================================
RCS file: /home/cvspublic/village/com/workingdogs/village/Value.java,v
retrieving revision 1.14
diff -r1.14 Value.java
11c11
<  *    notice, this list of conditions and the following disclaimer. 
---
>  *    notice, this list of conditions and the following disclaimer.
19,20c19,20
<  *    any, must include the following acknowlegement:  
<  *       "This product includes software developed by the 
---
>  *    any, must include the following acknowlegement:
>  *       "This product includes software developed by the
25,27c25,27
<  * 4. The names "Working-Dogs.com" and "Village" must not be used to 
<  *    endorse or promote products derived from this software without 
<  *    prior written permission. For written permission, please contact 
---
>  * 4. The names "Working-Dogs.com" and "Village" must not be used to
>  *    endorse or promote products derived from this software without
>  *    prior written permission. For written permission, please contact
30,31c30,31
<  * 5. Products derived from this software may not be called 
<  *    "Working-Dogs.com" nor may "Village" appear in their names 
---
>  * 5. Products derived from this software may not be called
>  *    "Working-Dogs.com" nor may "Village" appear in their names
59a60,65
> import java.lang.Byte;
> import java.lang.Double;
> import java.lang.Short;
> import java.lang.Integer;
> import java.lang.Long;
> 
61c67
< A Value represents a single cell in a database table. In other words, it is the 
---
> A Value represents a single cell in a database table. In other words, it is the
84c90
<     public Value (ResultSet rs, int columnNumber, int type) 
---
>     public Value (ResultSet rs, int columnNumber, int type)
134c140
<                 if ( number == null ) 
---
>                 if ( number == null )
138c144
<                 else 
---
>                 else
180c186
<             
---
> 
434a441,482
>       * Get the value as a Integer Ojbect
>       *
>       * @return     an Integer
>       * @exception   DataSetException
>       */
>     public Integer asIntegerObj() throws DataSetException
>     {
> /*
>         try
>         {
>             if (isNull() || isInt())
>                 return ((Integer) valueObject);
>             else
>             {
>               return Integer.valueOf(asString());
>             }
>         }
>         catch (Exception e)
>         {
>             throw new DataSetException("Bad conversion: " + e.toString());
>         }
> */
>         try
>         {
>             if (isNull())
>                 return null;
>             else if (isInt())
>                 return ((Integer) valueObject);
>             else if (isString() || isDouble() || isFloat() || isBigDecimal() ||
>                     isLong() || isShort() || isByte() )
>                 return new Integer (asString());
>             else
>                 return null;
>         }
>         catch (Exception e)
>         {
>             throw new DataSetException("Illegal conversion: " +
>                     e.toString());
>         }
>     }
> 
>     /**
470a519,560
> 
>     /**
>       * Get the value as a Byte Object
>       *
>       * @return     a Byte
>       * @exception   DataSetException
>       */
>     public Byte asByteObj() throws DataSetException
>     {
> /*
>         try
>         {
>             if (isNull() || isByte())
>                 return ((Byte) valueObject);
>             else
>                 return Integer.valueOf(asString());
>         }
>         catch (Exception e)
>         {
>             throw new DataSetException("Bad conversion: " + e.toString());
>         }
> */
>         try
>         {
>             if (isNull())
>                 return null;
>             else if (isByte())
>                 return ((Byte) valueObject);
>             else if (isString() || isDouble() || isFloat() || isInt() ||
>                     isLong() || isShort() || isBigDecimal() )
>                 return new Byte(asString());
>             else
>                 return null;
>         }
>         catch (Exception e)
>         {
>             throw new DataSetException("Illegal conversion: " +
>                     e.toString());
>         }
>     }
> 
> 
530a621,660
>       * Get the value as a Short Object
>       *
>       * @return     a Short
>       * @exception   DataSetException
>       */
>     public Short asShortObj() throws DataSetException
>     {
> /*
>         try
>         {
>             if (isNull() || isShort())
>                 return ((Short) valueObject);
>             else
>                 return Integer.valueOf(asString());
>         }
>         catch (Exception e)
>         {
>             throw new DataSetException("Bad conversion: " + e.toString());
>         }
> */
>         try
>         {
>             if (isNull())
>                 return null;
>             else if (isShort())
>                 return ((Short) valueObject);
>             else if (isString() || isDouble() || isFloat() || isInt() ||
>                     isLong() || isBigDecimal() || isByte() )
>                 return new Short (asString());
>             else
>                 return null;
>         }
>         catch (Exception e)
>         {
>             throw new DataSetException("Illegal conversion: " +
>                     e.toString());
>         }
>     }
> 
>     /**
565a696,735
>       * Get the value as a Long Object
>       *
>       * @return     a Long
>       * @exception   DataSetException
>       */
>     public Long asLongObj() throws DataSetException
>     {
> /*
>         try
>         {
>             if (isNull() || isLong())
>                 return ((Long) valueObject);
>             else
>                 return Integer.valueOf(asString());
>         }
>         catch (Exception e)
>         {
>             throw new DataSetException("Bad conversion: " + e.toString());
>         }
> */
>         try
>         {
>             if (isNull())
>                 return null;
>             else if (isLong())
>                 return ((Long) valueObject);
>             else if (isString() || isDouble() || isFloat() || isInt() ||
>                     isBigDecimal() || isShort() || isByte() )
>                 return new Long (asString());
>             else
>                 return null;
>         }
>         catch (Exception e)
>         {
>             throw new DataSetException("Illegal conversion: " +
>                     e.toString());
>         }
>     }
> 
>     /**
599a770,811
> 
>     /**
>       * Get the value as a Double Object
>       *
>       * @return     a Double
>       * @exception   DataSetException
>       */
>     public Double asDoubleObj() throws DataSetException
>     {
> /*
>         try
>         {
>             if (isNull() || isDouble())
>                 return ((Double) valueObject);
>             else
>                 return Integer.valueOf(asString());
>         }
>         catch (Exception e)
>         {
>             throw new DataSetException("Bad conversion: " + e.toString());
>         }
> */
>         try
>         {
>             if (isNull())
>                 return null;
>             else if (isDouble())
>                 return ((Double) valueObject);
>             else if (isString() || isBigDecimal() || isFloat() || isInt() ||
>                     isLong() || isShort() || isByte() )
>                 return new Double (asString());
>             else
>                 return null;
>         }
>         catch (Exception e)
>         {
>             throw new DataSetException("Illegal conversion: " +
>                     e.toString());
>         }
>     }
> 
> 
634a847,889
> 
>     /**
>       * Get the value as a Float Obj
>       *
>       * @return     a Float
>       * @exception   DataSetException
>       */
>     public Float asFloatObj() throws DataSetException
>     {
> /*
>         try
>         {
>             if (isNull() || isFloat())
>                 return ((Float) valueObject);
>             else
>                 return Integer.valueOf(asString());
>         }
>         catch (Exception e)
>         {
>             throw new DataSetException("Bad conversion: " + e.toString());
>         }
> */
>         try
>         {
>             if (isNull())
>                 return null;
>             else if (isFloat())
>                 return ((Float) valueObject);
>             else if (isString() || isDouble() || isBigDecimal() || isInt() ||
>                     isLong() || isShort() || isByte() )
>                 return new Float(asString());
>             else
>                 return null;
>         }
>         catch (Exception e)
>         {
>             throw new DataSetException("Illegal conversion: " +
>                     e.toString());
>         }
>     }
> 
> 
> 
989c1244
<     
---
> 
997c1252
<                 value.equalsIgnoreCase ("yes") || 
---
>                 value.equalsIgnoreCase ("yes") ||

*****CVS exited normally with code 1*****
