You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2001/10/23 00:30:40 UTC
cvs commit: jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model Database.java Table.java
dlr 01/10/22 15:30:40
Modified: src/java/org/apache/torque/engine/database/model
Database.java Table.java
Log:
Patch by Byron Foster <bf...@base2.cc>:
defaultNameConversion -> defaultJavaNamingMethod
Revision Changes Path
1.6 +11 -11 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.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- Database.java 2001/09/16 19:00:28 1.5
+++ Database.java 2001/10/22 22:30:39 1.6
@@ -76,7 +76,7 @@
* @author <a href="mailto:mpoeschl@marmot.at>Martin Poeschl</a>
* @author <a href="mailto:dlr@collab.net>Daniel Rall</a>
* @author <a href="mailto:byron_foster@byron_foster@yahoo.com>Byron Foster</a>
- * @version $Id: Database.java,v 1.5 2001/09/16 19:00:28 dlr Exp $
+ * @version $Id: Database.java,v 1.6 2001/10/22 22:30:39 dlr Exp $
*/
public class Database
{
@@ -88,7 +88,7 @@
private String baseClass;
private String basePeer;
private String defaultIdMethod;
- private String defaultNameConversion;
+ private String defaultJavaNamingMethod;
private AppData dbParent;
private Hashtable tablesByName = new Hashtable();
private Hashtable tablesByJavaName = new Hashtable();
@@ -110,10 +110,10 @@
baseClass = attrib.getValue("baseClass");
basePeer = attrib.getValue("basePeer");
defaultIdMethod = attrib.getValue("defaultIdMethod");
- defaultNameConversion = attrib.getValue("defaultNameConversion");
- if (defaultNameConversion == null)
+ defaultJavaNamingMethod = attrib.getValue("defaultJavaNamingMethod");
+ if (defaultJavaNamingMethod == null)
{
- defaultNameConversion = NameGenerator.CONV_METHOD_UNDERSCORE;
+ defaultJavaNamingMethod = NameGenerator.CONV_METHOD_UNDERSCORE;
}
}
@@ -214,23 +214,23 @@
}
/**
- * Get the value of defaultNameConversion which specifies the
+ * Get the value of defaultJavaNamingMethod which specifies the
* method for converting schema names for table and column
* to Java names.
* @return The default naming conversion used by this database.
*/
- public String getDefaultNameConversion()
+ public String getDefaultJavaNamingMethod()
{
- return defaultNameConversion;
+ return defaultJavaNamingMethod;
}
/**
- * Set the value of defaultNameConversion.
+ * Set the value of defaultJavaNamingMethod.
* @param v The default naming conversion for this database to use.
*/
- public void setDefaultNameConversion(String v)
+ public void setDefaultJavaNamingMethod(String v)
{
- this.defaultNameConversion = v;
+ this.defaultJavaNamingMethod = v;
}
/**
1.15 +6 -6 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.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- Table.java 2001/09/16 19:00:28 1.14
+++ Table.java 2001/10/22 22:30:39 1.15
@@ -75,7 +75,7 @@
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
* @author <a href="mailto:dlr@collab.net>Daniel Rall</a>
* @author <a href="mailto:byron_foster@byron_foster@yahoo.com>Byron Foster</a>
- * @version $Id: Table.java,v 1.14 2001/09/16 19:00:28 dlr Exp $
+ * @version $Id: Table.java,v 1.15 2001/10/22 22:30:39 dlr Exp $
*/
public class Table implements IDMethod
{
@@ -90,7 +90,7 @@
private String name;
private String javaName;
private String idMethod;
- private String nameConversion;
+ private String javaNamingMethod;
private Database tableParent;
private List referrers;
private List foreignTableNames;
@@ -139,10 +139,10 @@
// retrieves the method for converting from specified name to
// a java name.
- nameConversion = attrib.getValue("nameConversion");
- if (nameConversion == null)
+ javaNamingMethod = attrib.getValue("javaNamingMethod");
+ if (javaNamingMethod == null)
{
- nameConversion = getDatabase().getDefaultNameConversion();
+ javaNamingMethod = getDatabase().getDefaultJavaNamingMethod();
}
if ("null".equals(idMethod))
@@ -594,7 +594,7 @@
{
List inputs = new ArrayList(2);
inputs.add(name);
- inputs.add(nameConversion);
+ inputs.add(javaNamingMethod);
try
{
javaName = NameFactory.generateName(NameFactory.JAVA_GENERATOR,
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org