db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpoes...@apache.org
Subject cvs commit: db-torque/src/java/org/apache/torque/map TableMap.java
Date Sat, 23 Aug 2003 13:18:54 GMT
mpoeschl    2003/08/23 06:18:54

  Modified:    src/java/org/apache/torque/map TableMap.java
  Log:
  remove private method firstLetterCaps() - use StringUtils
  
  Revision  Changes    Path
  1.13      +8 -20     db-torque/src/java/org/apache/torque/map/TableMap.java
  
  Index: TableMap.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/java/org/apache/torque/map/TableMap.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- TableMap.java	12 Dec 2002 12:39:28 -0000	1.12
  +++ TableMap.java	23 Aug 2003 13:18:54 -0000	1.13
  @@ -3,7 +3,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -57,6 +57,9 @@
   import java.util.Iterator;
   import java.util.Hashtable;
   import java.util.StringTokenizer;
  +
  +import org.apache.commons.lang.StringUtils;
  +
   import org.apache.torque.adapter.IDMethod;
   import org.apache.torque.oid.IdGenerator;
   
  @@ -69,9 +72,7 @@
    */
   public class TableMap implements IDMethod, java.io.Serializable
   {
  -    /**
  -     * The list of valid ID generation methods.
  -     */
  +    /** The list of valid ID generation methods. */
       protected static final String[] VALID_ID_METHODS =
       {
           NATIVE, AUTO_INCREMENT, SEQUENCE, ID_BROKER, NO_ID_METHOD
  @@ -551,22 +552,9 @@
           StringTokenizer st = new StringTokenizer(tmp, "_");
           while (st.hasMoreTokens())
           {
  -            String element = (String) st.nextElement();
  -            out.append (firstLetterCaps(element));
  +            String element = ((String) st.nextElement()).toLowerCase();
  +            out.append (StringUtils.capitalise(element));
           }
           return out.toString();
  -    }
  -
  -    /**
  -     * Makes the first letter caps and the rest lowercase.
  -     *
  -     * @param data A String.
  -     * @return A String with data processed.
  -     */
  -    private final String firstLetterCaps(String data)
  -    {
  -        String firstLetter = data.substring(0, 1).toUpperCase();
  -        String restLetters = data.substring(1).toLowerCase();
  -        return firstLetter + restLetters;
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message