[Equanda-svn-commit] SF.net SVN: equanda:[916] trunk/equanda-generate/src/main/velocity/t5gui

[<bri...@us...>]

Revision: 916
          http://equanda.svn.sourceforge.net/equanda/?rev=916&view=rev
Author:   brian_reynolds
Date:     2008-12-18 18:19:10 +0000 (Thu, 18 Dec 2008)

Log Message:
-----------
Ensure tables that have more than one referenced link-tables generates correct java+tml.

Modified Paths:
--------------
    trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
    trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm

Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm	2008-12-18 16:35:09 UTC (rev 915)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm	2008-12-18 18:19:10 UTC (rev 916)
@@ -271,17 +271,17 @@
 #end
 
 #if( $field.isLink() && $field.getLinkTable().getFieldReference() )
-	private String selectedValue;
-	public String getSelectedValue()
-	{
-	   return selectedValue;
+    private String ${field.getName()}SelectedValue;
+    public String get${field.getName()}SelectedValue()
+    {
+        return ${field.getName()}SelectedValue;
     }
-    public void setSelectedValue( String selectedValue )
+    public void set${field.getName()}SelectedValue( String ${field.getName()}SelectedValue )
     {
-        this.selectedValue = selectedValue;
+        this.${field.getName()}SelectedValue = ${field.getName()}SelectedValue;
     }
-    
-    public List<String> onProvideCompletionsFromSelectedValue(String partial) {
+
+    public List<String> onProvideCompletionsFrom${field.getName()}SelectedValue(String partial) {
         List<String> matches = new ArrayList<String>();
 
         try{

Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm	2008-12-18 16:35:09 UTC (rev 915)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm	2008-12-18 18:19:10 UTC (rev 916)
@@ -44,7 +44,7 @@
 
 #if( $field.isLink() && $field.getLinkTable().getFieldReference() )
 <div class="autocomplete">
-<input t:type="TextField"  t:mixins="autocomplete" t:id="selectedValue"/>
+<input t:type="TextField"  t:mixins="autocomplete" t:id="${field.getName()}SelectedValue"/>
 </div>	
 #end
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.