[Melati-cvs] CVS: TableDef.java 1.84 1.85

[Tim P. <ti...@pa...>]

Update of /usr/cvsroot/melati/dsd-maven-plugin/src/main/java/org/melati/poem/prepro
In directory hanuman.paneris.org:/tmp/cvs-serv12752/src/main/java/org/melati/poem/prepro

Modified Files:
	TableDef.java 
Log Message:
Add ensure (and previous commit)

Index: TableDef.java
===================================================================
RCS file: /usr/cvsroot/melati/dsd-maven-plugin/src/main/java/org/melati/poem/prepro/TableDef.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- TableDef.java	23 Jul 2013 09:06:13 -0000	1.84
+++ TableDef.java	23 Jul 2013 09:27:44 -0000	1.85
@@ -54,8 +54,6 @@
 import java.io.Writer;
 import java.io.IOException;
 
-import org.paneris.bibliomania.Book;
-
 /**
  * A Table Definition holding information from a DSD.
  * 
@@ -661,12 +659,14 @@
       for (FieldDef f : requiredFields){
         if (seenOne)
           w.write(", ");
-        w.write(f.rawType);
+        w.write(f.typeShortName);
+        w.write(" ");
         w.write(f.name);
+        seenOne = true;
       }
       w.write(") {\n");
       //Book p = (Book)getTitleColumn().firstWhereEq(title);
-      w.write("  " 
+      w.write("    " 
           + tableNamingInfo.mainClassShortName() + " p = ("
           + tableNamingInfo.mainClassShortName() +")get"
           + uniqueNonNullableField.capitalisedName + "Column().firstWhereEq("
@@ -677,12 +677,13 @@
             + "      p = (" + tableNamingInfo.mainClassShortName() + ")newPersistent();\n");
       //      p.setTitle(title);
       for (FieldDef f : requiredFields){
-        w.write("    p.set");
+        w.write("      p.set");
         w.write(f.capitalisedName);
         w.write("(");
         w.write(f.name);
         w.write(");\n");
       }
+      w.write("    }\n");
       //      return (Book)getTitleColumn().ensure(p);
       w.write("    return (" + tableNamingInfo.mainClassShortName() 
           + ")get" + uniqueNonNullableField.capitalisedName + "Column().ensure(p);\n");