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

[<tri...@us...>]

Revision: 918
          http://equanda.svn.sourceforge.net/equanda/?rev=918&view=rev
Author:   triathlon98
Date:     2008-12-22 15:42:49 +0000 (Mon, 22 Dec 2008)

Log Message:
-----------
EQ-302 fix for select on a multiple link field

Modified Paths:
--------------
    trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
    trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
    trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.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-19 11:07:27 UTC (rev 917)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm	2008-12-22 15:42:49 UTC (rev 918)
@@ -270,37 +270,5 @@
     public String get${field.Name}Filter() { return EquandaGlobal.getQueryString( "${table.Name}.equandaCompareType${field.Name}" ); }
 #end
 
-#if( $field.isLink() && $field.getLinkTable().getFieldReference() )
-    private String ${field.getName()}SelectedValue;
-    public String get${field.getName()}SelectedValue()
-    {
-        return ${field.getName()}SelectedValue;
-    }
-    public void set${field.getName()}SelectedValue( String ${field.getName()}SelectedValue )
-    {
-        this.${field.getName()}SelectedValue = ${field.getName()}SelectedValue;
-    }
-
-    public List<String> onProvideCompletionsFrom${field.getName()}SelectedValue(String partial) {
-        List<String> matches = new ArrayList<String>();
-
-        try{
-            List<${ejbPackage}.client.${field.getLinkTable().getName()}> list = ${ejbPackage}.client.${field.getLinkTable().getName()}.selectEquandaReferenceStart(partial);
-                
-            for( ${ejbPackage}.client.${field.getLinkTable().getName()} ref : list )
-            {
-                if( ref.getReference() != null || ref.getReference().length() != 0 )
-                    matches.add( ref.getReference() );
-            }
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-        }
-        
-        return matches;
-    }
-    
 #end
-#end
 }

Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm	2008-12-19 11:07:27 UTC (rev 917)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm	2008-12-22 15:42:49 UTC (rev 918)
@@ -1,3 +1,8 @@
+#** @vtlvariable name="dollar" type="java.lang.String" *#
+#** @vtlvariable name="generationdate" type="java.lang.String" *#
+#** @vtlvariable name="readOnlyContext" type="boolean" *#
+#** @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
+#** @vtlvariable name="engine" type="org.equanda.generate.Generator" *#
 #**
  * This file is part of the equanda project.
  *
@@ -25,8 +30,7 @@
  *
  * Contributor(s):
  * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
- *#
-/**
+ *#/**
  * This file is generated by equanda on $generationdate, do not modify
  */
 
@@ -34,6 +38,7 @@
 
 #set( $ejbPackage=${engine.getConfig("ejb-package")} )
 import ${ejbPackage}.client.${table.Name};
+import org.equanda.client.EquandaException;
 import org.equanda.t5gui.*;
 import org.equanda.t5gui.services.*;
 import ${package}.pages.${table.Name}EquandaAll;
@@ -41,6 +46,7 @@
 import org.apache.tapestry5.annotations.*;
 import org.apache.tapestry5.corelib.base.AbstractField;
 import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.log4j.Logger;
 
 import java.util.*;
 
@@ -50,6 +56,8 @@
 public class LinkOne
     extends AbstractField
 {
+    private static final Logger log = Logger.getLogger( LinkOne.class );
+
     @Parameter( required = true )
     private ${table.Name} value;
 
@@ -166,4 +174,42 @@
     {
         // nothing to do, I think
     }
+
+#if( $table.FieldReference )
+	private String selectedValue;
+	public String getSelectedValue()
+	{
+        try
+        {
+            if ( null != selectedValue ) return value.get${table.FieldReference.Name}();
+        }
+        catch ( EquandaException ee )
+        { log.error( ee, ee ); }
+        return selectedValue;
+    }
+    public void setSelectedValue( String selectedValue )
+    {
+        this.selectedValue = selectedValue;
+    }
+
+    public List<String> onProvideCompletionsFromSelectedValue(String partial) {
+        List<String> matches = new ArrayList<String>();
+
+        try{
+            List<${ejbPackage}.client.${table.Name}> list = ${ejbPackage}.client.${table.Name}.selectEquandaReferenceStart(partial);
+
+            for( ${ejbPackage}.client.${table.Name} ref : list )
+            {
+                if( ref.getReference() != null || ref.getReference().length() != 0 )
+                    matches.add( ref.getReference() );
+            }
+        }
+        catch(Exception e)
+        {
+            e.printStackTrace();
+        }
+
+        return matches;
+    }
+#end    
 }

Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm	2008-12-19 11:07:27 UTC (rev 917)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm	2008-12-22 15:42:49 UTC (rev 918)
@@ -9,6 +9,9 @@
 		    <t:equanda.formactionlink t:id="Delete" context="prop:selectParameters" class="eqOp"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}"/></t:equanda.formactionlink>
 		</t:if>
 		<t:equanda.formactionlink t:id="Select" context="prop:selectParameters">${dollar}{equanda-message:Select}</t:equanda.formactionlink>
+#if( $table.FieldReference )
+        <div class="autocomplete"><input t:type="TextField"  t:mixins="autocomplete" t:id="selectedValue"/></div>
+#end
 		<t:if test="hasValue()"><span style="padding-left: 10px;"><t:${table.VarName}.SummaryEditLink object="value"/></span></t:if>
     </div>
 

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-19 11:07:27 UTC (rev 917)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm	2008-12-22 15:42:49 UTC (rev 918)
@@ -42,11 +42,5 @@
 </t:if>
 </div>
 
-#if( $field.isLink() && $field.getLinkTable().getFieldReference() )
-<div class="autocomplete">
-<input t:type="TextField"  t:mixins="autocomplete" t:id="${field.getName()}SelectedValue"/>
-</div>	
-#end
-
 </t:if>
 #end


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