mpoeschl 02/05/07 09:51:00
Modified: src/java/org/apache/torque/map ColumnMap.java
DatabaseMap.java TableMap.java
Log:
coding conventions
Revision Changes Path
1.4 +13 -10
jakarta-turbine-torque/src/java/org/apache/torque/map/ColumnMap.java
Index: ColumnMap.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/map/ColumnMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ColumnMap.java 19 Sep 2001 22:25:31 -0000 1.3
+++ ColumnMap.java 7 May 2002 16:51:00 -0000 1.4
@@ -58,7 +58,7 @@
* ColumnMap is used to model a column of a table in a database.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: ColumnMap.java,v 1.3 2001/09/19 22:25:31 jon Exp $
+ * @version $Id: ColumnMap.java,v 1.4 2002/05/07 16:51:00 mpoeschl Exp $
*/
public class ColumnMap implements java.io.Serializable
{
@@ -181,8 +181,10 @@
if ( fullyQualifiedName != null &&
fullyQualifiedName.length() > 0)
{
- relatedTableName = fullyQualifiedName.substring( 0,
fullyQualifiedName.indexOf('.') );
- relatedColumnName = fullyQualifiedName.substring(
fullyQualifiedName.indexOf('.')+1 );
+ relatedTableName = fullyQualifiedName.substring(
+ 0, fullyQualifiedName.indexOf('.'));
+ relatedColumnName = fullyQualifiedName.substring(
+ fullyQualifiedName.indexOf('.') + 1);
}
else
{
@@ -197,13 +199,10 @@
* @param tableName The name of the table that is foreign.
* @param columnName The name of the column that is foreign.
*/
- public void setForeignKey(String tableName,
- String columnName)
+ public void setForeignKey(String tableName, String columnName)
{
- if ( tableName != null &&
- tableName.length() > 0 &&
- columnName != null &&
- columnName.length() > 0 )
+ if ( tableName != null && tableName.length() > 0 && columnName != null
+ && columnName.length() > 0 )
{
relatedTableName = tableName;
relatedColumnName = columnName;
@@ -263,9 +262,13 @@
public boolean isForeignKey()
{
if ( relatedTableName != null && relatedTableName.length() > 0)
+ {
return true;
+ }
else
+ {
return false;
+ }
}
/**
@@ -275,7 +278,7 @@
*/
public String getRelatedName()
{
- return relatedTableName+"."+relatedColumnName;
+ return relatedTableName + "." + relatedColumnName;
}
/**
1.6 +3 -3
jakarta-turbine-torque/src/java/org/apache/torque/map/DatabaseMap.java
Index: DatabaseMap.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/map/DatabaseMap.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DatabaseMap.java 29 Apr 2002 19:47:46 -0000 1.5
+++ DatabaseMap.java 7 May 2002 16:51:00 -0000 1.6
@@ -66,7 +66,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: DatabaseMap.java,v 1.5 2002/04/29 19:47:46 jon Exp $
+ * @version $Id: DatabaseMap.java,v 1.6 2002/05/07 16:51:00 mpoeschl Exp $
*/
public class DatabaseMap implements java.io.Serializable
{
@@ -104,7 +104,7 @@
public DatabaseMap(String name, int numberOfTables)
{
this.name = name;
- tables = new Hashtable( (int)(1.25*numberOfTables) + 1 );
+ tables = new Hashtable((int) (1.25 * numberOfTables) + 1);
idGenerators = new HashMap(6);
}
@@ -285,6 +285,6 @@
*/
IdGenerator getIdGenerator(String type)
{
- return (IdGenerator)idGenerators.get(type);
+ return (IdGenerator) idGenerators.get(type);
}
}
1.8 +10 -12
jakarta-turbine-torque/src/java/org/apache/torque/map/TableMap.java
Index: TableMap.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/map/TableMap.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TableMap.java 29 Apr 2002 19:47:46 -0000 1.7
+++ TableMap.java 7 May 2002 16:51:00 -0000 1.8
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.Date;
import java.util.Iterator;
import java.util.Hashtable;
import java.util.StringTokenizer;
@@ -66,7 +65,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: TableMap.java,v 1.7 2002/04/29 19:47:46 jon Exp $
+ * @version $Id: TableMap.java,v 1.8 2002/05/07 16:51:00 mpoeschl Exp $
*/
public class TableMap implements IDMethod, java.io.Serializable
{
@@ -122,7 +121,7 @@
{
this.tableName = tableName;
dbMap = containingDB;
- columns = new Hashtable( (int)(1.25*numberOfColumns) + 1 );
+ columns = new Hashtable( (int) (1.25 * numberOfColumns) + 1 );
}
/**
@@ -178,7 +177,7 @@
{
if ( name.indexOf('.') > 0 )
{
- name = name.substring( name.indexOf('.')+1 );
+ name = name.substring( name.indexOf('.') + 1 );
}
return columns.containsKey(name);
}
@@ -205,10 +204,9 @@
Iterator it = columns.values().iterator();
while (it.hasNext())
{
- Object theType = ((ColumnMap)it.next()).getType();
- if (! ( theType instanceof String ||
- theType instanceof Number ||
- theType instanceof java.util.Date ) )
+ Object theType = ((ColumnMap) it.next()).getType();
+ if (!(theType instanceof String || theType instanceof Number
+ || theType instanceof java.util.Date ) )
{
return true;
}
@@ -474,17 +472,17 @@
// SCARAB_PROJECT.
if (name.indexOf('.') > 0 && name.indexOf(getName()) != -1)
{
- name = name.substring(getName().length()+1);
+ name = name.substring(getName().length() + 1);
}
if ( fkTable != null &&
fkTable.length() > 0 &&
- fkColumn !=null &&
+ fkColumn != null &&
fkColumn.length() > 0 )
{
if (fkColumn.indexOf('.') > 0 &&
fkColumn.indexOf(fkTable) != -1)
{
- fkColumn = fkColumn.substring(fkTable.length()+1);
+ fkColumn = fkColumn.substring(fkTable.length() + 1);
}
}
ColumnMap col = new ColumnMap(name, this);
@@ -606,7 +604,7 @@
*/
private final String firstLetterCaps ( String data )
{
- String firstLetter = data.substring(0,1).toUpperCase();
+ String firstLetter = data.substring(0, 1).toUpperCase();
String restLetters = data.substring(1).toLowerCase();
return firstLetter + restLetters;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
