[Equanda-svn-commit] SF.net SVN: equanda: [114] trunk

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

Revision: 114
          http://equanda.svn.sourceforge.net/equanda/?rev=114&view=rev
Author:   triathlon98
Date:     2007-10-08 08:18:41 -0700 (Mon, 08 Oct 2007)

Log Message:
-----------
fix for multiple link fields

Modified Paths:
--------------
    trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaList.java
    trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/CommonInputContainerImpl.java
    trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/model/Input.java
    trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/EmbeddedFieldSelectionModel.java

Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaList.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaList.java	2007-10-08 12:50:40 UTC (rev 113)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaList.java	2007-10-08 15:18:41 UTC (rev 114)
@@ -524,7 +524,7 @@
         for ( E e : this )
         {
             if ( sep != 0 ) tb.append( sep );
-            tb.append( e.toString() );
+            if ( e != null ) tb.append( e.toString() );
             sep = ',';
         }
         tb.append( ']' );

Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/CommonInputContainerImpl.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/CommonInputContainerImpl.java	2007-10-08 12:50:40 UTC (rev 113)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/CommonInputContainerImpl.java	2007-10-08 15:18:41 UTC (rev 114)
@@ -65,7 +65,7 @@
         return DisplayMode.EDIT;
     }
 
-    /**
+    /*
      * ******* Common for both interfaces(EquandaSimpleInputContainer, EquandaLinkInputContainer): ***********
      */
 
@@ -226,7 +226,7 @@
     {
         if ( isEmbedded() )
         {
-            return new EmbeddedFieldSelectionModel( getFieldBinder(), getDescription(), this );
+            return new EmbeddedFieldSelectionModel( getFieldBinder(), this );
         }
         if ( isLinkGUILookCombobox() )
         {

Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/model/Input.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/model/Input.java	2007-10-08 12:50:40 UTC (rev 113)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/model/Input.java	2007-10-08 15:18:41 UTC (rev 114)
@@ -47,7 +47,7 @@
     String caseConversionClass;
     String linkTableName;
     private String tableName;
-    private String onChange; // @todo onchange should not be a sepparate case, informalParameters should be used
+    private String onChange; // @todo onchange should not be a separate case, informalParameters should be used
     // informal parameters could be stuff like javascript event handlers... They should be copy in tapestry components as they are
     private Map<String, String> informalParameters = new HashMap<String, String>();
     Renderer renderer = new Renderer();

Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/EmbeddedFieldSelectionModel.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/EmbeddedFieldSelectionModel.java	2007-10-08 12:50:40 UTC (rev 113)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/EmbeddedFieldSelectionModel.java	2007-10-08 15:18:41 UTC (rev 114)
@@ -3,7 +3,6 @@
 import org.equanda.persistence.om.EquandaProxy;
 import org.equanda.tapestry.binder.FieldBinder;
 import org.equanda.tapestry.components.input.equandaLinkInput.LinkInputBinderWrapper;
-import org.equanda.tapestry.model.Input;
 import org.equanda.tapestry.util.EquandaProxyAccessor;
 import org.apache.tapestry.IComponent;
 
@@ -20,19 +19,15 @@
 public class EmbeddedFieldSelectionModel
     implements org.apache.tapestry.form.IPropertySelectionModel
 {
-    private org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( getClass() );
-
     private FieldBinder fieldBinder;
-    private Input fieldDescription;
     private IComponent resolver;
 
     private List<String> uoid;
     private List<String> display;
 
-    public EmbeddedFieldSelectionModel( FieldBinder fieldBinder, Input fieldDescription, IComponent resolver )
+    public EmbeddedFieldSelectionModel( FieldBinder fieldBinder, IComponent resolver )
     {
         this.fieldBinder = fieldBinder;
-        this.fieldDescription = fieldDescription;
         this.resolver = resolver;
         init();
     }


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