dlr 01/09/16 12:00:28
Modified: src/java/org/apache/torque/engine/database/model Column.java
Database.java JavaNameGenerator.java
NameGenerator.java Table.java
Log:
clean up
Revision Changes Path
1.12 +4 -3
jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/Column.java
Index: Column.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/Column.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- Column.java 2001/09/16 18:48:03 1.11
+++ Column.java 2001/09/16 19:00:28 1.12
@@ -70,7 +70,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: Column.java,v 1.11 2001/09/16 18:48:03 dlr Exp $
+ * @author <a href="mailto:byron_foster@[EMAIL PROTECTED]>Byron Foster</a>
+ * @version $Id: Column.java,v 1.12 2001/09/16 19:00:28 dlr Exp $
*/
public class Column
{
@@ -159,8 +160,8 @@
nameConversion = attrib.getValue("nameConversion");
if (nameConversion == null)
{
- nameConversion =
- parentTable.getDatabase().getDefaultNameConversion();
+ nameConversion =
+ parentTable.getDatabase().getDefaultNameConversion();
}
//Primary Key
1.5 +9 -8
jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/Database.java
Index: Database.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/Database.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- Database.java 2001/09/16 18:48:03 1.4
+++ Database.java 2001/09/16 19:00:28 1.5
@@ -75,7 +75,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Martin Poeschl</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Daniel Rall</a>
- * @version $Id: Database.java,v 1.4 2001/09/16 18:48:03 dlr Exp $
+ * @author <a href="mailto:byron_foster@[EMAIL PROTECTED]>Byron Foster</a>
+ * @version $Id: Database.java,v 1.5 2001/09/16 19:00:28 dlr Exp $
*/
public class Database
{
@@ -112,9 +113,8 @@
defaultNameConversion = attrib.getValue("defaultNameConversion");
if (defaultNameConversion == null)
{
- defaultNameConversion = NameGenerator.CONV_METHOD_UNDERSCORE;
+ defaultNameConversion = NameGenerator.CONV_METHOD_UNDERSCORE;
}
-
}
/**
@@ -188,7 +188,7 @@
/**
* Set the value of basePeer.
- * @param v Value to assign to basePeer.
+ * @param v Value to assign to basePeer.
*/
public void setBasePeer(String v)
{
@@ -206,7 +206,7 @@
/**
* Set the value of defaultIdMethod.
- * @param v Value to assign to defaultIdMethod.
+ * @param v Value to assign to defaultIdMethod.
*/
public void setDefaultIdMethod(String v)
{
@@ -216,8 +216,9 @@
/**
* Get the value of defaultNameConversion which specifies the
* method for converting schema names for table and column
- * to java names..
- * @return value of defaultNameConversion. */
+ * to Java names.
+ * @return The default naming conversion used by this database.
+ */
public String getDefaultNameConversion()
{
return defaultNameConversion;
@@ -225,7 +226,7 @@
/**
* Set the value of defaultNameConversion.
- * @param v Value to assign to defaultNameConversion.
+ * @param v The default naming conversion for this database to use.
*/
public void setDefaultNameConversion(String v)
{
1.3 +24 -23
jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/JavaNameGenerator.java
Index: JavaNameGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/JavaNameGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- JavaNameGenerator.java 2001/09/16 18:48:03 1.2
+++ JavaNameGenerator.java 2001/09/16 19:00:28 1.3
@@ -66,7 +66,8 @@
* A <code>NameGenerator</code> implementation for Java-esque names.
*
* @author <a href="mailto:[EMAIL PROTECTED]>Daniel Rall</a>
- * @version $Id: JavaNameGenerator.java,v 1.2 2001/09/16 18:48:03 dlr Exp $
+ * @author <a href="mailto:byron_foster@[EMAIL PROTECTED]>Byron Foster</a>
+ * @version $Id: JavaNameGenerator.java,v 1.3 2001/09/16 19:00:28 dlr Exp $
*/
public class JavaNameGenerator implements NameGenerator
{
@@ -74,19 +75,19 @@
* <code>inputs</code> should consist of two elements, the
* original name of the database element and the method for
* generating the name. There are currently three methods:
- * CONV_METHOD_NOCHANGE - xml names are converted directly to java
- * names without modification. CONV_METHOD_UNDERSCORE Will
- * capitalize the first letter, remove underscores, and capitalize
- * each letter before an underscore. All other letters are
- * lowercased. "javaname" works the same as the
- * CONV_METHOD_JAVANAME method but will not lowercase any
- * characters.
+ * <code>CONV_METHOD_NOCHANGE</code> - xml names are converted
+ * directly to java names without modification.
+ * <code>CONV_METHOD_UNDERSCORE</code> will capitalize the first
+ * letter, remove underscores, and capitalize each letter before
+ * an underscore. All other letters are lowercased. "javaname"
+ * works the same as the <code>CONV_METHOD_JAVANAME</code> method
+ * but will not lowercase any characters.
*
* @param inputs list expected to contain two parameters, element
* 0 contains name to convert, element 1 contains method for conversion.
- * @return generated name.
- * @see org.apache.torque.engine.database.model.NameGenerator */
-
+ * @return The generated name.
+ * @see org.apache.torque.engine.database.model.NameGenerator
+ */
public String generateName(List inputs)
{
String schemaName = (String)inputs.get(0);
@@ -114,19 +115,20 @@
return javaName;
}
-
+
/**
* Converts a database schema name to java object name. Removes
- * STD_SEPARATOR_CHAR, capitilizes first letter of name and each
- * letter after the STD_SEPERATOR, converts the rest of the
- * letters to lowercase.
+ * <code>STD_SEPARATOR_CHAR</code>, capitilizes first letter of
+ * name and each letter after the <code>STD_SEPERATOR</code>,
+ * converts the rest of the letters to lowercase.
+ *
* @param schemaName name to be converted.
* @return converted name.
* @see org.apache.torque.engine.database.model.NameGenerator
* @see #underscoreMethod(String)
*/
- public String underscoreMethod(String schemaName)
+ protected String underscoreMethod(String schemaName)
{
StringBuffer name = new StringBuffer();
StringTokenizer tok = new StringTokenizer
@@ -138,18 +140,18 @@
}
return name.toString();
}
-
+
/**
* Converts a database schema name to java object name. Operates
* same as underscoreMethod but does not convert anything to
* lowercase.
+ *
* @param schemaName name to be converted.
* @return converted name.
* @see org.apache.torque.engine.database.model.NameGenerator
* @see #underscoreMethod(String)
*/
-
- public String javanameMethod(String schemaName)
+ protected String javanameMethod(String schemaName)
{
StringBuffer name = new StringBuffer();
StringTokenizer tok = new StringTokenizer
@@ -165,12 +167,11 @@
/**
* Converts a database schema name to java object name. In this
* case no conversion is made.
+ *
+ * @return The <code>name</code> parameter, unchanged.
*/
-
- public String nochangeMethod(String name)
+ protected final String nochangeMethod(String name)
{
return name;
}
-
-
}
1.6 +13 -12
jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/NameGenerator.java
Index: NameGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/NameGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- NameGenerator.java 2001/09/16 18:48:03 1.5
+++ NameGenerator.java 2001/09/16 19:00:28 1.6
@@ -62,7 +62,8 @@
* The generic interface to a name generation algorithm.
*
* @author <a href="mailto:[EMAIL PROTECTED]>Daniel Rall</a>
- * @version $Id: NameGenerator.java,v 1.5 2001/09/16 18:48:03 dlr Exp $
+ * @author <a href="mailto:byron_foster@[EMAIL PROTECTED]>Byron Foster</a>
+ * @version $Id: NameGenerator.java,v 1.6 2001/09/16 19:00:28 dlr Exp $
*/
public interface NameGenerator
{
@@ -74,28 +75,28 @@
/**
* Traditional method for converting schema table and column names
- * to java names. The CONV_METHOD_XXX constants define how names
- * for columns and tables in the database schema will be converted
- * to java source names.
- * @see JavaNameGenerator#underscoreMethod(String) */
-
+ * to java names. The <code>CONV_METHOD_XXX</code> constants
+ * define how names for columns and tables in the database schema
+ * will be converted to java source names.
+ *
+ * @see JavaNameGenerator#underscoreMethod(String)
+ */
public static final String CONV_METHOD_UNDERSCORE = "underscore";
/**
- * Similar to CONV_METHOD_UNDERSCORE except nothing is converted
- * to lowercase.
+ * Similar to {@link #CONV_METHOD_UNDERSCORE} except nothing is
+ * converted to lowercase.
+ *
* @see JavaNameGenerator#javanameMethod(String)
*/
-
public static final String CONV_METHOD_JAVANAME = "javaname";
/**
* Specifies no modification when converting from a schema column
- * or table name to a java name. to java names.
+ * or table name to a java name.
*/
-
public static final String CONV_METHOD_NOCHANGE = "nochange";
-
+
/**
* Given a list of <code>String</code> objects, implements an
* algorithm which produces a name.
1.14 +3 -3
jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/Table.java
Index: Table.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/Table.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- Table.java 2001/09/16 18:48:03 1.13
+++ Table.java 2001/09/16 19:00:28 1.14
@@ -74,7 +74,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]>Martin Poeschl</a>
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Daniel Rall</a>
- * @version $Id: Table.java,v 1.13 2001/09/16 18:48:03 dlr Exp $
+ * @author <a href="mailto:byron_foster@[EMAIL PROTECTED]>Byron Foster</a>
+ * @version $Id: Table.java,v 1.14 2001/09/16 19:00:28 dlr Exp $
*/
public class Table implements IDMethod
{
@@ -141,9 +142,8 @@
nameConversion = attrib.getValue("nameConversion");
if (nameConversion == null)
{
- nameConversion = getDatabase().getDefaultNameConversion();
+ nameConversion = getDatabase().getDefaultNameConversion();
}
-
if ("null".equals(idMethod))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
