You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by fl...@apache.org on 2003/06/21 12:27:46 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb DBColumn.java
florianbruckner 2003/06/21 03:27:45
Modified: src/java/org/apache/ojb/tools/mapping/reversedb
DBColumn.java
Log:
implement XML generation with PrintWriter; getXML() still works and uses writeXML(java.io.PrintWriter)
getId() is deprecated and returns 0 now; Ids are not used for XML generation.
Revision Changes Path
1.5 +30 -8 db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb/DBColumn.java
Index: DBColumn.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb/DBColumn.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DBColumn.java 28 Jan 2003 21:42:53 -0000 1.4
+++ DBColumn.java 21 Jun 2003 10:27:45 -0000 1.5
@@ -71,7 +71,6 @@
private boolean isPrimaryKeyPart = false;
private boolean bAutoIncrement = false;
- private int id;
private boolean enabled = true;
@@ -85,7 +84,6 @@
dbMeta = pdbMeta;
aTable = paTable;
strColumnName = pstrColumnName;
- id = IdGeneratorSingleton.getId(getClass().getName(), aTable.getFQTableName());
this.strJavaFieldName = Character.toLowerCase(pstrColumnName.charAt(0))
+ pstrColumnName.substring(1);
iColumnType = piColumnType;
@@ -93,11 +91,6 @@
strColumnTypeName = pstrColumnTypeName;
}
- public int getId()
- {
- return this.id;
- }
-
public boolean getAutoIncrement()
{
return this.bAutoIncrement;
@@ -249,6 +242,10 @@
{
if (this.isTreeEnabled())
{
+ java.io.StringWriter sw = new java.io.StringWriter();
+ writeXML(new java.io.PrintWriter(sw));
+ return sw.getBuffer().toString();
+/*
String strReturn =
" <field-descriptor id=\"" + this.id + "\"" + System.getProperty("line.separator")
+ " name=\"" + this.strJavaFieldName + "\"" + System.getProperty("line.separator")
@@ -260,10 +257,25 @@
strReturn += " <autoincrement>true</autoincrement>" + System.getProperty("line.separator");
strReturn += " />";
return strReturn;
+ */
}
else return "";
+
}
+ public void writeXML(java.io.PrintWriter pw)
+ {
+ pw.println(" <field-descriptor ");
+ pw.println(" name=\"" + this.strJavaFieldName + "\"");
+ pw.println(" column=\"" + this.strColumnName + "\"");
+ pw.println(" jdbc-type=\"" + Utilities.hmJDBCTypeToName.get(new Integer(this.iColumnType)) + "\"" );
+ if (this.isPrimaryKeyPart())
+ pw.println( " primarykey=\"true\"" );
+ if (this.getAutoIncrement())
+ pw.println( " <autoincrement>true</autoincrement>");
+ pw.println(" />");
+ }
+
public void generateJava (java.io.File aFile, String strHeader, String strFooter) throws java.io.IOException, java.io.FileNotFoundException
{
throw new UnsupportedOperationException("Generate Java on DBColumn is not allowed");
@@ -308,11 +320,22 @@
else return "";
}
+ /**
+ * @deprecated
+ */
+ public int getId()
+ {
+ return 0;
+ }
}
/***************************** Changelog *****************************
// $Log$
+// Revision 1.5 2003/06/21 10:27:45 florianbruckner
+// implement XML generation with PrintWriter; getXML() still works and uses writeXML(java.io.PrintWriter)
+// getId() is deprecated and returns 0 now; Ids are not used for XML generation.
+//
// Revision 1.4 2003/01/28 21:42:53 florianbruckner
// update XML generation
//