[pfc-cvs-commit] pfc-rt/src/java/portal/rt/ui/resource ResourceException.java, 1.1, 1.2 StaticResourceMap.java, 1.1, 1.2 ResourceMap.java, 1.1, 1.2 ResourceServlet.java, 1.1, 1.2

[Bavo De R. <ba...@us...>]

Update of /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/resource
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv11634/src/java/portal/rt/ui/resource

Modified Files:
	ResourceException.java StaticResourceMap.java ResourceMap.java 
	ResourceServlet.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: StaticResourceMap.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/resource/StaticResourceMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StaticResourceMap.java	13 Sep 2005 11:28:01 -0000	1.1
--- StaticResourceMap.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 24,28 ****
  
  import java.io.Serializable;
! import java.util.Hashtable;
  
  import portal.services.resource.IResource;
--- 24,29 ----
  
  import java.io.Serializable;
! import java.util.HashMap;
! import java.util.Map;
  
  import portal.services.resource.IResource;
***************
*** 30,33 ****
--- 31,36 ----
  public final class StaticResourceMap implements Serializable
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static StaticResourceMap staticResourceMap = null;
  
***************
*** 61,67 ****
  	private StaticResourceMap()
  	{
! 		_resources = new Hashtable();
  	}
  
! 	private Hashtable _resources;
  }
\ No newline at end of file
--- 64,70 ----
  	private StaticResourceMap()
  	{
! 		_resources = new HashMap<String,IResource>();
  	}
  
! 	private Map<String,IResource> _resources;
  }
\ No newline at end of file

Index: ResourceMap.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/resource/ResourceMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceMap.java	13 Sep 2005 11:28:01 -0000	1.1
--- ResourceMap.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 24,28 ****
  
  import java.io.Serializable;
! import java.util.Hashtable;
  
  import portal.services.resource.IResource;
--- 24,29 ----
  
  import java.io.Serializable;
! import java.util.HashMap;
! import java.util.Map;
  
  import portal.services.resource.IResource;
***************
*** 31,37 ****
  public class ResourceMap implements Serializable
  {
  	public ResourceMap()
  	{
! 		_resources = new Hashtable();
  	}
  
--- 32,40 ----
  public class ResourceMap implements Serializable
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public ResourceMap()
  	{
! 		_resources = new HashMap<String,IResource>();
  	}
  
***************
*** 55,58 ****
  	}
  
! 	private Hashtable _resources;
  }
\ No newline at end of file
--- 58,61 ----
  	}
  
! 	private Map<String,IResource> _resources;
  }
\ No newline at end of file

Index: ResourceException.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/resource/ResourceException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceException.java	13 Sep 2005 11:28:01 -0000	1.1
--- ResourceException.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 25,28 ****
--- 25,30 ----
  public class ResourceException extends Exception
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public ResourceException(String message)
  	{

Index: ResourceServlet.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/resource/ResourceServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceServlet.java	13 Sep 2005 11:28:01 -0000	1.1
--- ResourceServlet.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 41,44 ****
--- 41,46 ----
  public class ResourceServlet extends BasePortalServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final int CACHE_HOURS = 4;
  	private static final int STREAM_BUFFER_SIZE = 4096;