[jboss-cvs] jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter ...

[Peter Muir]

  User: pmuir   
  Date: 07/11/06 07:23:46

  Modified:    ui/src/main/java/org/jboss/seam/ui/converter/entityConverter  
                        AbstractEntityLoader.java
                        EntityIdentifierStore.java
  Log:
  JBSEAM-1801
  
  Revision  Changes    Path
  1.2       +3 -3      jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/AbstractEntityLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractEntityLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/AbstractEntityLoader.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- AbstractEntityLoader.java	6 Nov 2007 12:00:01 -0000	1.1
  +++ AbstractEntityLoader.java	6 Nov 2007 12:23:46 -0000	1.2
  @@ -18,7 +18,7 @@
       * @return The entity or null if no entity is available at that key
       */
      @Transactional
  -   public Object get(Integer key)
  +   public Object get(String key)
      {
         Identifier identifier = EntityIdentifierStore.instance().get(key);
         if (identifier != null)
  @@ -37,9 +37,9 @@
       * @return The key under which the clazz/id are stored
       */
      @Transactional
  -   public Integer put(Object entity)
  +   public String put(Object entity)
      {      
  -      return EntityIdentifierStore.instance().put(createIdentifier(entity));
  +      return EntityIdentifierStore.instance().put(createIdentifier(entity), entity);
      }
      
      protected abstract Identifier createIdentifier(Object entity);
  
  
  
  1.2       +5 -5      jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/EntityIdentifierStore.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityIdentifierStore.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/EntityIdentifierStore.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- EntityIdentifierStore.java	6 Nov 2007 12:00:01 -0000	1.1
  +++ EntityIdentifierStore.java	6 Nov 2007 12:23:46 -0000	1.2
  @@ -39,11 +39,11 @@
         store = new ArrayList<Identifier>();
      }
      
  -   public Identifier get(Integer key)
  +   public Identifier get(String key)
      {
         try
         {
  -         return store.get(key);
  +         return store.get(new Integer(key));
         }
         catch (IndexOutOfBoundsException e)
         {
  @@ -51,14 +51,14 @@
         }   
      }
      
  -   public Integer put(Identifier identifier)
  +   public String put(Identifier identifier, Object entity)
      {      
         if (!store.contains(identifier))
         {
            store.add(identifier);
            setDirty();
         }
  -      return store.indexOf(identifier);
  +      return ((Integer) store.indexOf(identifier)).toString();
      }
   
      public static EntityIdentifierStore instance()