[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui/resource ...

[Peter Muir]

  User: pmuir   
  Date: 07/03/04 17:22:53

  Modified:    src/ui/org/jboss/seam/ui/resource  
                        DynamicImageResource.java DynamicImageStore.java
  Log:
  Docs and update seamspace to use s:graphicImage
  
  Revision  Changes    Path
  1.2       +1 -1      jboss-seam/src/ui/org/jboss/seam/ui/resource/DynamicImageResource.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DynamicImageResource.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/resource/DynamicImageResource.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- DynamicImageResource.java	4 Mar 2007 21:51:51 -0000	1.1
  +++ DynamicImageResource.java	4 Mar 2007 22:22:53 -0000	1.2
  @@ -42,7 +42,7 @@
      {
         String pathInfo = request.getPathInfo().substring(getResourcePath().length() + 1, request.getPathInfo().lastIndexOf(".")); 
         
  -     ImageWrapper image = DynamicImageStore.instance().get(pathInfo);
  +     ImageWrapper image = DynamicImageStore.instance().remove(pathInfo);
         if (image != null)
         {
            response.setContentType(image.getContentType().getMimeType());
  
  
  
  1.2       +0 -19     jboss-seam/src/ui/org/jboss/seam/ui/resource/DynamicImageStore.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DynamicImageStore.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/resource/DynamicImageStore.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- DynamicImageStore.java	4 Mar 2007 21:51:51 -0000	1.1
  +++ DynamicImageStore.java	4 Mar 2007 22:22:53 -0000	1.2
  @@ -31,8 +31,6 @@
   
         private Image.Type contentType;
         
  -      private int expire = -1;
  -
         public ImageWrapper(byte[] image, Image.Type contentType)
         {
            this.image = image;
  @@ -48,15 +46,6 @@
         {
            return image;
         }
  -      
  -      protected int getExpire() {
  -         return expire;
  -      }
  -      
  -      protected void setExpire(int expire)
  -      {
  -         this.expire = expire;
  -      }
      }
   
      private Map<String, ImageWrapper> store = new HashMap<String, ImageWrapper>();
  @@ -86,10 +75,6 @@
            key = "org.jboss.seam.ui.DynamicImageStore." + index;
            index++;
         }
  -      /*else 
  -      {
  -         image.setExpire(60000);      
  -      }*/
         store.put(key, image);
         log.debug("Put image into to session with key #0", key);
         return key;
  @@ -99,10 +84,6 @@
      {
         log.debug("Get image into to session with key #0", key);
         ImageWrapper image = store.get(key);
  -      if (image.getExpire() < 0) 
  -      {
  -         store.remove(key);
  -      }
         return image;
      }