cvs commit: db-torque/src/generator/src/java/org/apache/torque/engine/database/model Column.java

[mpoeschl]

mpoeschl    2003/12/03 11:16:35

  Modified:    src/generator/src/java/org/apache/torque/engine/database/model
                        Column.java
  Log:
  checkstyle fixes
  
  Revision  Changes    Path
  1.17      +14 -15    
db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Column.java
  
  Index: Column.java
  ===================================================================
  RCS file: 
/home/cvs/db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Column.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Column.java       3 Dec 2003 19:05:08 -0000       1.16
  +++ Column.java       3 Dec 2003 19:16:35 -0000       1.17
  @@ -612,7 +612,7 @@
   
       /**
        * Utility method to see if the column is a string
  -     * 
  +     *
        * @deprecated will be removed after the 3.2 release
        */
       public boolean isString()
  @@ -627,8 +627,7 @@
       public boolean needEscapedValue()
       {
           String torqueType = domain.getType().getName();
  -        return (torqueType != null) &&
  -                ( torqueType.equals("VARCHAR")
  +        return (torqueType != null) && (torqueType.equals("VARCHAR")
                           || torqueType.equals("LONGVARCHAR")
                           || torqueType.equals("DATE")
                           || torqueType.equals("DATETIME")
  @@ -677,7 +676,7 @@
           {
               result.append(" scale=\"").append(domain.getScale()).append('"');
           }
  -        
  +
           if (domain.getDefaultValue() != null)
           {
               result.append(" 
default=\"").append(domain.getDefaultValue()).append('"');
  @@ -726,11 +725,11 @@
       {
           domain.setScale(newScale);
       }
  -    
  +
       /**
        * Return the size and scale in brackets for use in an sql schema.
  -     * 
  -     * @return size and scale or an empty String if there are no values 
  +     *
  +     * @return size and scale or an empty String if there are no values
        *         available.
        */
       public String printSize()
  @@ -802,27 +801,27 @@
               domain.setSize(size);
           }
   
  -        if (tn.indexOf ("CHAR") != -1)
  +        if (tn.indexOf("CHAR") != -1)
           {
               domain.setType(SchemaType.VARCHAR);
           }
  -        else if (tn.indexOf ("INT") != -1)
  +        else if (tn.indexOf("INT") != -1)
           {
               domain.setType(SchemaType.INTEGER);
           }
  -        else if (tn.indexOf ("FLOAT") != -1)
  +        else if (tn.indexOf("FLOAT") != -1)
           {
               domain.setType(SchemaType.FLOAT);
           }
  -        else if (tn.indexOf ("DATE") != -1)
  +        else if (tn.indexOf("DATE") != -1)
           {
               domain.setType(SchemaType.DATE);
           }
  -        else if (tn.indexOf ("TIME") != -1)
  +        else if (tn.indexOf("TIME") != -1)
           {
               domain.setType(SchemaType.TIMESTAMP);
           }
  -        else if (tn.indexOf ("BINARY") != -1)
  +        else if (tn.indexOf("BINARY") != -1)
           {
               domain.setType(SchemaType.LONGVARBINARY);
           }
  @@ -939,7 +938,7 @@
               || (s == null && !"object".equals(
                  getTable().getDatabase().getDefaultJavaType()));
       }
  -    
  +
       /**
        * @return Returns the domain.
        */
  
  
  

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