From: Tim P. <ti...@pa...> - 2013-10-11 09:41:55
|
Update of /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated In directory hanuman.paneris.org:/tmp/cvs-serv18148 Modified Files: CapabilityTableBase.java ColumnInfoTableBase.java GroupCapabilityTableBase.java GroupMembershipTableBase.java GroupTableBase.java SettingTableBase.java TableCategoryTableBase.java TableInfoTableBase.java UserTableBase.java ValueInfoTableBase.java Log Message: Regenerated: typo Index: TableInfoTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/TableInfoTableBase.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- TableInfoTableBase.java 23 May 2012 23:13:11 -0000 1.28 +++ TableInfoTableBase.java 11 Oct 2013 09:07:12 -0000 1.29 @@ -962,7 +962,7 @@ * Retrieve the <code>TableInfo</code> as a <code>TableInfo</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public TableInfo getTableInfoObject(Integer troid) { @@ -1007,5 +1007,21 @@ public int defaultDisplayOrder() { return 3010; } + + /** + * @return a newly created or existing TableInfo + **/ + public TableInfo ensure(String name, String displayname, Integer displayorder, Boolean seqcached, TableCategory category) { + TableInfo p = (TableInfo)getNameColumn().firstWhereEq(name); + if (p == null) { + p = (TableInfo)newPersistent(); + p.setName(name); + p.setDisplayname(displayname); + p.setDisplayorder(displayorder); + p.setSeqcached(seqcached); + p.setCategory(category); + } + return (TableInfo)getNameColumn().ensure(p); + } } Index: GroupCapabilityTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/GroupCapabilityTableBase.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- GroupCapabilityTableBase.java 23 May 2012 23:13:11 -0000 1.22 +++ GroupCapabilityTableBase.java 11 Oct 2013 09:07:12 -0000 1.23 @@ -279,7 +279,7 @@ * Retrieve the <code>GroupCapability</code> as a <code>GroupCapability</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public GroupCapability getGroupCapabilityObject(Integer troid) { Index: GroupMembershipTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/GroupMembershipTableBase.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- GroupMembershipTableBase.java 23 May 2012 23:13:11 -0000 1.24 +++ GroupMembershipTableBase.java 11 Oct 2013 09:07:12 -0000 1.25 @@ -304,7 +304,7 @@ * Retrieve the <code>GroupMembership</code> as a <code>GroupMembership</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public GroupMembership getGroupMembershipObject(Integer troid) { Index: GroupTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/GroupTableBase.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- GroupTableBase.java 23 May 2012 23:13:11 -0000 1.22 +++ GroupTableBase.java 11 Oct 2013 09:07:12 -0000 1.23 @@ -219,7 +219,7 @@ * Retrieve the <code>Group</code> as a <code>Group</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public Group getGroupObject(Integer troid) { @@ -256,5 +256,17 @@ public int defaultDisplayOrder() { return 2020; } + + /** + * @return a newly created or existing Group + **/ + public Group ensure(String name) { + Group p = (Group)getNameColumn().firstWhereEq(name); + if (p == null) { + p = (Group)newPersistent(); + p.setName(name); + } + return (Group)getNameColumn().ensure(p); + } } Index: TableCategoryTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/TableCategoryTableBase.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- TableCategoryTableBase.java 23 May 2012 23:13:11 -0000 1.22 +++ TableCategoryTableBase.java 11 Oct 2013 09:07:12 -0000 1.23 @@ -215,7 +215,7 @@ * Retrieve the <code>TableCategory</code> as a <code>TableCategory</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public TableCategory getTableCategoryObject(Integer troid) { @@ -260,5 +260,17 @@ public int defaultDisplayOrder() { return 3030; } + + /** + * @return a newly created or existing TableCategory + **/ + public TableCategory ensure(String name) { + TableCategory p = (TableCategory)getNameColumn().firstWhereEq(name); + if (p == null) { + p = (TableCategory)newPersistent(); + p.setName(name); + } + return (TableCategory)getNameColumn().ensure(p); + } } Index: ColumnInfoTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/ColumnInfoTableBase.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- ColumnInfoTableBase.java 23 May 2012 23:13:11 -0000 1.29 +++ ColumnInfoTableBase.java 11 Oct 2013 09:07:12 -0000 1.30 @@ -944,7 +944,7 @@ * Retrieve the <code>ColumnInfo</code> as a <code>ColumnInfo</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public ColumnInfo getColumnInfoObject(Integer troid) { Index: CapabilityTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/CapabilityTableBase.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- CapabilityTableBase.java 23 May 2012 23:13:11 -0000 1.22 +++ CapabilityTableBase.java 11 Oct 2013 09:07:12 -0000 1.23 @@ -219,7 +219,7 @@ * Retrieve the <code>Capability</code> as a <code>Capability</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public Capability getCapabilityObject(Integer troid) { @@ -256,5 +256,17 @@ public int defaultDisplayOrder() { return 2030; } + + /** + * @return a newly created or existing Capability + **/ + public Capability ensure(String name) { + Capability p = (Capability)getNameColumn().firstWhereEq(name); + if (p == null) { + p = (Capability)newPersistent(); + p.setName(name); + } + return (Capability)getNameColumn().ensure(p); + } } Index: UserTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/UserTableBase.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- UserTableBase.java 23 May 2012 23:13:11 -0000 1.25 +++ UserTableBase.java 11 Oct 2013 09:07:12 -0000 1.26 @@ -364,7 +364,7 @@ * Retrieve the <code>User</code> as a <code>User</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public User getUserObject(Integer troid) { @@ -401,5 +401,19 @@ public int defaultDisplayOrder() { return 2010; } + + /** + * @return a newly created or existing User + **/ + public User ensure(String name, String login, String password) { + User p = (User)getLoginColumn().firstWhereEq(login); + if (p == null) { + p = (User)newPersistent(); + p.setName(name); + p.setLogin(login); + p.setPassword(password); + } + return (User)getLoginColumn().ensure(p); + } } Index: SettingTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/SettingTableBase.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- SettingTableBase.java 16 Nov 2012 10:47:35 -0000 1.28 +++ SettingTableBase.java 11 Oct 2013 09:07:12 -0000 1.29 @@ -191,7 +191,6 @@ ((Setting)g).setValue((String)cooked); } - @SuppressWarnings("unchecked") public Field<String> asField(Persistent g) { return ((Setting)g).getValueField(); } @@ -267,7 +266,7 @@ * Retrieve the <code>Setting</code> as a <code>Setting</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public Setting getSettingObject(Integer troid) { @@ -308,5 +307,17 @@ public int defaultDisplayOrder() { return 3040; } + + /** + * @return a newly created or existing Setting + **/ + public Setting ensure(String name) { + Setting p = (Setting)getNameColumn().firstWhereEq(name); + if (p == null) { + p = (Setting)newPersistent(); + p.setName(name); + } + return (Setting)getNameColumn().ensure(p); + } } Index: ValueInfoTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/ValueInfoTableBase.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ValueInfoTableBase.java 23 May 2012 23:13:11 -0000 1.24 +++ ValueInfoTableBase.java 11 Oct 2013 09:07:12 -0000 1.25 @@ -1021,7 +1021,7 @@ * Retrieve the <code>ValueInfo</code> as a <code>ValueInfo</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public ValueInfo getValueInfoObject(Integer troid) { |