[jboss-cvs] jboss-seam/src/main/org/jboss/seam/databinding ...

[Peter Muir]

  User: pmuir   
  Date: 07/04/03 14:12:58

  Modified:    src/main/org/jboss/seam/databinding  DataModelBinder.java
  Log:
  Make DataBinder use JsfProvider
  
  Revision  Changes    Path
  1.5       +62 -86    jboss-seam/src/main/org/jboss/seam/databinding/DataModelBinder.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DataModelBinder.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/databinding/DataModelBinder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- DataModelBinder.java	12 Jun 2006 19:47:00 -0000	1.4
  +++ DataModelBinder.java	3 Apr 2007 18:12:58 -0000	1.5
  @@ -1,15 +1,10 @@
   package org.jboss.seam.databinding;
   
  -import java.util.List;
   import java.util.Map;
  -import java.util.Set;
   
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.datamodel.DataModel;
  -import org.jboss.seam.jsf.ArrayDataModel;
  -import org.jboss.seam.jsf.ListDataModel;
  -import org.jboss.seam.jsf.MapDataModel;
  -import org.jboss.seam.jsf.SetDataModel;
  +import org.jboss.seam.jsf.JsfProvider;
   
   /**
    * Exposes a List, array, Map or Set to the UI as a JSF DataModel
  @@ -31,26 +26,7 @@
   
      public javax.faces.model.DataModel wrap(DataModel out, Object value)
      {
  -      if (value instanceof List)
  -      {
  -         return new ListDataModel( (List) value );
  -      }
  -      else if (value instanceof Object[])
  -      {
  -         return new ArrayDataModel( (Object[]) value ); 
  -      }
  -      else if (value instanceof Map)
  -      {
  -         return new MapDataModel( (Map) value );
  -      }
  -      else if (value instanceof Set)
  -      {
  -         return new SetDataModel( (Set) value );
  -      }
  -      else
  -      {
  -         throw new IllegalArgumentException("unknown collection type: " + value.getClass());
  -      }
  +      return JsfProvider.instance().getDataModel(value);
      }
   
      public Object getWrappedData(DataModel out, javax.faces.model.DataModel wrapper)