Menu
▾
▴
[Equanda-svn-commit] SF.net SVN: equanda: [205] trunk/equanda-generate/src/main
|
From: <tri...@us...> - 2007-12-14 13:05:12
|
Revision: 205
http://equanda.svn.sourceforge.net/equanda/?rev=205&view=rev
Author: triathlon98
Date: 2007-12-14 05:05:10 -0800 (Fri, 14 Dec 2007)
Log Message:
-----------
EQ-99 more fixes in generation
Modified Paths:
--------------
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java
trunk/equanda-generate/src/main/velocity/t5gui/components/Display.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/templates.properties
trunk/equanda-generate/src/main/velocity/t5gui.ini
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java 2007-12-14 08:35:37 UTC (rev 204)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java 2007-12-14 13:05:10 UTC (rev 205)
@@ -47,13 +47,13 @@
new HashMap<String, String>(); // map with tables which inherit from this table, and their type indicator
boolean cloneable = false; // is this Table cloneable?
private String readonlyFieldsListWithTypes;
- private ArrayList<OMSelect> selects = null;
- private ArrayList<CascadeKeep> cascadeKeep = new ArrayList<CascadeKeep>();
- private ArrayList<OMSelect> linkedSelects =
+ private List<OMSelect> selects = null;
+ private List<CascadeKeep> cascadeKeep = new ArrayList<CascadeKeep>();
+ private List<OMSelect> linkedSelects =
new ArrayList<OMSelect>(); // list with selects that have a sinle parameter of this table type
- private ArrayList<OMSelect> moreLinkedSelects =
+ private List<OMSelect> moreLinkedSelects =
new ArrayList<OMSelect>(); // list with selects that have a parameter of this table type
- private ArrayList<OMSelect> suggestSelects =
+ private List<OMSelect> suggestSelects =
new ArrayList<OMSelect>(); // list with selects that are added because a suggested field
private OMField fieldReference;
private OMField fieldDescription;
@@ -93,7 +93,7 @@
}
}
- public ArrayList getCascadeKeep()
+ public List getCascadeKeep()
{
return cascadeKeep;
}
@@ -117,7 +117,7 @@
void addOMSelect( OMSelect sel )
{
- ArrayList<OMSelect> selects = getSelects();
+ List<OMSelect> selects = getSelects();
for ( OMSelect select : selects )
{
if ( sel.getName().toUpperCase().equals( select.getName().toUpperCase() ) )
@@ -164,7 +164,7 @@
void addPage( OMPage page )
{
- ArrayList<OMPage> pages = getPages();
+ List<OMPage> pages = getPages();
for ( OMPage pg : pages )
{
if ( pg.name.equals( page.name ) )
@@ -176,7 +176,7 @@
OMPage newPage = (OMPage) page.clone();
appendChild( newPage );
newPage.partOfRoot = true;
- ArrayList groups = getGroups();
+ List groups = getGroups();
for ( int i = 0; i < groups.size() ; i++ )
{
for ( int j = i + 1; j < groups.size() ; j++ )
@@ -191,7 +191,7 @@
}
}
}
- ArrayList fields = getFields();
+ List fields = getFields();
for ( int i = 0; i < fields.size() ; i++ )
{
for ( int j = i + 1; j < fields.size() ; j++ )
@@ -216,7 +216,7 @@
public OMPage getPage( String name )
{
- ArrayList<OMPage> pages = getPages();
+ List<OMPage> pages = getPages();
for ( OMPage page : pages )
{
if ( page.name.equals( name ) ) return page;
@@ -224,18 +224,29 @@
return null;
}
- public ArrayList<OMField> getFields()
+ public List<OMField> getFields()
{
- return (ArrayList<OMField>) getChildren( "field" );
+ return (List<OMField>) getChildren( "field" );
}
- public ArrayList<OMField> getSortedFields()
+ public List<OMField> getSortedFields()
{
- ArrayList<OMField> list = getFields();
+ List<OMField> list = getFields();
Collections.sort( list, new PriorityComparator() );
return list;
}
+ public List<OMField> getListDisplayField()
+ {
+ return (List<OMField>) getChildren( "field", new ListFilter<OMField>()
+ {
+ public boolean isSuitable( OMField field )
+ {
+ return field.isDisplayed() || field.isReference() || field.isDescription();
+ }
+ } );
+ }
+
class PriorityComparator
implements Comparator<OMField>
{
@@ -262,10 +273,10 @@
}
}
- public ArrayList<OMSelect> getSelects()
+ public List<OMSelect> getSelects()
{
if ( selects != null ) return selects;
- selects = (ArrayList<OMSelect>) getChildren( "select" );
+ selects = (List<OMSelect>) getChildren( "select" );
if ( !hasSelect( "EquandaAll" ) )
{
// add EquandaAll select for all tables
@@ -274,7 +285,7 @@
selectall.setSecurityRole( getSecurityRole() );
selectall.setTableName( name );
selectall.setRootTable( this );
- ArrayList<OMField> fields = getFields();
+ List<OMField> fields = getFields();
for ( OMField field : fields )
{
if ( field.isUnique() )
@@ -296,9 +307,9 @@
return selects;
}
- public ArrayList<OMBuild> getBuilders()
+ public List<OMBuild> getBuilders()
{
- ArrayList<OMBuild> builders = (ArrayList<OMBuild>) getChildren( "build" );
+ List<OMBuild> builders = (List<OMBuild>) getChildren( "build" );
if ( !hasBuild( "" ) )
{
OMBuild anonymous = new OMBuild();
@@ -308,33 +319,41 @@
return builders;
}
- public ArrayList<OMAction> getActions()
+ public List<OMAction> getActions()
{
return getChildren( "action" );
}
- public ArrayList<OMPage> getPages()
+ public List<OMPage> getPages()
{
return getChildren( "page" );
}
- public ArrayList getGroups()
+ public List getGroups()
{
return getChildren( "group" );
}
- private ArrayList getChildren( String name )
+ private List getChildren( String name )
{
+ return getChildren( name, null );
+ }
+
+ private List getChildren( String name, ListFilter filter )
+ {
NodeList nl = getNodesByTagName( name );
ArrayList<Object> list = new ArrayList<Object>( nl.getLength() );
- for ( int i = 0; i < nl.getLength() ; i++ ) list.add( nl.item( i ) );
+ for ( int i = 0; i < nl.getLength() ; i++ )
+ {
+ if ( filter == null || filter.isSuitable( nl.item( i ) ) ) list.add( nl.item( i ) );
+ }
return list;
}
// get a specific field from this table
OMField getField( String name )
{
- ArrayList<OMField> fields = getFields();
+ List<OMField> fields = getFields();
for ( OMField field : fields )
{
if ( field.getName().equals( name ) ) return field;
@@ -649,7 +668,7 @@
{
return readonlyFieldsListWithTypes;
}
- ArrayList<OMField> fields = getFields();
+ List<OMField> fields = getFields();
TextBuilder params = TextBuilder.newInstance();
for ( OMField field : fields )
{
@@ -693,7 +712,7 @@
linkedSelects.add( sel );
}
- public ArrayList getLinkedSelects()
+ public List getLinkedSelects()
{
return linkedSelects;
}
@@ -713,7 +732,7 @@
moreLinkedSelects.add( sel );
}
- public ArrayList getMoreLinkedSelects()
+ public List getMoreLinkedSelects()
{
return moreLinkedSelects;
}
@@ -746,7 +765,7 @@
}
}
- public ArrayList getSuggestSelects()
+ public List getSuggestSelects()
{
return suggestSelects;
}
@@ -782,15 +801,15 @@
}
/**
- * Returns a list of displayed fields, needed in the gui-descriptors templates
- * This is used for the display of link-fields only
+ * Returns a list of displayed fields, needed in the gui-descriptors templates This is used for the display of
+ * link-fields only
*
* @return the list of the displayed fields
*/
public String getDisplayedFields()
{
TextBuilder text = TextBuilder.newInstance();
- ArrayList<OMField> fields = getFields();
+ List<OMField> fields = getFields();
for ( OMField field : fields )
{
if ( field.isDisplayed() && !field.isLink() && !field.isMultiple() )
@@ -828,8 +847,13 @@
return getTable().getHideIfClass();
}
- public Map<String,String> getDataFilters()
+ public Map<String, String> getDataFilters()
{
return getTable().getDataFilters();
}
+
+ private interface ListFilter<T>
+ {
+ public boolean isSuitable( T object );
+ }
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Display.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Display.tml.vm 2007-12-14 08:35:37 UTC (rev 204)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Display.tml.vm 2007-12-14 13:05:10 UTC (rev 205)
@@ -7,7 +7,7 @@
#if( !$field.isLink() )
$sep ${dollar}{object.${field.VarName}}
#else
- <span t:type="${engine.lowerFirst("${field.LinkTable.Name}")}.Display" t:value="object.${field.VarName}">
+ <span t:type="${engine.lowerFirst("${field.LinkTable.Name}")}/Display" t:object="object.${field.VarName}"/>
#end
#set( $sep = "," )
#end
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm 2007-12-14 08:35:37 UTC (rev 204)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm 2007-12-14 13:05:10 UTC (rev 205)
@@ -1,2 +1,2 @@
-<label>$field.Name</label>
-<input t:type="${field.VarName}/LinkList" t:label="${field.Name}" t:id="${field.VarName}" t:value="object.${field.VarName}"/>
+<label>${field.Name}</label>
+<input t:type="$engine.lowerFirst("${field.JavaFieldType}")/LinkList" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.VarName}"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm 2007-12-14 08:35:37 UTC (rev 204)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm 2007-12-14 13:05:10 UTC (rev 205)
@@ -1,2 +1,2 @@
-<label>${table.Name}</label>
-<input t:type="${engine.lowerFirst("${table.Name}")}/LinkOne" t:label="${table.Name}" t:id="${engine.lowerFirst("${table.Name}")}" t:value="value.${table.Name}" t:setter="${table.Name}Setter"/>
+<label>${field.Name}</label>
+<input t:type="$engine.lowerFirst("${field.JavaFieldType}")/LinkOne" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.VarName}" t:setter="${field.Name}Setter"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm 2007-12-14 08:35:37 UTC (rev 204)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm 2007-12-14 13:05:10 UTC (rev 205)
@@ -1,6 +1,7 @@
#if( !$page.isHidden() )
#if( $page.Name == "ALL" )
<t:parameter name="contentAll">
+#render( "field.${table.Name}.EquandaType" "field.EquandaType" "" "" )
#else
<t:parameter name="content$pageindex">
#set( $pageindex = $pageindex + 1 )
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/templates.properties
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/templates.properties 2007-12-14 08:35:37 UTC (rev 204)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/templates.properties 2007-12-14 13:05:10 UTC (rev 205)
@@ -4,6 +4,7 @@
field=edit-tml/field.tml.vm
type.string=edit-tml/string.tml.vm
+type.clob=edit-tml/string.tml.vm
type.double=edit-tml/double.tml.vm
type.int=edit-tml/int.tml.vm
type.date=edit-tml/date.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui.ini
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui.ini 2007-12-14 08:35:37 UTC (rev 204)
+++ trunk/equanda-generate/src/main/velocity/t5gui.ini 2007-12-14 13:05:10 UTC (rev 205)
@@ -48,7 +48,7 @@
output9=${outputDir}${packageDir}components/${_table}/LinkList.java
template9=components/LinkList.java.vm
-output10=${outputDir}${packageDir}components/${_table}/linkList.tml
+output10=${outputDir}${packageDir}components/${_table}/LinkList.tml
template10=components/LinkList.tml.vm
// edit page
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
