cvs diff Column.java (in directory D:\CVS_projects\repositoryJakarta\jakarta-turbine-torque\src\java\org\apache\torque\engine\database\model\)
Index: Column.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/Column.java,v
retrieving revision 1.15
diff -r1.15 Column.java
73,74c73
<  * @author <a href="mailto:byron_foster@byron_foster@yahoo.com>Byron Foster</a>
<  * @version $Id: Column.java,v 1.15 2001/11/08 17:20:52 mpoeschl Exp $
---
>  * @version $Id: Column.java,v 1.10 2001/08/22 21:26:12 dlr Exp $
80d78
<     private String javaNamingMethod;
102c100
<     /** class name to do input validation on this column */
---
>     // class name to do input validation on this column
158,166d155
<         // retrieves the method for converting from specified name to
<         // a java name.
<         javaNamingMethod = attrib.getValue("javaNamingMethod");
<         if (javaNamingMethod == null)
<         {
<             javaNamingMethod =
<                 parentTable.getDatabase().getDefaultJavaNamingMethod();
<         }
< 
233c222
<             List inputs = new ArrayList(2);
---
>             List inputs = new ArrayList(1);
235d223
<             inputs.add(javaNamingMethod);
411c399,400
<      * Utility method to determine if this column is a foreign key.
---
>      * Utility method to determine if this column
>      * is a foreign key.
453,454c442,444
<      * Utility method to get the related table of this column if it is a foreign
<      * key or part of a foreign key
---
>      * Utility method to get the related table of this
>      * column if it is a foreign key or part of a foreign
>      * key
464,465c454,456
<      * Utility method to get the related column of this local column if this
<      * column is a foreign key or part of a foreign key.
---
>      * Utility method to get the related column of this
>      * local column if this column is a foreign key or
>      * part of a foreign key.
481c472,473
<      * Adds the foreign key from another table that refers to this column.
---
>      * Adds the foreign key from another table that refers to
>      * this column.
541c533,534
<      * String representation of the column. This is an xml representation.
---
>      * String representation of the column. This
>      * is an xml representation.
609c602,603
<      * schema if the type is String.  Otherwise return an empty string
---
>      * schema if the type is String.  Otherwise return
>      * an empty string
641c635,636
<      * Set a string that will give this column a default value.
---
>      * Set a string that will give this column
>      * a default value.
643,644c638,639
<     public void setDefaultValue(String def)
<     {
---
>      public void setDefaultValue(String def)
>      {
646c641
<     }
---
>      }
649c644,645
<      * Get a string that will give this column a default value.
---
>      * Get a string that will give this column
>      * a default value.
651,652c647,648
<     public String getDefaultValue()
<     {
---
>      public String getDefaultValue()
>      {
654c650
<     }
---
>      }
657,658c653,654
<      * Returns the class name to do input validation
<      */
---
>     * Returns the class name to do input validation
>     */
665,666c661,663
<      * Return auto increment/sequence string for the target database. We need to
<      * pass in the props for the target database!
---
>      * Return auto increment/sequence string for
>      * the target database. We need to pass in the
>      * props for the target database!
668,669c665,666
<     public boolean isAutoIncrement()
<     {
---
>      public boolean isAutoIncrement()
>      {
671c668
<     }
---
>      }
674c671
<      * Set the auto increment value.
---
>      * Set the auto increment value
691c688
<         if (size != null)
---
>         if (this.size != null)
769c766,772
<                       || jtype.equals("double") )
---
>                       || jtype.equals("double")
>                       || jtype.equals("Short")
>                       || jtype.equals("Integer")
>                       || jtype.equals("Long")
>                       || jtype.equals("Byte")
>                       || jtype.equals("Float")
>                       || jtype.equals("Double") )
780c783,784
<      * Return Village asX() method which corresponds to the JDBC type
---
>      * Return Village asX() method which
>      * corresponds to the JDBC type
794c798,804
<                  || jtype.equals("double") )
---
>                  || jtype.equals("double")
>                  || jtype.equals("Short")
>                  || jtype.equals("Integer")
>                  || jtype.equals("Long")
>                  || jtype.equals("Byte")
>                  || jtype.equals("Float")
>                  || jtype.equals("Double") )

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