pfc-cvs-commit — CVS commit messages

[pfc-cvs-commit] pfc-rt/src/java/portal/rt/services/session ApplicationSession.java, 1.1, 1.2 SessionServiceImpl.java, 1.4, 1.5

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

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

Modified Files:
	ApplicationSession.java SessionServiceImpl.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: SessionServiceImpl.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/session/SessionServiceImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SessionServiceImpl.java	3 Sep 2006 21:03:50 -0000	1.4
--- SessionServiceImpl.java	7 Aug 2010 11:06:58 -0000	1.5
***************
*** 46,50 ****
  	public SessionServiceImpl(IServiceConfig serviceConfig)
  	{
! 		_sessions = new LinkedList();
  	}
  
--- 46,50 ----
  	public SessionServiceImpl(IServiceConfig serviceConfig)
  	{
! 		_sessions = new LinkedList<ApplicationSession>();
  	}
  
***************
*** 105,118 ****
  	}
  
! 	public List listSessions(Principal pPrincipal)
  	{
  		synchronized (this)
  		{
! 			List result = new LinkedList();
  
! 			Iterator sessionIt = _sessions.iterator();
  			while (sessionIt.hasNext())
  			{
! 				ApplicationSession session = (ApplicationSession) sessionIt.next();
  
  				if (session.getUserPrincipal().equals(pPrincipal))
--- 105,118 ----
  	}
  
! 	public List<ISession> listSessions(Principal pPrincipal)
  	{
  		synchronized (this)
  		{
! 			List<ISession> result = new LinkedList<ISession>();
  
! 			Iterator<ApplicationSession> sessionIt = _sessions.iterator();
  			while (sessionIt.hasNext())
  			{
! 				ApplicationSession session = sessionIt.next();
  
  				if (session.getUserPrincipal().equals(pPrincipal))
***************
*** 130,137 ****
  		synchronized (this)
  		{
! 			Iterator sessionIt = _sessions.iterator();
  			while (sessionIt.hasNext())
  			{
! 				ApplicationSession session = (ApplicationSession) sessionIt.next();
  
  				if (session.getUserPrincipal().equals(pPrincipal))
--- 130,137 ----
  		synchronized (this)
  		{
! 			Iterator<ApplicationSession> sessionIt = _sessions.iterator();
  			while (sessionIt.hasNext())
  			{
! 				ApplicationSession session = sessionIt.next();
  
  				if (session.getUserPrincipal().equals(pPrincipal))
***************
*** 171,174 ****
  	}
  
! 	private List _sessions;
  }
\ No newline at end of file
--- 171,174 ----
  	}
  
! 	private List<ApplicationSession> _sessions;
  }
\ No newline at end of file

Index: ApplicationSession.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/session/ApplicationSession.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ApplicationSession.java	13 Sep 2005 11:28:01 -0000	1.1
--- ApplicationSession.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 41,44 ****
--- 41,46 ----
  public class ApplicationSession implements Serializable, ISession
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(ApplicationDesktop.class);
  
***************
*** 121,125 ****
  			LOGGER.debug("Instantiating application class: " + className);
  
! 			Class classInstance = Class.forName(className);
  
  			_application = (IApplication) classInstance.newInstance();
--- 123,127 ----
  			LOGGER.debug("Instantiating application class: " + className);
  
! 			Class<?> classInstance = Class.forName(className);
  
  			_application = (IApplication) classInstance.newInstance();

[pfc-cvs-commit] pfc-rt/src/java/portal/rt/services/registry FileRegistry.java, 1.1, 1.2 RegistryFile.java, 1.1, 1.2

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

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

Modified Files:
	FileRegistry.java RegistryFile.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: FileRegistry.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/registry/FileRegistry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileRegistry.java	13 Sep 2005 11:28:01 -0000	1.1
--- FileRegistry.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 25,29 ****
  import java.util.Collection;
  import java.util.HashSet;
! import java.util.Hashtable;
  
  import org.apache.commons.logging.Log;
--- 25,29 ----
  import java.util.Collection;
  import java.util.HashSet;
! import java.util.Map;
  
  import org.apache.commons.logging.Log;
***************
*** 45,53 ****
  	}
  
! 	public Collection listRegistryKeys() throws RegistryException
  	{
! 		Collection values = _registryKeys.values();
  		
! 		return new HashSet(values);
  	}
  	
--- 45,53 ----
  	}
  
! 	public Collection<RegistryKey> listRegistryKeys() throws RegistryException
  	{
! 		Collection<RegistryKey> values = _registryKeys.values();
  		
! 		return new HashSet<RegistryKey>(values);
  	}
  	
***************
*** 71,74 ****
  	private RegistryFile _myRegistryFile;
  
! 	private Hashtable _registryKeys;
  }
\ No newline at end of file
--- 71,74 ----
  	private RegistryFile _myRegistryFile;
  
! 	private Map<String,RegistryKey> _registryKeys;
  }
\ No newline at end of file

Index: RegistryFile.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/registry/RegistryFile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RegistryFile.java	13 Sep 2005 11:28:01 -0000	1.1
--- RegistryFile.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 26,30 ****
  import java.io.FileInputStream;
  import java.io.InputStream;
! import java.util.Hashtable;
  
  import javax.xml.parsers.DocumentBuilder;
--- 26,31 ----
  import java.io.FileInputStream;
  import java.io.InputStream;
! import java.util.HashMap;
! import java.util.Map;
  
  import javax.xml.parsers.DocumentBuilder;
***************
*** 51,59 ****
  	}
  
! 	public Hashtable loadRegistry() throws RegistryException
  	{
  		try
  		{
! 			Hashtable keys = new Hashtable();
  
  			File file = new File(_dataFile);
--- 52,60 ----
  	}
  
! 	public Map<String,RegistryKey> loadRegistry() throws RegistryException
  	{
  		try
  		{
! 			Map<String,RegistryKey> keys = new HashMap<String,RegistryKey>();
  
  			File file = new File(_dataFile);
***************
*** 63,74 ****
  			InputStream stream = new FileInputStream(file);
  
- 			if (stream == null)
- 			{
- 				LOGGER.fatal("Could not load registry, no data file found");
- 
- 				throw new RegistryException(
- 						"Could not load registry, no data file found");
- 			}
- 
  			loadRegistry(keys, stream);
  
--- 64,67 ----
***************
*** 86,90 ****
  	}
  
! 	private void loadRegistry(Hashtable keys, InputStream stream)
  			throws Exception
  	{
--- 79,83 ----
  	}
  
! 	private void loadRegistry(Map<String,RegistryKey> keys, InputStream stream)
  			throws Exception
  	{
***************
*** 104,108 ****
  	}
  
! 	private void parse(Hashtable keys, Element elem) throws Exception
  	{
  		NodeList children = elem.getChildNodes();
--- 97,101 ----
  	}
  
! 	private void parse(Map<String,RegistryKey> keys, Element elem) throws Exception
  	{
  		NodeList children = elem.getChildNodes();
***************
*** 125,129 ****
  	}
  
! 	private void processRegistryKey(Hashtable keys, Element elem)
  			throws Exception
  	{
--- 118,122 ----
  	}
  
! 	private void processRegistryKey(Map<String,RegistryKey> keys, Element elem)
  			throws Exception
  	{

[pfc-cvs-commit] pfc-rt/src/java/portal/rt/security/ldap LdapSecurityService.java, 1.2, 1.3

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

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

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

Index: LdapSecurityService.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/security/ldap/LdapSecurityService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LdapSecurityService.java	15 Feb 2006 20:38:59 -0000	1.2
--- LdapSecurityService.java	7 Aug 2010 11:06:58 -0000	1.3
***************
*** 222,226 ****
  		constraints.setReturningAttributes(new String[0]);
  
! 		NamingEnumeration results = context.search(getUserBase(), filter,
  				constraints);
  
--- 222,226 ----
  		constraints.setReturningAttributes(new String[0]);
  
! 		NamingEnumeration<SearchResult> results = context.search(getUserBase(), filter,
  				constraints);
  
***************
*** 234,238 ****
  
  		// Get result for the first entry found
! 		SearchResult result = (SearchResult) results.next();
  
  		// Check no further entries were found
--- 234,238 ----
  
  		// Get result for the first entry found
! 		SearchResult result = results.next();
  
  		// Check no further entries were found

[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;

[pfc-cvs-commit] pfc-rt/src/java/portal/rt/servlet PortalHeartBeat.java, 1.3, 1.4 PortalProcess.java, 1.1, 1.2 JavaScriptServlet.java, 1.1, 1.2 StartPortalInstance.java, 1.1, 1.2 ProcessUtils.java, 1.3, 1.4 RenderPortal.java, 1.1, 1.2 ServletPortalContext.java, 1.2, 1.3 WARStylesheetProvider.java, 1.2, 1.3 PortalProcessException.java, 1.1, 1.2 StylesheetServlet.java, 1.1, 1.2 FileStylesheetProvider.java, 1.2, 1.3 BasePortalServlet.java, 1.3, 1.4 RequestParameters.java, 1.2, 1.3

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

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

Modified Files:
	PortalHeartBeat.java PortalProcess.java JavaScriptServlet.java 
	StartPortalInstance.java ProcessUtils.java RenderPortal.java 
	ServletPortalContext.java WARStylesheetProvider.java 
	PortalProcessException.java StylesheetServlet.java 
	FileStylesheetProvider.java BasePortalServlet.java 
	RequestParameters.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: StylesheetServlet.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/StylesheetServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StylesheetServlet.java	13 Sep 2005 11:28:01 -0000	1.1
--- StylesheetServlet.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 40,43 ****
--- 40,45 ----
  public class StylesheetServlet extends HttpServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(StylesheetServlet.class);
  

Index: JavaScriptServlet.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/JavaScriptServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JavaScriptServlet.java	13 Sep 2005 11:28:01 -0000	1.1
--- JavaScriptServlet.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 37,40 ****
--- 37,42 ----
  public class JavaScriptServlet extends HttpServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final int STREAM_BUFFER_SIZE = 1024;
  	private static final int EOF = -1;
***************
*** 49,53 ****
  			ServletContext context = getServletConfig().getServletContext();
  
! 			Set scripts = context.getResourcePaths(SCRIPT_RESOURCE_PATH);
  
  			prepareResponse(request, response);
--- 51,55 ----
  			ServletContext context = getServletConfig().getServletContext();
  
! 			Set<?> scripts = context.getResourcePaths(SCRIPT_RESOURCE_PATH);
  
  			prepareResponse(request, response);
***************
*** 69,73 ****
  	}
  
! 	private void sendResources(Set resources,
  			HttpServletRequest request,
  			HttpServletResponse response) throws ServletException, IOException
--- 71,75 ----
  	}
  
! 	private void sendResources(Set<?> resources,
  			HttpServletRequest request,
  			HttpServletResponse response) throws ServletException, IOException
***************
*** 75,79 ****
  		ServletContext context = getServletConfig().getServletContext();
  
! 		Iterator it = resources.iterator();
  
  		while (it.hasNext())
--- 77,81 ----
  		ServletContext context = getServletConfig().getServletContext();
  
! 		Iterator<?> it = resources.iterator();
  
  		while (it.hasNext())

Index: ServletPortalContext.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/ServletPortalContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ServletPortalContext.java	23 Sep 2005 05:57:17 -0000	1.2
--- ServletPortalContext.java	7 Aug 2010 11:06:58 -0000	1.3
***************
*** 24,28 ****
  
  import java.security.Principal;
! import java.util.Hashtable;
  
  import org.apache.commons.logging.Log;
--- 24,29 ----
  
  import java.security.Principal;
! import java.util.HashMap;
! import java.util.Map;
  
  import org.apache.commons.logging.Log;
***************
*** 48,52 ****
  	{
  		_browserDevice = pBrowserDevice;
! 		_initParams = new Hashtable();
  	}
  
--- 49,53 ----
  	{
  		_browserDevice = pBrowserDevice;
! 		_initParams = new HashMap<String,String>();
  	}
  
***************
*** 110,113 ****
  	private BrowserDevice _browserDevice;
  	private Principal _userPrincipal;
! 	private Hashtable _initParams;
  }
\ No newline at end of file
--- 111,114 ----
  	private BrowserDevice _browserDevice;
  	private Principal _userPrincipal;
! 	private Map<String,String> _initParams;
  }
\ No newline at end of file

Index: ProcessUtils.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/ProcessUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ProcessUtils.java	15 Feb 2006 20:47:04 -0000	1.3
--- ProcessUtils.java	7 Aug 2010 11:06:58 -0000	1.4
***************
*** 63,67 ****
  		pLog.debug("start request dump");
  
! 		Enumeration paramEnum = request.getParameterNames();
  
  		while (paramEnum.hasMoreElements())
--- 63,67 ----
  		pLog.debug("start request dump");
  
! 		Enumeration<?> paramEnum = request.getParameterNames();
  
  		while (paramEnum.hasMoreElements())

Index: StartPortalInstance.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/StartPortalInstance.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StartPortalInstance.java	13 Sep 2005 11:28:01 -0000	1.1
--- StartPortalInstance.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 30,33 ****
--- 30,35 ----
  public final class StartPortalInstance extends BasePortalServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(StartPortalInstance.class);
  

Index: WARStylesheetProvider.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/WARStylesheetProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WARStylesheetProvider.java	15 Feb 2006 20:47:04 -0000	1.2
--- WARStylesheetProvider.java	7 Aug 2010 11:06:58 -0000	1.3
***************
*** 67,71 ****
  			ServletContext context = getServletConfig().getServletContext();
  
! 			Set sheets = context.getResourcePaths(SHEET_RESOURCE_PATH);
  
  			_sheetsContents = fetchSheets(sheets).toString();
--- 67,71 ----
  			ServletContext context = getServletConfig().getServletContext();
  
! 			Set<?> sheets = context.getResourcePaths(SHEET_RESOURCE_PATH);
  
  			_sheetsContents = fetchSheets(sheets).toString();
***************
*** 84,88 ****
  	}
  
! 	private StringBuffer fetchSheets(Set resources) throws ServletException,
  			IOException
  	{
--- 84,88 ----
  	}
  
! 	private StringBuffer fetchSheets(Set<?> resources) throws ServletException,
  			IOException
  	{
***************
*** 91,95 ****
  		StringWriter stringWriter = new StringWriter();
  
! 		Iterator it = resources.iterator();
  
  		while (it.hasNext())
--- 91,95 ----
  		StringWriter stringWriter = new StringWriter();
  
! 		Iterator<?> it = resources.iterator();
  
  		while (it.hasNext())

Index: RequestParameters.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/RequestParameters.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RequestParameters.java	15 Feb 2006 20:47:04 -0000	1.2
--- RequestParameters.java	7 Aug 2010 11:06:58 -0000	1.3
***************
*** 64,72 ****
  	public boolean isFormField(String paramName)
  	{
! 		Iterator it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = (FileItem) it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
--- 64,72 ----
  	public boolean isFormField(String paramName)
  	{
! 		Iterator<FileItem> it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
***************
*** 82,90 ****
  	public FileItem getFile(String paramName)
  	{
! 		Iterator it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = (FileItem) it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
--- 82,90 ----
  	public FileItem getFile(String paramName)
  	{
! 		Iterator<FileItem> it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
***************
*** 112,122 ****
  	public String[] getParameterValues(String paramName)
  	{
! 		LinkedList result = new LinkedList();
  
! 		Iterator it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = (FileItem) it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
--- 112,122 ----
  	public String[] getParameterValues(String paramName)
  	{
! 		List<String> result = new LinkedList<String>();
  
! 		Iterator<FileItem> it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
***************
*** 139,147 ****
  	public String getParameter(String paramName)
  	{
! 		Iterator it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = (FileItem) it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
--- 139,147 ----
  	public String getParameter(String paramName)
  	{
! 		Iterator<FileItem> it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
***************
*** 187,190 ****
  
  	private FileUpload _fileUpload;
! 	private List _items;
  }
\ No newline at end of file
--- 187,190 ----
  
  	private FileUpload _fileUpload;
! 	private List<FileItem> _items;
  }
\ No newline at end of file

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

Index: PortalHeartBeat.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/PortalHeartBeat.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PortalHeartBeat.java	15 Feb 2006 20:47:04 -0000	1.3
--- PortalHeartBeat.java	7 Aug 2010 11:06:58 -0000	1.4
***************
*** 34,37 ****
--- 34,39 ----
  public class PortalHeartBeat extends BasePortalServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(PortalHeartBeat.class);
  

Index: RenderPortal.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/RenderPortal.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RenderPortal.java	13 Sep 2005 11:28:01 -0000	1.1
--- RenderPortal.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 36,39 ****
--- 36,41 ----
  public class RenderPortal extends BasePortalServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final int BYTE_PER_KB = 1024;
  

Index: BasePortalServlet.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/BasePortalServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BasePortalServlet.java	15 Feb 2006 20:47:04 -0000	1.3
--- BasePortalServlet.java	7 Aug 2010 11:06:58 -0000	1.4
***************
*** 38,41 ****
--- 38,43 ----
  public abstract class BasePortalServlet extends HttpServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(BasePortalServlet.class);
  

Index: PortalProcess.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/PortalProcess.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PortalProcess.java	13 Sep 2005 11:28:01 -0000	1.1
--- PortalProcess.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 32,35 ****
--- 32,37 ----
  public class PortalProcess extends BasePortalServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(PortalProcess.class);
  

Index: FileStylesheetProvider.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/FileStylesheetProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileStylesheetProvider.java	15 Feb 2006 20:47:04 -0000	1.2
--- FileStylesheetProvider.java	7 Aug 2010 11:06:58 -0000	1.3
***************
*** 28,31 ****
--- 28,32 ----
  import java.io.Reader;
  import java.util.ArrayList;
+ import java.util.List;
  
  import org.apache.commons.logging.Log;
***************
*** 55,61 ****
  	}
  
! 	private ArrayList getReaders() throws PortalException
  	{
! 		ArrayList readers = new ArrayList();
  
  		File sheetsFolder = new File(_path);
--- 56,62 ----
  	}
  
! 	private List<Reader> getReaders() throws PortalException
  	{
! 		List<Reader> readers = new ArrayList<Reader>();
  
  		File sheetsFolder = new File(_path);
***************
*** 91,95 ****
  	private class ChainReader extends Reader
  	{
! 		public ChainReader(ArrayList readers)
  		{
  			_readers = readers;
--- 92,96 ----
  	private class ChainReader extends Reader
  	{
! 		public ChainReader(List<Reader> readers)
  		{
  			_readers = readers;
***************
*** 169,173 ****
  
  		private int _currentReaderIndex;
! 		private ArrayList _readers;
  
  		private char[] _internalBuffer;
--- 170,174 ----
  
  		private int _currentReaderIndex;
! 		private List<Reader> _readers;
  
  		private char[] _internalBuffer;

[pfc-cvs-commit] pfc-rt/src/java/portal/rt/ui/upload FileUpload.java, 1.2, 1.3 MultipartStream.java, 1.1, 1.2 FormParameter.java, 1.1, 1.2

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

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

Modified Files:
	FileUpload.java MultipartStream.java FormParameter.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: FileUpload.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/upload/FileUpload.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileUpload.java	15 Feb 2006 20:47:04 -0000	1.2
--- FileUpload.java	7 Aug 2010 11:06:58 -0000	1.3
***************
*** 36,52 ****
  
  /**
!  * <p>High level API for processing file uploads.</p>
!  *
!  * <p>This class handles multiple files per single HTML widget, sent using
!  * < code > multipart / mixed < / code > encoding type, as specified by
!  * <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>.  Use {@link
!  * #parseRequest(HttpServletRequest)} to acquire a list of {@link
!  * org.apache.commons.fileupload.FileItem}s associated with a given HTML
!  * widget.</p>
!  *
!  * <p> Files will be stored in temporary disk storage or in memory,
!  * depending on request size, and will be available as {@link
!  * org.apache.commons.fileupload.FileItem}s.</p>
!  *
   * @author <a href="mailto:Raf...@e-...">Rafal Krzewski</a>
   * @author <a href="mailto:dl...@co...">Daniel Rall</a>
--- 36,58 ----
  
  /**
!  * <p>
!  * High level API for processing file uploads.
!  * </p>
!  * 
!  * <p>
!  * This class handles multiple files per single HTML widget, sent using
!  * < code > multipart / mixed < / code > encoding type, as specified by <a
!  * href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>. Use
!  * {@link #parseRequest(HttpServletRequest)} to acquire a list of
!  * {@link org.apache.commons.fileupload.FileItem}s associated with a given HTML
!  * widget.
!  * </p>
!  * 
!  * <p>
!  * Files will be stored in temporary disk storage or in memory, depending on
!  * request size, and will be available as
!  * {@link org.apache.commons.fileupload.FileItem}s.
!  * </p>
!  * 
   * @author <a href="mailto:Raf...@e-...">Rafal Krzewski</a>
   * @author <a href="mailto:dl...@co...">Daniel Rall</a>
***************
*** 55,63 ****
   * @author <a href="mailto:ma...@ap...">Martin Cooper</a>
   * @author Sean C. Sullivan
!  *
   * @version $Id$
   */
! public class FileUpload
! {
  
  	// ----------------------------------------------------- Class methods
--- 61,68 ----
   * @author <a href="mailto:ma...@ap...">Martin Cooper</a>
   * @author Sean C. Sullivan
!  * 
   * @version $Id$
   */
! public class FileUpload {
  
  	// ----------------------------------------------------- Class methods
***************
*** 70,88 ****
  	 * Utility method that determines whether the request contains multipart
  	 * content.
! 	 *
! 	 * @param req The servlet request to be evaluated. Must be non-null.
! 	 *
! 	 * @return <code>true</code> if the request is multipart;
! 	 *         <code>false</code> otherwise.
  	 */
! 	public static final boolean isMultipartContent(HttpServletRequest req)
! 	{
  		String contentType = req.getHeader(CONTENT_TYPE);
! 		if (contentType == null)
! 		{
  			return false;
  		}
! 		if (contentType.startsWith(MULTIPART))
! 		{
  			return true;
  		}
--- 75,91 ----
  	 * Utility method that determines whether the request contains multipart
  	 * content.
! 	 * 
! 	 * @param req
! 	 *            The servlet request to be evaluated. Must be non-null.
! 	 * 
! 	 * @return <code>true</code> if the request is multipart; <code>false</code>
! 	 *         otherwise.
  	 */
! 	public static final boolean isMultipartContent(HttpServletRequest req) {
  		String contentType = req.getHeader(CONTENT_TYPE);
! 		if (contentType == null) {
  			return false;
  		}
! 		if (contentType.startsWith(MULTIPART)) {
  			return true;
  		}
***************
*** 128,133 ****
  
  	/**
! 	 * The maximum length of a single header line that will be parsed
! 	 * (1024 bytes).
  	 */
  	public static final int MAX_HEADER_SIZE = 1024;
--- 131,136 ----
  
  	/**
! 	 * The maximum length of a single header line that will be parsed (1024
! 	 * bytes).
  	 */
  	public static final int MAX_HEADER_SIZE = 1024;
***************
*** 154,165 ****
  	/**
  	 * Returns the maximum allowed upload size.
! 	 *
  	 * @return The maximum allowed size, in bytes.
! 	 *
  	 * @see #setSizeMax(int)
! 	 *
  	 */
! 	public int getSizeMax()
! 	{
  		return _sizeMax;
  	}
--- 157,167 ----
  	/**
  	 * Returns the maximum allowed upload size.
! 	 * 
  	 * @return The maximum allowed size, in bytes.
! 	 * 
  	 * @see #setSizeMax(int)
! 	 * 
  	 */
! 	public int getSizeMax() {
  		return _sizeMax;
  	}
***************
*** 167,178 ****
  	/**
  	 * Sets the maximum allowed upload size. If negative, there is no maximum.
! 	 *
! 	 * @param sizeMax The maximum allowed size, in bytes, or -1 for no maximum.
! 	 *
  	 * @see #getSizeMax()
! 	 *
  	 */
! 	public void setSizeMax(int sizeMax)
! 	{
  		this._sizeMax = sizeMax;
  	}
--- 169,180 ----
  	/**
  	 * Sets the maximum allowed upload size. If negative, there is no maximum.
! 	 * 
! 	 * @param sizeMax
! 	 *            The maximum allowed size, in bytes, or -1 for no maximum.
! 	 * 
  	 * @see #getSizeMax()
! 	 * 
  	 */
! 	public void setSizeMax(int sizeMax) {
  		this._sizeMax = sizeMax;
  	}
***************
*** 181,193 ****
  	 * Returns the size threshold beyond which files are written directly to
  	 * disk. The default value is 1024 bytes.
! 	 *
  	 * @return The size threshold, in bytes.
! 	 *
  	 * @see #setSizeThreshold(int)
! 	 *
! 	 *
  	 */
! 	public int getSizeThreshold()
! 	{
  		return _sizeThreshold;
  	}
--- 183,194 ----
  	 * Returns the size threshold beyond which files are written directly to
  	 * disk. The default value is 1024 bytes.
! 	 * 
  	 * @return The size threshold, in bytes.
! 	 * 
  	 * @see #setSizeThreshold(int)
! 	 * 
! 	 * 
  	 */
! 	public int getSizeThreshold() {
  		return _sizeThreshold;
  	}
***************
*** 195,234 ****
  	/**
  	 * Sets the size threshold beyond which files are written directly to disk.
! 	 *
! 	 * @param sizeThreshold The size threshold, in bytes.
! 	 *
  	 * @see #getSizeThreshold()
! 	 *
  	 */
! 	public void setSizeThreshold(int sizeThreshold)
! 	{
  		this._sizeThreshold = sizeThreshold;
  	}
  
  	/**
! 	 * Returns the location used to temporarily store files that are larger
! 	 * than the configured size threshold.
! 	 *
  	 * @return The path to the temporary file location.
! 	 *
  	 * @see #setRepositoryPath(String)
! 	 *
  	 */
! 	public String getRepositoryPath()
! 	{
  		return _repositoryPath;
  	}
  
  	/**
! 	 * Sets the location used to temporarily store files that are larger
! 	 * than the configured size threshold.
! 	 *
! 	 * @param repositoryPath The path to the temporary file location.
! 	 *
  	 * @see #getRepositoryPath()
! 	 *
  	 */
! 	public void setRepositoryPath(String repositoryPath)
! 	{
  		this._repositoryPath = repositoryPath;
  	}
--- 196,234 ----
  	/**
  	 * Sets the size threshold beyond which files are written directly to disk.
! 	 * 
! 	 * @param sizeThreshold
! 	 *            The size threshold, in bytes.
! 	 * 
  	 * @see #getSizeThreshold()
! 	 * 
  	 */
! 	public void setSizeThreshold(int sizeThreshold) {
  		this._sizeThreshold = sizeThreshold;
  	}
  
  	/**
! 	 * Returns the location used to temporarily store files that are larger than
! 	 * the configured size threshold.
! 	 * 
  	 * @return The path to the temporary file location.
! 	 * 
  	 * @see #setRepositoryPath(String)
! 	 * 
  	 */
! 	public String getRepositoryPath() {
  		return _repositoryPath;
  	}
  
  	/**
! 	 * Sets the location used to temporarily store files that are larger than
! 	 * the configured size threshold.
! 	 * 
! 	 * @param repositoryPath
! 	 *            The path to the temporary file location.
! 	 * 
  	 * @see #getRepositoryPath()
! 	 * 
  	 */
! 	public void setRepositoryPath(String repositoryPath) {
  		this._repositoryPath = repositoryPath;
  	}
***************
*** 238,255 ****
  	/**
  	 * Processes an <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>
! 	 * compliant <code>multipart/form-data</code> stream. If files are stored
! 	 * on disk, the path is given by <code>getRepositoryPath()</code>.
! 	 *
! 	 * @param req The servlet request to be parsed.
! 	 *
  	 * @return A list of <code>FileItem</code> instances parsed from the
  	 *         request, in the order that they were transmitted.
! 	 *
! 	 * @exception FileUploadException if there are problems reading/parsing
! 	 *                                the request or storing files.
  	 */
! 	public List parseRequest(HttpServletRequest request)
! 			throws PortalProcessException
! 	{
  		return parseRequest(request, getSizeThreshold(), getSizeMax(),
  				getRepositoryPath());
--- 238,256 ----
  	/**
  	 * Processes an <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>
! 	 * compliant <code>multipart/form-data</code> stream. If files are stored on
! 	 * disk, the path is given by <code>getRepositoryPath()</code>.
! 	 * 
! 	 * @param req
! 	 *            The servlet request to be parsed.
! 	 * 
  	 * @return A list of <code>FileItem</code> instances parsed from the
  	 *         request, in the order that they were transmitted.
! 	 * 
! 	 * @exception FileUploadException
! 	 *                if there are problems reading/parsing the request or
! 	 *                storing files.
  	 */
! 	public List<FileItem> parseRequest(HttpServletRequest request)
! 			throws PortalProcessException {
  		return parseRequest(request, getSizeThreshold(), getSizeMax(),
  				getRepositoryPath());
***************
*** 258,282 ****
  	/**
  	 * Processes an <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>
! 	 * compliant <code>multipart/form-data</code> stream. If files are stored
! 	 * on disk, the path is given by <code>getRepositoryPath()</code>.
! 	 *
! 	 * @param req           The servlet request to be parsed. Must be non-null.
! 	 * @param sizeThreshold The max size in bytes to be stored in memory.
! 	 * @param sizeMax       The maximum allowed upload size, in bytes.
! 	 * @param path          The location where the files should be stored.
! 	 *
  	 * @return A list of <code>FileItem</code> instances parsed from the
  	 *         request, in the order that they were transmitted.
! 	 *
! 	 * @exception FileUploadException if there are problems reading/parsing
! 	 *                                the request or storing files.
  	 */
! 	public List parseRequest(HttpServletRequest request,
! 			int pSizeThreshold,
! 			int pSizeMax,
! 			String pPath) throws PortalProcessException
! 	{
! 		if (null == request)
! 		{
  			throw new NullPointerException("req parameter");
  		}
--- 259,285 ----
  	/**
  	 * Processes an <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>
! 	 * compliant <code>multipart/form-data</code> stream. If files are stored on
! 	 * disk, the path is given by <code>getRepositoryPath()</code>.
! 	 * 
! 	 * @param req
! 	 *            The servlet request to be parsed. Must be non-null.
! 	 * @param sizeThreshold
! 	 *            The max size in bytes to be stored in memory.
! 	 * @param sizeMax
! 	 *            The maximum allowed upload size, in bytes.
! 	 * @param path
! 	 *            The location where the files should be stored.
! 	 * 
  	 * @return A list of <code>FileItem</code> instances parsed from the
  	 *         request, in the order that they were transmitted.
! 	 * 
! 	 * @exception FileUploadException
! 	 *                if there are problems reading/parsing the request or
! 	 *                storing files.
  	 */
! 	public List<FileItem> parseRequest(HttpServletRequest request,
! 			int pSizeThreshold, int pSizeMax, String pPath)
! 			throws PortalProcessException {
! 		if (null == request) {
  			throw new NullPointerException("req parameter");
  		}
***************
*** 284,289 ****
  		String contentType = request.getHeader(CONTENT_TYPE);
  
! 		if ((null == contentType) || (!contentType.startsWith(MULTIPART)))
! 		{
  			throw new PortalProcessException("the request doesn't contain a "
  					+ MULTIPART_FORM_DATA + " or " + MULTIPART_MIXED
--- 287,291 ----
  		String contentType = request.getHeader(CONTENT_TYPE);
  
! 		if ((null == contentType) || (!contentType.startsWith(MULTIPART))) {
  			throw new PortalProcessException("the request doesn't contain a "
  					+ MULTIPART_FORM_DATA + " or " + MULTIPART_MIXED
***************
*** 292,297 ****
  		int requestSize = request.getContentLength();
  
! 		if (requestSize == -1)
! 		{
  			throw new PortalProcessException(
  					"the request was rejected because "
--- 294,298 ----
  		int requestSize = request.getContentLength();
  
! 		if (requestSize == -1) {
  			throw new PortalProcessException(
  					"the request was rejected because "
***************
*** 299,304 ****
  		}
  
! 		if (pSizeMax >= 0 && requestSize > pSizeMax)
! 		{
  			throw new PortalProcessException(
  					"the request was rejected because "
--- 300,304 ----
  		}
  
! 		if (pSizeMax >= 0 && requestSize > pSizeMax) {
  			throw new PortalProcessException(
  					"the request was rejected because "
***************
*** 310,323 ****
  	}
  
! 	private ArrayList internalParseRequest(HttpServletRequest request,
! 			int pSizeThreshold,
! 			String pPath,
! 			String contentType,
! 			int requestSize) throws PortalProcessException
! 	{
! 		ArrayList items = new ArrayList();
  
! 		try
! 		{
  			byte[] boundary = contentType.substring(
  					contentType.indexOf("boundary=")
--- 310,319 ----
  	}
  
! 	private List<FileItem> internalParseRequest(HttpServletRequest request,
! 			int pSizeThreshold, String pPath, String contentType,
! 			int requestSize) throws PortalProcessException {
! 		List<FileItem> items = new ArrayList<FileItem>();
  
! 		try {
  			byte[] boundary = contentType.substring(
  					contentType.indexOf("boundary=")
***************
*** 328,341 ****
  			MultipartStream multi = new MultipartStream(input, boundary);
  			boolean nextPart = multi.skipPreamble();
! 			while (nextPart)
! 			{
! 				Map headers = parseHeaders(multi.readHeaders());
  				String fieldName = getFieldName(headers);
! 				if (fieldName != null)
! 				{
  					String subContentType = getHeader(headers, CONTENT_TYPE);
  					if (subContentType != null
! 							&& subContentType.startsWith(MULTIPART_MIXED))
! 					{
  						// Multiple files.
  						byte[] subBoundary = subContentType.substring(
--- 324,334 ----
  			MultipartStream multi = new MultipartStream(input, boundary);
  			boolean nextPart = multi.skipPreamble();
! 			while (nextPart) {
! 				Map<String, String> headers = parseHeaders(multi.readHeaders());
  				String fieldName = getFieldName(headers);
! 				if (fieldName != null) {
  					String subContentType = getHeader(headers, CONTENT_TYPE);
  					if (subContentType != null
! 							&& subContentType.startsWith(MULTIPART_MIXED)) {
  						// Multiple files.
  						byte[] subBoundary = subContentType.substring(
***************
*** 345,369 ****
  						multi.setBoundary(subBoundary);
  						boolean nextSubPart = multi.skipPreamble();
! 						while (nextSubPart)
! 						{
  							headers = parseHeaders(multi.readHeaders());
! 							if (getFileName(headers) != null)
! 							{
  								FileItem item = createItem(pSizeThreshold,
  										pPath, headers, requestSize);
  								OutputStream os = item.getOutputStream();
! 								try
! 								{
  									multi.readBodyData(os);
! 								}
! 								finally
! 								{
  									os.close();
  								}
  								item.setFieldName(getFieldName(headers));
  								items.add(item);
! 							}
! 							else
! 							{
  								// Ignore anything but files inside
  								// multipart/mixed.
--- 338,355 ----
  						multi.setBoundary(subBoundary);
  						boolean nextSubPart = multi.skipPreamble();
! 						while (nextSubPart) {
  							headers = parseHeaders(multi.readHeaders());
! 							if (getFileName(headers) != null) {
  								FileItem item = createItem(pSizeThreshold,
  										pPath, headers, requestSize);
  								OutputStream os = item.getOutputStream();
! 								try {
  									multi.readBodyData(os);
! 								} finally {
  									os.close();
  								}
  								item.setFieldName(getFieldName(headers));
  								items.add(item);
! 							} else {
  								// Ignore anything but files inside
  								// multipart/mixed.
***************
*** 373,408 ****
  						}
  						multi.setBoundary(boundary);
! 					}
! 					else
! 					{
! 						if (getFileName(headers) != null)
! 						{
  							// A single file.
  							FileItem item = createItem(pSizeThreshold, pPath,
  									headers, requestSize);
  							OutputStream os = item.getOutputStream();
! 							try
! 							{
  								multi.readBodyData(os);
! 							}
! 							finally
! 							{
  								os.close();
  							}
  							item.setFieldName(getFieldName(headers));
  							items.add(item);
! 						}
! 						else
! 						{
  							// A form field.
  							FileItem item = createItem(pSizeThreshold, pPath,
  									headers, requestSize);
  							OutputStream os = item.getOutputStream();
! 							try
! 							{
  								multi.readBodyData(os);
! 							}
! 							finally
! 							{
  								os.close();
  							}
--- 359,383 ----
  						}
  						multi.setBoundary(boundary);
! 					} else {
! 						if (getFileName(headers) != null) {
  							// A single file.
  							FileItem item = createItem(pSizeThreshold, pPath,
  									headers, requestSize);
  							OutputStream os = item.getOutputStream();
! 							try {
  								multi.readBodyData(os);
! 							} finally {
  								os.close();
  							}
  							item.setFieldName(getFieldName(headers));
  							items.add(item);
! 						} else {
  							// A form field.
  							FileItem item = createItem(pSizeThreshold, pPath,
  									headers, requestSize);
  							OutputStream os = item.getOutputStream();
! 							try {
  								multi.readBodyData(os);
! 							} finally {
  								os.close();
  							}
***************
*** 412,418 ****
  						}
  					}
! 				}
! 				else
! 				{
  					// Skip this part.
  					multi.discardBodyData();
--- 387,391 ----
  						}
  					}
! 				} else {
  					// Skip this part.
  					multi.discardBodyData();
***************
*** 420,426 ****
  				nextPart = multi.readBoundary();
  			}
! 		}
! 		catch (IOException e)
! 		{
  			throw new PortalProcessException("Processing of "
  					+ MULTIPART_FORM_DATA + " request failed. ", e);
--- 393,397 ----
  				nextPart = multi.readBoundary();
  			}
! 		} catch (IOException e) {
  			throw new PortalProcessException("Processing of "
  					+ MULTIPART_FORM_DATA + " request failed. ", e);
***************
*** 433,454 ****
  
  	/**
! 	 * Retrieves the file name from the <code>Content-disposition</code>
! 	 * header.
! 	 *
! 	 * @param headers A <code>Map</code> containing the HTTP request headers.
! 	 *
  	 * @return The file name for the current <code>encapsulation</code>.
  	 */
! 	protected String getFileName(Map /* String, String */
! 	headers)
! 	{
  		String fileName = null;
  		String cd = getHeader(headers, CONTENT_DISPOSITION);
! 		if (cd.startsWith(FORM_DATA) || cd.startsWith(ATTACHMENT))
! 		{
  			int start = cd.indexOf("filename=\"");
  			int end = cd.indexOf('"', start + FILENAME_HEADER_PREFIX_SIZE);
! 			if (start != -1 && end != -1)
! 			{
  				fileName = cd.substring(start + FILENAME_HEADER_PREFIX_SIZE,
  						end).trim();
--- 404,421 ----
  
  	/**
! 	 * Retrieves the file name from the <code>Content-disposition</code> header.
! 	 * 
! 	 * @param headers
! 	 *            A <code>Map</code> containing the HTTP request headers.
! 	 * 
  	 * @return The file name for the current <code>encapsulation</code>.
  	 */
! 	protected String getFileName(Map<String, String> headers) {
  		String fileName = null;
  		String cd = getHeader(headers, CONTENT_DISPOSITION);
! 		if (cd.startsWith(FORM_DATA) || cd.startsWith(ATTACHMENT)) {
  			int start = cd.indexOf("filename=\"");
  			int end = cd.indexOf('"', start + FILENAME_HEADER_PREFIX_SIZE);
! 			if (start != -1 && end != -1) {
  				fileName = cd.substring(start + FILENAME_HEADER_PREFIX_SIZE,
  						end).trim();
***************
*** 461,480 ****
  	 * Retrieves the field name from the <code>Content-disposition</code>
  	 * header.
! 	 *
! 	 * @param headers A <code>Map</code> containing the HTTP request headers.
! 	 *
  	 * @return The field name for the current <code>encapsulation</code>.
  	 */
! 	protected String getFieldName(Map /* String, String */
! 	headers)
! 	{
  		String fieldName = null;
  		String cd = getHeader(headers, CONTENT_DISPOSITION);
! 		if (cd != null && cd.startsWith(FORM_DATA))
! 		{
  			int start = cd.indexOf("name=\"");
  			int end = cd.indexOf('"', start + NAME_HEADER_PREFIX_SIZE);
! 			if (start != -1 && end != -1)
! 			{
  				fieldName = cd.substring(start + NAME_HEADER_PREFIX_SIZE, end);
  			}
--- 428,444 ----
  	 * Retrieves the field name from the <code>Content-disposition</code>
  	 * header.
! 	 * 
! 	 * @param headers
! 	 *            A <code>Map</code> containing the HTTP request headers.
! 	 * 
  	 * @return The field name for the current <code>encapsulation</code>.
  	 */
! 	protected String getFieldName(Map<String, String> headers) {
  		String fieldName = null;
  		String cd = getHeader(headers, CONTENT_DISPOSITION);
! 		if (cd != null && cd.startsWith(FORM_DATA)) {
  			int start = cd.indexOf("name=\"");
  			int end = cd.indexOf('"', start + NAME_HEADER_PREFIX_SIZE);
! 			if (start != -1 && end != -1) {
  				fieldName = cd.substring(start + NAME_HEADER_PREFIX_SIZE, end);
  			}
***************
*** 485,522 ****
  	/**
  	 * Creates a new {@link org.apache.commons.fileupload.FileItem} instance.
! 	 *
! 	 * @param sizeThreshold The max size in bytes to be stored in memory.
! 	 * @param path          The path for the FileItem.
! 	 * @param headers       A <code>Map</code> containing the HTTP request
! 	 *                      headers.
! 	 * @param requestSize   The total size of the request, in bytes.
! 	 *
  	 * @return A newly created <code>FileItem</code> instance.
! 	 *
! 	 * @exception FileUploadException if an error occurs.
  	 */
! 	protected FileItem createItem(int pSizeThreshold, String path, Map /* String, String */
! 	headers, int requestSize) throws PortalProcessException
! 	{
! 		return FileItem.newInstance(path, getFileName(headers), getHeader(
! 				headers, CONTENT_TYPE), requestSize, pSizeThreshold);
  	}
  
  	/**
! 	 * <p> Parses the <code>header-part</code> and returns as key/value
! 	 * pairs.
! 	 *
! 	 * <p> If there are multiple headers of the same names, the name
! 	 * will map to a comma-separated list containing the values.
! 	 *
! 	 * @param headerPart The <code>header-part</code> of the current
! 	 *                   <code>encapsulation</code>.
! 	 *
  	 * @return A <code>Map</code> containing the parsed HTTP request headers.
  	 */
! 	protected Map /* String, String */
! 	parseHeaders(String headerPart)
! 	{
! 		Map headers = new HashMap();
  		char[] buffer = new char[MAX_HEADER_SIZE];
  		boolean done = false;
--- 449,490 ----
  	/**
  	 * Creates a new {@link org.apache.commons.fileupload.FileItem} instance.
! 	 * 
! 	 * @param sizeThreshold
! 	 *            The max size in bytes to be stored in memory.
! 	 * @param path
! 	 *            The path for the FileItem.
! 	 * @param headers
! 	 *            A <code>Map</code> containing the HTTP request headers.
! 	 * @param requestSize
! 	 *            The total size of the request, in bytes.
! 	 * 
  	 * @return A newly created <code>FileItem</code> instance.
! 	 * 
! 	 * @exception FileUploadException
! 	 *                if an error occurs.
  	 */
! 	protected FileItem createItem(int pSizeThreshold, String path,
! 			Map<String, String> headers, int requestSize)
! 			throws PortalProcessException {
! 		return FileItem.newInstance(path, getFileName(headers),
! 				getHeader(headers, CONTENT_TYPE), requestSize, pSizeThreshold);
  	}
  
  	/**
! 	 * <p>
! 	 * Parses the <code>header-part</code> and returns as key/value pairs.
! 	 * 
! 	 * <p>
! 	 * If there are multiple headers of the same names, the name will map to a
! 	 * comma-separated list containing the values.
! 	 * 
! 	 * @param headerPart
! 	 *            The <code>header-part</code> of the current
! 	 *            <code>encapsulation</code>.
! 	 * 
  	 * @return A <code>Map</code> containing the parsed HTTP request headers.
  	 */
! 	protected Map<String, String> parseHeaders(String headerPart) {
! 		Map<String, String> headers = new HashMap<String, String>();
  		char[] buffer = new char[MAX_HEADER_SIZE];
  		boolean done = false;
***************
*** 524,571 ****
  		int i;
  		String header, headerName, headerValue;
! 		try
! 		{
! 			while (!done)
! 			{
  				i = 0;
  				// Copy a single line of characters into the buffer,
  				// omitting trailing CRLF.
! 				while (i < 2 || buffer[i - 2] != '\r' || buffer[i - 1] != '\n')
! 				{
  					buffer[i++] = headerPart.charAt(j++);
  				}
  				header = new String(buffer, 0, i - 2);
! 				if (header.equals(""))
! 				{
  					done = true;
! 				}
! 				else
! 				{
! 					if (header.indexOf(':') == -1)
! 					{
  						// This header line is malformed, skip it.
  						continue;
  					}
  					headerName = header.substring(0, header.indexOf(':'))
! 							.trim()
! 							.toLowerCase();
  					headerValue = header.substring(header.indexOf(':') + 1)
  							.trim();
! 					if (getHeader(headers, headerName) != null)
! 					{
  						// More that one heder of that name exists,
  						// append to the list.
  						headers.put(headerName, getHeader(headers, headerName)
  								+ ',' + headerValue);
! 					}
! 					else
! 					{
  						headers.put(headerName, headerValue);
  					}
  				}
  			}
! 		}
! 		catch (IndexOutOfBoundsException e)
! 		{
  			// Headers were malformed. continue with all that was
  			// parsed.
--- 492,526 ----
  		int i;
  		String header, headerName, headerValue;
! 		try {
! 			while (!done) {
  				i = 0;
  				// Copy a single line of characters into the buffer,
  				// omitting trailing CRLF.
! 				while (i < 2 || buffer[i - 2] != '\r' || buffer[i - 1] != '\n') {
  					buffer[i++] = headerPart.charAt(j++);
  				}
  				header = new String(buffer, 0, i - 2);
! 				if (header.equals("")) {
  					done = true;
! 				} else {
! 					if (header.indexOf(':') == -1) {
  						// This header line is malformed, skip it.
  						continue;
  					}
  					headerName = header.substring(0, header.indexOf(':'))
! 							.trim().toLowerCase();
  					headerValue = header.substring(header.indexOf(':') + 1)
  							.trim();
! 					if (getHeader(headers, headerName) != null) {
  						// More that one heder of that name exists,
  						// append to the list.
  						headers.put(headerName, getHeader(headers, headerName)
  								+ ',' + headerValue);
! 					} else {
  						headers.put(headerName, headerValue);
  					}
  				}
  			}
! 		} catch (IndexOutOfBoundsException e) {
  			// Headers were malformed. continue with all that was
  			// parsed.
***************
*** 577,590 ****
  	 * Returns the header with the specified name from the supplied map. The
  	 * header lookup is case-insensitive.
! 	 *
! 	 * @param headers A <code>Map</code> containing the HTTP request headers.
! 	 * @param name    The name of the header to return.
! 	 *
! 	 * @return The value of specified header, or a comma-separated list if
! 	 *         there were multiple headers of that name.
  	 */
! 	protected final String getHeader(Map /* String, String */
! 	headers, String name)
! 	{
  		return (String) headers.get(name.toLowerCase());
  	}
--- 532,545 ----
  	 * Returns the header with the specified name from the supplied map. The
  	 * header lookup is case-insensitive.
! 	 * 
! 	 * @param headers
! 	 *            A <code>Map</code> containing the HTTP request headers.
! 	 * @param name
! 	 *            The name of the header to return.
! 	 * 
! 	 * @return The value of specified header, or a comma-separated list if there
! 	 *         were multiple headers of that name.
  	 */
! 	protected final String getHeader(Map<String, String> headers, String name) {
  		return (String) headers.get(name.toLowerCase());
  	}

Index: FormParameter.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/upload/FormParameter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FormParameter.java	13 Sep 2005 11:28:01 -0000	1.1
--- FormParameter.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  import java.util.ArrayList;
  import java.util.Collection;
+ import java.util.List;
  
  import portal.rt.servlet.PortalProcessException;
***************
*** 34,38 ****
  		this._name = name;
  
! 		_values = new ArrayList();
  	}
  
--- 35,39 ----
  		this._name = name;
  
! 		_values = new ArrayList<String>();
  	}
  
***************
*** 54,58 ****
  	}
  
! 	public Collection getValues() throws PortalProcessException
  	{
  		if (_values.size() < 1)
--- 55,59 ----
  	}
  
! 	public Collection<String> getValues() throws PortalProcessException
  	{
  		if (_values.size() < 1)
***************
*** 72,75 ****
  
  	private String _name;
! 	private ArrayList _values;
  }
\ No newline at end of file
--- 73,76 ----
  
  	private String _name;
! 	private List<String> _values;
  }
\ No newline at end of file

Index: MultipartStream.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/upload/MultipartStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MultipartStream.java	13 Sep 2005 11:28:01 -0000	1.1
--- MultipartStream.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 648,651 ****
--- 648,653 ----
  	public class MalformedStreamException extends IOException
  	{
+ 		private static final long serialVersionUID = 1L;
+ 
  		/**
  		 * Constructs a <code>MalformedStreamException</code> with no
***************
*** 674,677 ****
--- 676,681 ----
  	public class IllegalBoundaryException extends IOException
  	{
+ 		private static final long serialVersionUID = 1L;
+ 
  		/**
  		 * Constructs an <code>IllegalBoundaryException</code> with no

[pfc-cvs-commit] pfc-rt/src/java/portal/rt/comp/session SessionChooser.java, 1.1, 1.2

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

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

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

Index: SessionChooser.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/comp/session/SessionChooser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SessionChooser.java	13 Sep 2005 11:28:01 -0000	1.1
--- SessionChooser.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 45,48 ****
--- 45,50 ----
  public class SessionChooser extends PanelDelegator
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(ApplicationDesktop.class);
  
***************
*** 76,83 ****
  				new VelocityLayout("portal/comp/session/SessionChooser.vm"));
  		
! 		DefaultListDataModel sessionListModel = new DefaultListDataModel();
  		_selectionModel = new DefaultSelectionModel(SelectionMode.SINGLE_SELECTION);
  		
! 		ListBox sessionList = new ListBox(sessionListModel, _selectionModel);
  		sessionList.setListItemRenderer(new SessionListRenderer());
  		
--- 78,85 ----
  				new VelocityLayout("portal/comp/session/SessionChooser.vm"));
  		
! 		DefaultListDataModel<ISession> sessionListModel = new DefaultListDataModel<ISession>();
  		_selectionModel = new DefaultSelectionModel(SelectionMode.SINGLE_SELECTION);
  		
! 		ListBox<ISession> sessionList = new ListBox<ISession>(sessionListModel, _selectionModel);
  		sessionList.setListItemRenderer(new SessionListRenderer());
  		
***************
*** 94,97 ****
--- 96,101 ----
  		resumeSessionButton.setCaption("Resume Session");
  		resumeSessionButton.setAction(new IAction() {
+ 			private static final long serialVersionUID = 1L;
+ 
  			public void doAction()
  			{
***************
*** 103,106 ****
--- 107,112 ----
  		createSessionButton.setCaption("Create Session");
  		createSessionButton.setAction(new IAction() {
+ 			private static final long serialVersionUID = 1L;
+ 
  			public void doAction()
  			{
***************
*** 136,140 ****
  	
  	private CachedServiceRef _sessionServiceRef;
! 	private List _sessions;
  	
  	private DefaultSelectionModel _selectionModel;
--- 142,146 ----
  	
  	private CachedServiceRef _sessionServiceRef;
! 	private List<ISession> _sessions;
  	
  	private DefaultSelectionModel _selectionModel;

[pfc-cvs-commit] pfc-rt/src/java/portal/rt/ui/render GraphicsDevice.java, 1.3, 1.4 RootRenderContext.java, 1.3, 1.4

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

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

Modified Files:
	GraphicsDevice.java RootRenderContext.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: RootRenderContext.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/render/RootRenderContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RootRenderContext.java	3 Sep 2006 21:00:31 -0000	1.3
--- RootRenderContext.java	7 Aug 2010 11:06:58 -0000	1.4
***************
*** 55,59 ****
  			.getLog(RootRenderContext.class);
  
! 	public RootRenderContext(Component component,
  			IHttpProcessContext processContext) throws RenderException
  	{
--- 55,59 ----
  			.getLog(RootRenderContext.class);
  
! 	public RootRenderContext(Component<?> component,
  			IHttpProcessContext processContext) throws RenderException
  	{
***************
*** 71,75 ****
  	}
  
! 	public void addExtention(Class pInterface, IOptionalInterface pImplementor)
  			throws NotAnOptionalInterfaceException, InterfaceRuntimeException
  	{
--- 71,75 ----
  	}
  
! 	public void addExtention(Class<?> pInterface, IOptionalInterface pImplementor)
  			throws NotAnOptionalInterfaceException, InterfaceRuntimeException
  	{
***************
*** 169,173 ****
  	}
  
! 	public void includeComponent(Component childComponent)
  			throws RenderException, IOException
  	{
--- 169,173 ----
  	}
  
! 	public void includeComponent(Component<?> childComponent)
  			throws RenderException, IOException
  	{

Index: GraphicsDevice.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/render/GraphicsDevice.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GraphicsDevice.java	15 Dec 2006 23:06:15 -0000	1.3
--- GraphicsDevice.java	7 Aug 2010 11:06:58 -0000	1.4
***************
*** 66,69 ****
--- 66,71 ----
  public class GraphicsDevice implements Serializable, HttpSessionBindingListener
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(GraphicsDevice.class);
  
***************
*** 211,215 ****
  
  	private ErrorState internalRender(IHttpProcessContext context,
! 			Component rootComponent)
  	{
  		try
--- 213,217 ----
  
  	private ErrorState internalRender(IHttpProcessContext context,
! 			Component<?> rootComponent)
  	{
  		try
***************
*** 286,294 ****
  		try
  		{
! 			Iterator it = getUpdaterMap().getKeyIterator();
  
  			while (it.hasNext())
  			{
! 				String key = (String) it.next();
  
  				IUpdater updater = getUpdaterMap().getUpdater(key);
--- 288,296 ----
  		try
  		{
! 			Iterator<String> it = getUpdaterMap().getKeyIterator();
  
  			while (it.hasNext())
  			{
! 				String key = it.next();
  
  				IUpdater updater = getUpdaterMap().getUpdater(key);
***************
*** 322,330 ****
  		IAction action = null;
  
! 		Iterator it = getActionMap().getKeyIterator();
  
  		while (it.hasNext())
  		{
! 			String key = (String) it.next();
  
  			// .x and .y are required for image maps and alike
--- 324,332 ----
  		IAction action = null;
  
! 		Iterator<String> it = getActionMap().getKeyIterator();
  
  		while (it.hasNext())
  		{
! 			String key = it.next();
  
  			// .x and .y are required for image maps and alike

[pfc-cvs-commit] pfc-rt/src/java/portal/rt/services/velocity VelocityServiceImpl.java, 1.1, 1.2

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

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

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

Index: VelocityServiceImpl.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/velocity/VelocityServiceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VelocityServiceImpl.java	13 Sep 2005 11:28:01 -0000	1.1
--- VelocityServiceImpl.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 66,73 ****
  			if (_serviceConfig.getAttributeNames() != null)
  			{
! 				Iterator it = _serviceConfig.getAttributeNames().iterator();
  				while (it.hasNext())
  				{
! 					String attrName = (String) it.next();
  					String attrValue = _serviceConfig.getAttributeValue(attrName);
  
--- 66,73 ----
  			if (_serviceConfig.getAttributeNames() != null)
  			{
! 				Iterator<String> it = _serviceConfig.getAttributeNames().iterator();
  				while (it.hasNext())
  				{
! 					String attrName = it.next();
  					String attrValue = _serviceConfig.getAttributeValue(attrName);
  

[pfc-cvs-commit] pfc-rt/src/java/portal/rt/services/monitor ObjectMonitorTarget.java, 1.1, 1.2 MonitorServiceImpl.java, 1.1, 1.2

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

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

Modified Files:
	ObjectMonitorTarget.java MonitorServiceImpl.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: ObjectMonitorTarget.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/monitor/ObjectMonitorTarget.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ObjectMonitorTarget.java	13 Sep 2005 11:28:01 -0000	1.1
--- ObjectMonitorTarget.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 28,39 ****
  public class ObjectMonitorTarget
  {
! 	public ObjectMonitorTarget(Class pInterface)
  	{
  		_pInterface = pInterface;
  
! 		_methodTargets = new HashMap();
  	}
  
! 	public Class getMonitoredInterface()
  	{
  		return _pInterface;
--- 28,39 ----
  public class ObjectMonitorTarget
  {
! 	public ObjectMonitorTarget(Class<?> pInterface)
  	{
  		_pInterface = pInterface;
  
! 		_methodTargets = new HashMap<Method,MethodMonitorTarget>();
  	}
  
! 	public Class<?> getMonitoredInterface()
  	{
  		return _pInterface;
***************
*** 54,59 ****
  	}
  
! 	private Class _pInterface;
  
! 	private HashMap _methodTargets;
  }
\ No newline at end of file
--- 54,59 ----
  	}
  
! 	private Class<?> _pInterface;
  
! 	private HashMap<Method,MethodMonitorTarget> _methodTargets;
  }
\ No newline at end of file

Index: MonitorServiceImpl.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/services/monitor/MonitorServiceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MonitorServiceImpl.java	13 Sep 2005 11:28:01 -0000	1.1
--- MonitorServiceImpl.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 34,41 ****
  		this._namespace = namespace;
  
! 		_targetInterfaces = new HashMap();
  	}
  
! 	public Object monitor(Object pTarget, Class pInterface, String pName)
  	{
  		if (!isStopped())
--- 34,41 ----
  		this._namespace = namespace;
  
! 		_targetInterfaces = new HashMap<Class<?>,ObjectMonitorTarget>();
  	}
  
! 	public Object monitor(Object pTarget, Class<?> pInterface, String pName)
  	{
  		if (!isStopped())
***************
*** 85,89 ****
  	}
  
! 	private HashMap _targetInterfaces;
  
  	private boolean _stopped = true;
--- 85,89 ----
  	}
  
! 	private HashMap<Class<?>,ObjectMonitorTarget> _targetInterfaces;
  
  	private boolean _stopped = true;

[pfc-cvs-commit] pfc-rt/src/java/portal/rt/ui/login/simple SimpleLoginUI.java, 1.1, 1.2 SimpleLoginClient.java, 1.2, 1.3 LoginFormModel.java, 1.1, 1.2

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

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

Modified Files:
	SimpleLoginUI.java SimpleLoginClient.java LoginFormModel.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: SimpleLoginClient.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/login/simple/SimpleLoginClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SimpleLoginClient.java	30 Jul 2010 21:25:11 -0000	1.2
--- SimpleLoginClient.java	7 Aug 2010 11:06:58 -0000	1.3
***************
*** 45,48 ****
--- 45,50 ----
  public class SimpleLoginClient implements LoginClient
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(SimpleLoginClient.class);
  
***************
*** 91,95 ****
  	}
  
! 	public Component getComponent()
  	{
  		return _loginUI;
--- 93,97 ----
  	}
  
! 	public Component<?> getComponent()
  	{
  		return _loginUI;
***************
*** 148,151 ****
--- 150,155 ----
  	private class LoginAction implements IAction
  	{
+ 		private static final long serialVersionUID = 1L;
+ 
  		public void doAction()
  		{

Index: SimpleLoginUI.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/login/simple/SimpleLoginUI.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SimpleLoginUI.java	13 Sep 2005 11:28:01 -0000	1.1
--- SimpleLoginUI.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 34,37 ****
--- 34,39 ----
  public final class SimpleLoginUI extends PanelDelegator
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public SimpleLoginUI() throws RegistryException
  	{

Index: LoginFormModel.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/ui/login/simple/LoginFormModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LoginFormModel.java	13 Sep 2005 11:28:01 -0000	1.1
--- LoginFormModel.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 29,32 ****
--- 29,34 ----
  public class LoginFormModel implements IModel
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public LoginFormModel()
  	{

[pfc-cvs-commit] pfc-api/src/java/portal/ui/comp/tabbed TabbedPane.java, 1.2, 1.3 SimpleTab.java, 1.1, 1.2 Tab.java, 1.1, 1.2 InternalTab.java, 1.1, 1.2

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

Update of /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tabbed
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7925/src/java/portal/ui/comp/tabbed

Modified Files:
	TabbedPane.java SimpleTab.java Tab.java InternalTab.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: TabbedPane.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tabbed/TabbedPane.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TabbedPane.java	1 Sep 2006 19:34:53 -0000	1.2
--- TabbedPane.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 27,31 ****
--- 27,33 ----
  import java.util.ArrayList;
  import java.util.Iterator;
+ import java.util.List;
  
+ import portal.model.IModel;
  import portal.ui.Component;
  import portal.ui.IAction;
***************
*** 35,48 ****
  import portal.validate.IValidationContext;
  
! public class TabbedPane extends Component implements IValidatable
  {
  	public TabbedPane()
  	{
! 		_tabs = new ArrayList();
  
  		_selectedTabIndex = -1;
  	}
  
! 	public Tab add(String title, Component component)
  	{
  		SimpleTab tab = new SimpleTab(title, component);
--- 37,52 ----
  import portal.validate.IValidationContext;
  
! public class TabbedPane extends Component<IModel> implements IValidatable
  {
+ 	private static final long serialVersionUID = 1L;
+ 	
  	public TabbedPane()
  	{
! 		_tabs = new ArrayList<InternalTab>();
  
  		_selectedTabIndex = -1;
  	}
  
! 	public Tab add(String title, Component<?> component)
  	{
  		SimpleTab tab = new SimpleTab(title, component);
***************
*** 149,153 ****
  	}
  
! 	public Iterator iterator()
  	{
  		return _tabs.iterator();
--- 153,157 ----
  	}
  
! 	public Iterator<InternalTab> iterator()
  	{
  		return _tabs.iterator();
***************
*** 156,164 ****
  	public void validate(IValidationContext validationContext)
  	{
! 		Iterator tabIterator = iterator();
  
  		while (tabIterator.hasNext())
  		{
! 			InternalTab tab = (InternalTab) tabIterator.next();
  
  			tab.validate(validationContext);
--- 160,168 ----
  	public void validate(IValidationContext validationContext)
  	{
! 		Iterator<InternalTab> tabIterator = iterator();
  
  		while (tabIterator.hasNext())
  		{
! 			InternalTab tab = tabIterator.next();
  
  			tab.validate(validationContext);
***************
*** 168,172 ****
  	public void draw(IRenderContext pRenderContext) throws RenderException, IOException
  	{
! 		Iterator tabIterator = iterator();
  
  		int selectedIndex = getSelectedIndex();
--- 172,176 ----
  	public void draw(IRenderContext pRenderContext) throws RenderException, IOException
  	{
! 		Iterator<InternalTab> tabIterator = iterator();
  
  		int selectedIndex = getSelectedIndex();
***************
*** 265,268 ****
--- 269,274 ----
  	private class SelectedAction implements IAction
  	{
+ 		private static final long serialVersionUID = 1L;
+ 
  		public SelectedAction(int index)
  		{
***************
*** 280,283 ****
  
  	private int _selectedTabIndex;
! 	private ArrayList _tabs;
  }
\ No newline at end of file
--- 286,289 ----
  
  	private int _selectedTabIndex;
! 	private List<InternalTab> _tabs;
  }
\ No newline at end of file

Index: SimpleTab.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tabbed/SimpleTab.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SimpleTab.java	13 Sep 2005 11:23:27 -0000	1.1
--- SimpleTab.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 29,33 ****
  public class SimpleTab implements Tab, IValidatable
  {
! 	public SimpleTab(String title, Component component)
  	{
  		this._title = title;
--- 29,35 ----
  public class SimpleTab implements Tab, IValidatable
  {
! 	private static final long serialVersionUID = 1L;
! 	
! 	public SimpleTab(String title, Component<?> component)
  	{
  		this._title = title;
***************
*** 41,45 ****
  	}
  
! 	public Component getComponent()
  	{
  		return _component;
--- 43,47 ----
  	}
  
! 	public Component<?> getComponent()
  	{
  		return _component;
***************
*** 74,77 ****
  	private boolean _enabled;
  	private String _title;
! 	private Component _component;
  }
\ No newline at end of file
--- 76,79 ----
  	private boolean _enabled;
  	private String _title;
! 	private Component<?> _component;
  }
\ No newline at end of file

Index: InternalTab.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tabbed/InternalTab.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InternalTab.java	13 Sep 2005 11:23:27 -0000	1.1
--- InternalTab.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 30,33 ****
--- 30,35 ----
  public class InternalTab implements Tab
  {
+ 	private static final long serialVersionUID = 1L;
+ 	
  	public InternalTab(Tab childTab)
  	{
***************
*** 46,50 ****
  	}
  
! 	public Component getComponent()
  	{
  		return getChildTab().getComponent();
--- 48,52 ----
  	}
  
! 	public Component<?> getComponent()
  	{
  		return getChildTab().getComponent();

Index: Tab.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tabbed/Tab.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Tab.java	13 Sep 2005 11:23:27 -0000	1.1
--- Tab.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 29,33 ****
  	String getTitle();
  
! 	Component getComponent();
  
  	boolean isEnabled();
--- 29,33 ----
  	String getTitle();
  
! 	Component<?> getComponent();
  
  	boolean isEnabled();

[pfc-cvs-commit] pfc-api/src/java/portal/ui/comp AbstractButton.java, 1.1, 1.2 DateSelector.java, 1.1, 1.2 TextInput.java, 1.6, 1.7 RadioButtonGroup.java, 1.1, 1.2 Panel.java, 1.1, 1.2 PanelDelegator.java, 1.2, 1.3 Button.java, 1.1, 1.2 Block.java, 1.1, 1.2 ActionLink.java, 1.1, 1.2 TextArea.java, 1.3, 1.4 Image.java, 1.4, 1.5 IconResource.java, 1.1, 1.2 ComponentDelegator.java, 1.2, 1.3 FileUpload.java, 1.1, 1.2 RadioButton.java, 1.1, 1.2 PasswordInput.java, 1.2, 1.3 CheckBox.java, 1.1, 1.2 Label.java, 1.2, 1.3 ProxyComponent.java, 1.2, 1.3

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

Update of /cvsroot/pfc/pfc-api/src/java/portal/ui/comp
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7925/src/java/portal/ui/comp

Modified Files:
	AbstractButton.java DateSelector.java TextInput.java 
	RadioButtonGroup.java Panel.java PanelDelegator.java 
	Button.java Block.java ActionLink.java TextArea.java 
	Image.java IconResource.java ComponentDelegator.java 
	FileUpload.java RadioButton.java PasswordInput.java 
	CheckBox.java Label.java ProxyComponent.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: TextArea.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/TextArea.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TextArea.java	7 Feb 2009 07:19:57 -0000	1.3
--- TextArea.java	6 Aug 2010 21:04:53 -0000	1.4
***************
*** 35,42 ****
--- 35,46 ----
  public class TextArea extends FormElement
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	//private static final Log LOGGER = LogFactory.getLog(TextArea.class);
  
  	private class TextAreaUpdater extends AbstractFormFieldUpdater
  	{
+ 		private static final long serialVersionUID = 1L;
+ 
  		public void update(String[] values)
  		{

Index: AbstractButton.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/AbstractButton.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractButton.java	13 Sep 2005 11:23:26 -0000	1.1
--- AbstractButton.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 23,31 ****
  package portal.ui.comp;
  
  import portal.ui.Component;
  import portal.ui.IAction;
  
! public class AbstractButton extends Component
  {
  	public final void setAction(IAction buttonAction)
  	{
--- 23,34 ----
  package portal.ui.comp;
  
+ import portal.model.IModel;
  import portal.ui.Component;
  import portal.ui.IAction;
  
! public class AbstractButton extends Component<IModel>
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public final void setAction(IAction buttonAction)
  	{

Index: Image.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/Image.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Image.java	3 Sep 2006 20:57:04 -0000	1.4
--- Image.java	6 Aug 2010 21:04:53 -0000	1.5
***************
*** 32,35 ****
--- 32,37 ----
  public class Image extends AbstractButton
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	// private static final Log LOGGER = LogFactory.getLog(Image.class);
  

Index: RadioButton.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/RadioButton.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RadioButton.java	13 Sep 2005 11:23:27 -0000	1.1
--- RadioButton.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 23,26 ****
--- 23,27 ----
  package portal.ui.comp;
  
+ import portal.model.IModel;
  import portal.model.ISelectableModel;
  import portal.ui.Component;
***************
*** 28,33 ****
  import portal.ui.render.RenderException;
  
! public final class RadioButton extends Component implements ISelectableModel
  {
  	public RadioButton()
  	{
--- 29,36 ----
  import portal.ui.render.RenderException;
  
! public final class RadioButton extends Component<IModel> implements ISelectableModel
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public RadioButton()
  	{

Index: RadioButtonGroup.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/RadioButtonGroup.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RadioButtonGroup.java	13 Sep 2005 11:23:27 -0000	1.1
--- RadioButtonGroup.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  import java.io.PrintWriter;
  import java.util.ArrayList;
+ import java.util.List;
  
  import portal.ui.AbstractFormFieldUpdater;
***************
*** 32,40 ****
  public final class RadioButtonGroup implements java.io.Serializable
  {
  	private static final int EMPTY_SELECTION = -1;
  
  	public RadioButtonGroup()
  	{
! 		_buttons = new ArrayList();
  	}
  
--- 33,43 ----
  public final class RadioButtonGroup implements java.io.Serializable
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final int EMPTY_SELECTION = -1;
  
  	public RadioButtonGroup()
  	{
! 		_buttons = new ArrayList<RadioButton>();
  	}
  
***************
*** 218,221 ****
--- 221,226 ----
  	private class RadioButtonUpdater extends AbstractFormFieldUpdater
  	{
+ 		private static final long serialVersionUID = 1L;
+ 
  		public void update(String[] values)
  		{
***************
*** 239,242 ****
  	private int _selectedButtonIndex;
  
! 	private ArrayList _buttons;
  }
\ No newline at end of file
--- 244,247 ----
  	private int _selectedButtonIndex;
  
! 	private List<RadioButton> _buttons;
  }
\ No newline at end of file

Index: Button.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/Button.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Button.java	13 Sep 2005 11:23:27 -0000	1.1
--- Button.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 30,33 ****
--- 30,35 ----
  public class Button extends AbstractButton
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public void draw(IRenderContext pRenderContext) throws RenderException
  	{

Index: ProxyComponent.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/ProxyComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ProxyComponent.java	1 Sep 2006 19:34:53 -0000	1.2
--- ProxyComponent.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 28,45 ****
  import org.apache.commons.logging.LogFactory;
  
  import portal.ui.Component;
  import portal.ui.render.IRenderContext;
  import portal.ui.render.RenderException;
  
! public class ProxyComponent extends Component
  {
  	private static final Log LOGGER = LogFactory.getLog(ProxyComponent.class);
  
! 	public Component getComponent()
  	{
  		return _component;
  	}
  
! 	public void setComponent(Component newComponent)
  	{
  		if (_component != null)
--- 28,48 ----
  import org.apache.commons.logging.LogFactory;
  
+ import portal.model.IModel;
  import portal.ui.Component;
  import portal.ui.render.IRenderContext;
  import portal.ui.render.RenderException;
  
! public class ProxyComponent extends Component<IModel>
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(ProxyComponent.class);
  
! 	public Component<?> getComponent()
  	{
  		return _component;
  	}
  
! 	public void setComponent(Component<?> newComponent)
  	{
  		if (_component != null)
***************
*** 68,71 ****
  	}
  
! 	private Component _component;
  }
\ No newline at end of file
--- 71,74 ----
  	}
  
! 	private Component<?> _component;
  }
\ No newline at end of file

Index: PasswordInput.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/PasswordInput.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PasswordInput.java	7 Feb 2009 07:19:57 -0000	1.2
--- PasswordInput.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 35,40 ****
--- 35,44 ----
  public class PasswordInput extends FormElement
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private class TextInputUpdater extends AbstractFormFieldUpdater
  	{
+ 		private static final long serialVersionUID = 1L;
+ 
  		public void update(String[] values)
  		{

Index: TextInput.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/TextInput.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TextInput.java	7 Feb 2009 07:19:57 -0000	1.6
--- TextInput.java	6 Aug 2010 21:04:53 -0000	1.7
***************
*** 35,40 ****
--- 35,44 ----
  public class TextInput extends FormElement
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private class TextInputUpdater extends AbstractFormFieldUpdater
  	{
+ 		private static final long serialVersionUID = 1L;
+ 
  		public void update(String[] values)
  		{

Index: IconResource.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/IconResource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IconResource.java	13 Sep 2005 11:23:27 -0000	1.1
--- IconResource.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  public class IconResource extends LazyResource
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public IconResource(String resourcePath)
  	{

Index: ComponentDelegator.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/ComponentDelegator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ComponentDelegator.java	1 Sep 2006 19:34:53 -0000	1.2
--- ComponentDelegator.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 25,35 ****
  import java.io.IOException;
  
  import portal.ui.Component;
  import portal.ui.render.IRenderContext;
  import portal.ui.render.RenderException;
  
! public class ComponentDelegator extends Component
  {
! 	public ComponentDelegator(Component component)
  	{
  		_component = component;
--- 25,38 ----
  import java.io.IOException;
  
+ import portal.model.IModel;
  import portal.ui.Component;
  import portal.ui.render.IRenderContext;
  import portal.ui.render.RenderException;
  
! public class ComponentDelegator extends Component<IModel>
  {
! 	private static final long serialVersionUID = 1L;
! 
! 	public ComponentDelegator(Component<?> component)
  	{
  		_component = component;
***************
*** 42,50 ****
  	}
  
! 	protected final Component getComponent()
  	{
  		return _component;
  	}
  
! 	private Component _component;
  }
\ No newline at end of file
--- 45,53 ----
  	}
  
! 	protected final Component<?> getComponent()
  	{
  		return _component;
  	}
  
! 	private Component<?> _component;
  }
\ No newline at end of file

Index: CheckBox.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/CheckBox.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CheckBox.java	13 Sep 2005 11:23:27 -0000	1.1
--- CheckBox.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 26,30 ****
  
  import portal.model.IBooleanModel;
- import portal.model.IModel;
  import portal.model.SimpleBooleanModel;
  import portal.ui.AbstractFormFieldUpdater;
--- 26,29 ----
***************
*** 34,41 ****
  import portal.ui.render.RenderException;
  
! public class CheckBox extends Component
  {
  	private class CheckBoxUpdater extends AbstractFormFieldUpdater
  	{
  		public void update(String[] values)
  		{
--- 33,44 ----
  import portal.ui.render.RenderException;
  
! public class CheckBox extends Component<IBooleanModel>
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private class CheckBoxUpdater extends AbstractFormFieldUpdater
  	{
+ 		private static final long serialVersionUID = 1L;
+ 
  		public void update(String[] values)
  		{
***************
*** 67,71 ****
  	}
  
! 	public IModel createDefaultModel()
  	{
  		return new SimpleBooleanModel();
--- 70,74 ----
  	}
  
! 	public IBooleanModel createDefaultModel()
  	{
  		return new SimpleBooleanModel();

Index: DateSelector.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/DateSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DateSelector.java	13 Sep 2005 11:23:27 -0000	1.1
--- DateSelector.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 38,41 ****
--- 38,43 ----
  public class DateSelector extends FormElement
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static SimpleDateFormat dateFormat = new SimpleDateFormat(
  			"dd/MM/yyyy");
***************
*** 43,46 ****
--- 45,50 ----
  	private class DateSelectorUpdater extends AbstractFormFieldUpdater
  	{
+ 		private static final long serialVersionUID = 1L;
+ 
  		public void update(String[] values)
  		{

Index: PanelDelegator.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/PanelDelegator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PanelDelegator.java	1 Sep 2006 19:34:53 -0000	1.2
--- PanelDelegator.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 30,35 ****
  import portal.ui.render.RenderException;
  
! public class PanelDelegator extends Component
  {
  	public PanelDelegator()
  	{
--- 30,37 ----
  import portal.ui.render.RenderException;
  
! public class PanelDelegator extends Component<IModel>
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public PanelDelegator()
  	{

Index: Label.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/Label.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Label.java	7 Feb 2009 07:19:57 -0000	1.2
--- Label.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 25,31 ****
  import java.io.PrintWriter;
  
- import portal.model.IModel;
  import portal.model.IPropertyModel;
- import portal.model.IStringModel;
  import portal.model.SimpleStringModel;
  import portal.ui.Component;
--- 25,29 ----
***************
*** 33,38 ****
  import portal.ui.render.RenderException;
  
! public class Label extends Component
  {
  	public Label()
  	{
--- 31,38 ----
  import portal.ui.render.RenderException;
  
! public class Label extends Component<IPropertyModel<String>>
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public Label()
  	{
***************
*** 49,53 ****
  	}
  
! 	public IModel createDefaultModel()
  	{
  		return new SimpleStringModel();
--- 49,53 ----
  	}
  
! 	public IPropertyModel<String> createDefaultModel()
  	{
  		return new SimpleStringModel();

Index: ActionLink.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/ActionLink.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ActionLink.java	13 Sep 2005 11:23:27 -0000	1.1
--- ActionLink.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 31,34 ****
--- 31,36 ----
  public class ActionLink extends AbstractButton
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public ActionLink()
  	{

Index: Panel.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/Panel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Panel.java	13 Sep 2005 11:23:27 -0000	1.1
--- Panel.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 29,32 ****
--- 29,34 ----
  public class Panel extends Container
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public Panel()
  	{

Index: FileUpload.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/FileUpload.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileUpload.java	13 Sep 2005 11:23:27 -0000	1.1
--- FileUpload.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  import java.io.PrintWriter;
  
+ import portal.model.IModel;
  import portal.ui.AbstractFileFieldUpdater;
  import portal.ui.Component;
***************
*** 31,38 ****
  import portal.ui.render.RenderException;
  
! public class FileUpload extends Component
  {
  	private class FileUploadUpdater extends AbstractFileFieldUpdater
  	{
  		public void update(IFileItem fileItem)
  		{
--- 32,43 ----
  import portal.ui.render.RenderException;
  
! public class FileUpload extends Component<IModel>
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private class FileUploadUpdater extends AbstractFileFieldUpdater
  	{
+ 		private static final long serialVersionUID = 1L;
+ 
  		public void update(IFileItem fileItem)
  		{

Index: Block.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/Block.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Block.java	13 Sep 2005 11:23:27 -0000	1.1
--- Block.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 25,38 ****
  import java.io.IOException;
  
  import portal.ui.Component;
  import portal.ui.render.IRenderContext;
  import portal.ui.render.RenderException;
  
! public class Block extends Component
  {
  	public static final String P = "p";
  	public static final String DIV = "div";
  
! 	public Block(String blockType, String style, Component child)
  	{
  		this._blockType = blockType;
--- 25,41 ----
  import java.io.IOException;
  
+ import portal.model.IModel;
  import portal.ui.Component;
  import portal.ui.render.IRenderContext;
  import portal.ui.render.RenderException;
  
! public class Block extends Component<IModel>
  {
+ 	private static final long serialVersionUID = 1L;
+ 	
  	public static final String P = "p";
  	public static final String DIV = "div";
  
! 	public Block(String blockType, String style, Component<?> child)
  	{
  		this._blockType = blockType;
***************
*** 63,66 ****
  	private String _blockType;
  	private String _style;
! 	private Component _child;
  }
\ No newline at end of file
--- 66,69 ----
  	private String _blockType;
  	private String _style;
! 	private Component<?> _child;
  }
\ No newline at end of file

[pfc-cvs-commit] pfc-api/src/java/portal/model ObjectPropertyModel.java, 1.1, 1.2 SimpleStringModel.java, 1.2, 1.3 SimpleCalendarModel.java, 1.1, 1.2 SimpleBooleanModel.java, 1.1, 1.2

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

Update of /cvsroot/pfc/pfc-api/src/java/portal/model
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7925/src/java/portal/model

Modified Files:
	ObjectPropertyModel.java SimpleStringModel.java 
	SimpleCalendarModel.java SimpleBooleanModel.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: SimpleStringModel.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/model/SimpleStringModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SimpleStringModel.java	30 Jul 2010 21:23:15 -0000	1.2
--- SimpleStringModel.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 25,28 ****
--- 25,30 ----
  public class SimpleStringModel implements IStringModel
  {
+ 	private static final long serialVersionUID = 1L;
+ 	
  	public SimpleStringModel()
  	{

Index: ObjectPropertyModel.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/model/ObjectPropertyModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ObjectPropertyModel.java	7 Feb 2009 07:22:17 -0000	1.1
--- ObjectPropertyModel.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 25,28 ****
--- 25,30 ----
  public class ObjectPropertyModel<T extends Object> implements IPropertyModel<T>
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public ObjectPropertyModel()
  	{

Index: SimpleBooleanModel.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/model/SimpleBooleanModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SimpleBooleanModel.java	13 Sep 2005 11:23:27 -0000	1.1
--- SimpleBooleanModel.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 25,28 ****
--- 25,30 ----
  public class SimpleBooleanModel implements IBooleanModel
  {
+ 	private static final long serialVersionUID = 1L;
+ 	
  	public SimpleBooleanModel()
  	{

Index: SimpleCalendarModel.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/model/SimpleCalendarModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SimpleCalendarModel.java	13 Sep 2005 11:23:27 -0000	1.1
--- SimpleCalendarModel.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  public class SimpleCalendarModel implements ICalendarModel
  {
+ 	private static final long serialVersionUID = 1L;
+ 	
  	public SimpleCalendarModel()
  	{

[pfc-cvs-commit] pfc-api/src/java/portal/ui/render FlowLayout.java, 1.1, 1.2 SimpleLayout.java, 1.2, 1.3 StyleRule.java, 1.1, 1.2 IVelocityPageContext.java, 1.1, 1.2 IRenderContext.java, 1.2, 1.3 Insets.java, 1.1, 1.2 GridLayout.java, 1.1, 1.2 GridConstraint.java, 1.1, 1.2 TableLayoutManager.java, 1.1, 1.2 AbstractContainerLayout.java, 1.2, 1.3 LayoutManager.java, 1.2, 1.3 VelocityLayout.java, 1.2, 1.3 RenderException.java, 1.1, 1.2

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

Update of /cvsroot/pfc/pfc-api/src/java/portal/ui/render
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7925/src/java/portal/ui/render

Modified Files:
	FlowLayout.java SimpleLayout.java StyleRule.java 
	IVelocityPageContext.java IRenderContext.java Insets.java 
	GridLayout.java GridConstraint.java TableLayoutManager.java 
	AbstractContainerLayout.java LayoutManager.java 
	VelocityLayout.java RenderException.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: FlowLayout.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/render/FlowLayout.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FlowLayout.java	13 Sep 2005 11:23:27 -0000	1.1
--- FlowLayout.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 30,33 ****
--- 30,35 ----
  public class FlowLayout extends TableLayoutManager
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public static final int HORIZONTAL = 0;
  	public static final int VERTICAL = 1;
***************
*** 47,51 ****
  			for (int i = 0; i != target.size(); i++)
  			{
! 				Component child = target.getComponent(i);
  
  				GridConstraint constraint = getConstraint(target, i);
--- 49,53 ----
  			for (int i = 0; i != target.size(); i++)
  			{
! 				Component<?> child = target.getComponent(i);
  
  				GridConstraint constraint = getConstraint(target, i);

Index: GridConstraint.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/render/GridConstraint.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridConstraint.java	13 Sep 2005 11:23:27 -0000	1.1
--- GridConstraint.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  public class GridConstraint implements Serializable
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public GridConstraint(Insets padding, Insets spacing)
  	{

Index: SimpleLayout.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/render/SimpleLayout.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SimpleLayout.java	1 Sep 2006 19:34:53 -0000	1.2
--- SimpleLayout.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 31,34 ****
--- 31,36 ----
  public class SimpleLayout extends AbstractContainerLayout
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public SimpleLayout()
  	{
***************
*** 38,46 ****
  			throws RenderException, IOException
  	{
! 		Iterator it = target.getComponents().iterator();
  
  		while (it.hasNext())
  		{
! 			Component child = (Component) it.next();
  
  			renderContext.includeComponent(child);
--- 40,48 ----
  			throws RenderException, IOException
  	{
! 		Iterator<Component<?>> it = target.getComponents().iterator();
  
  		while (it.hasNext())
  		{
! 			Component<?> child = it.next();
  
  			renderContext.includeComponent(child);

Index: VelocityLayout.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/render/VelocityLayout.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VelocityLayout.java	3 Sep 2006 20:58:04 -0000	1.2
--- VelocityLayout.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 39,42 ****
--- 39,44 ----
  public class VelocityLayout implements LayoutManager
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(VelocityLayout.class);
  
***************
*** 70,74 ****
  	}
  
! 	public void doLayout(Component pTarget, IRenderContext pRenderContext)
  			throws RenderException
  	{
--- 72,76 ----
  	}
  
! 	public void doLayout(Component<?> pTarget, IRenderContext pRenderContext)
  			throws RenderException
  	{
***************
*** 76,80 ****
  	}
  
! 	public void mergeTemplate(Component pTarget,
  			IRenderContext pRenderContext,
  			String templatePath) throws RenderException
--- 78,82 ----
  	}
  
! 	public void mergeTemplate(Component<?> pTarget,
  			IRenderContext pRenderContext,
  			String templatePath) throws RenderException
***************
*** 103,107 ****
  	}
  
! 	private void mergeTemplate(Component pTarget,
  			IRenderContext pRenderContext,
  			Template template) throws Exception
--- 105,109 ----
  	}
  
! 	private void mergeTemplate(Component<?> pTarget,
  			IRenderContext pRenderContext,
  			Template template) throws Exception
***************
*** 143,147 ****
  	private class PageContext implements IVelocityPageContext
  	{
! 		public PageContext(Component pTarget, IRenderContext pRenderContext)
  		{
  			_target = pTarget;
--- 145,149 ----
  	private class PageContext implements IVelocityPageContext
  	{
! 		public PageContext(Component<?> pTarget, IRenderContext pRenderContext)
  		{
  			_target = pTarget;
***************
*** 149,153 ****
  		}
  
! 		public Component getComponent()
  		{
  			return _target;
--- 151,155 ----
  		}
  
! 		public Component<?> getComponent()
  		{
  			return _target;
***************
*** 192,196 ****
  					Container container = (Container) getComponent();
  
! 					Component child = container.getComponent(componentName);
  
  					_renderContext.includeComponent(child);
--- 194,198 ----
  					Container container = (Container) getComponent();
  
! 					Component<?> child = container.getComponent(componentName);
  
  					_renderContext.includeComponent(child);
***************
*** 224,228 ****
  		}
  
! 		private Component _target;
  		private IRenderContext _renderContext;
  	}
--- 226,230 ----
  		}
  
! 		private Component<?> _target;
  		private IRenderContext _renderContext;
  	}

Index: AbstractContainerLayout.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/render/AbstractContainerLayout.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractContainerLayout.java	1 Sep 2006 19:34:53 -0000	1.2
--- AbstractContainerLayout.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 30,38 ****
  public abstract class AbstractContainerLayout implements LayoutManager
  {
  	public AbstractContainerLayout()
  	{
  	}
  
! 	public final void doLayout(Component target, IRenderContext renderContext)
  			throws RenderException, IOException
  	{
--- 30,40 ----
  public abstract class AbstractContainerLayout implements LayoutManager
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public AbstractContainerLayout()
  	{
  	}
  
! 	public final void doLayout(Component<?> target, IRenderContext renderContext)
  			throws RenderException, IOException
  	{

Index: GridLayout.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/render/GridLayout.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridLayout.java	13 Sep 2005 11:23:27 -0000	1.1
--- GridLayout.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 31,34 ****
--- 31,36 ----
  public class GridLayout extends AbstractContainerLayout
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public GridLayout(int cols)
  	{
***************
*** 61,65 ****
  		try
  		{
! 			Iterator it = target.getComponents().iterator();
  
  			int currentCol = 0;
--- 63,67 ----
  		try
  		{
! 			Iterator<Component<?>> it = target.getComponents().iterator();
  
  			int currentCol = 0;
***************
*** 72,76 ****
  			while (it.hasNext())
  			{
! 				Component child = (Component) it.next();
  
  				currentCol++;
--- 74,78 ----
  			while (it.hasNext())
  			{
! 				Component<?> child = it.next();
  
  				currentCol++;

Index: TableLayoutManager.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/render/TableLayoutManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TableLayoutManager.java	13 Sep 2005 11:23:27 -0000	1.1
--- TableLayoutManager.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 29,32 ****
--- 29,34 ----
  public abstract class TableLayoutManager extends AbstractContainerLayout
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public static final String CENTERED = "center";
  	public static final String LEFT = "left";

Index: IVelocityPageContext.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/render/IVelocityPageContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IVelocityPageContext.java	13 Sep 2005 11:23:27 -0000	1.1
--- IVelocityPageContext.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 45,49 ****
  	 * @return the component that is being rendered with this velocity template
  	 */
! 	Component getComponent();
  
  	/**
--- 45,49 ----
  	 * @return the component that is being rendered with this velocity template
  	 */
! 	Component<?> getComponent();
  
  	/**

Index: RenderException.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/render/RenderException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RenderException.java	13 Sep 2005 11:23:27 -0000	1.1
--- RenderException.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 25,28 ****
--- 25,30 ----
  public class RenderException extends Exception
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public RenderException(String message)
  	{

Index: Insets.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/render/Insets.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Insets.java	13 Sep 2005 11:23:27 -0000	1.1
--- Insets.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  public class Insets implements Serializable
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public static final Insets ZERO = new Insets(0, 0, 0, 0);
  

Index: LayoutManager.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/render/LayoutManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LayoutManager.java	1 Sep 2006 19:34:53 -0000	1.2
--- LayoutManager.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 30,34 ****
  public interface LayoutManager extends Serializable
  {
! 	void doLayout(Component target, IRenderContext renderContext)
  			throws RenderException, IOException;
  }
\ No newline at end of file
--- 30,34 ----
  public interface LayoutManager extends Serializable
  {
! 	void doLayout(Component<?> target, IRenderContext renderContext)
  			throws RenderException, IOException;
  }
\ No newline at end of file

Index: StyleRule.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/render/StyleRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StyleRule.java	13 Sep 2005 11:23:27 -0000	1.1
--- StyleRule.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 29,35 ****
  public class StyleRule implements Serializable
  {
  	public StyleRule(String styleClass)
  	{
! 		this._styles = new Hashtable();
  
  		_styleClass = styleClass;
--- 29,37 ----
  public class StyleRule implements Serializable
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public StyleRule(String styleClass)
  	{
! 		this._styles = new Hashtable<String,String>();
  
  		_styleClass = styleClass;
***************
*** 75,79 ****
  		String styleValue = new String();
  
! 		Iterator styleNameIt = _styles.keySet().iterator();
  		while (styleNameIt.hasNext())
  		{
--- 77,81 ----
  		String styleValue = new String();
  
! 		Iterator<String> styleNameIt = _styles.keySet().iterator();
  		while (styleNameIt.hasNext())
  		{
***************
*** 87,91 ****
  	}
  
! 	private Hashtable _styles;
  	private String _styleClass;
  }
\ No newline at end of file
--- 89,93 ----
  	}
  
! 	private Hashtable<String,String> _styles;
  	private String _styleClass;
  }
\ No newline at end of file

Index: IRenderContext.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/render/IRenderContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IRenderContext.java	1 Sep 2006 19:34:53 -0000	1.2
--- IRenderContext.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 49,52 ****
  			throws RenderException;
  
! 	void includeComponent(Component component) throws RenderException, IOException;
  }
\ No newline at end of file
--- 49,52 ----
  			throws RenderException;
  
! 	void includeComponent(Component<?> component) throws RenderException, IOException;
  }
\ No newline at end of file

[pfc-cvs-commit] pfc-api/src/java/portal/services/registry IRegistry.java, 1.1, 1.2 RegistryException.java, 1.1, 1.2 TypeMismatchException.java, 1.1, 1.2

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

Update of /cvsroot/pfc/pfc-api/src/java/portal/services/registry
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7925/src/java/portal/services/registry

Modified Files:
	IRegistry.java RegistryException.java 
	TypeMismatchException.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: RegistryException.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/services/registry/RegistryException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RegistryException.java	13 Sep 2005 11:23:28 -0000	1.1
--- RegistryException.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  public class RegistryException extends ServiceException
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public RegistryException(String message)
  	{

Index: TypeMismatchException.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/services/registry/TypeMismatchException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TypeMismatchException.java	13 Sep 2005 11:23:28 -0000	1.1
--- TypeMismatchException.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 29,32 ****
--- 29,34 ----
  public class TypeMismatchException extends RegistryException
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public TypeMismatchException(String message)
  	{

Index: IRegistry.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/services/registry/IRegistry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IRegistry.java	13 Sep 2005 11:23:28 -0000	1.1
--- IRegistry.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 29,33 ****
  public interface IRegistry extends IService
  {
! 	Collection listRegistryKeys() throws RegistryException;
  	
  	RegistryKey getRegistryKey(String name) throws RegistryException;
--- 29,33 ----
  public interface IRegistry extends IService
  {
! 	Collection<RegistryKey> listRegistryKeys() throws RegistryException;
  	
  	RegistryKey getRegistryKey(String name) throws RegistryException;

[pfc-cvs-commit] pfc-api/src/java/portal/services/session SessionException.java, 1.1, 1.2 ISessionService.java, 1.1, 1.2

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

Update of /cvsroot/pfc/pfc-api/src/java/portal/services/session
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7925/src/java/portal/services/session

Modified Files:
	SessionException.java ISessionService.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: ISessionService.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/services/session/ISessionService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ISessionService.java	13 Sep 2005 11:23:27 -0000	1.1
--- ISessionService.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 38,42 ****
  			throws SessionException;
  
! 	List listSessions(Principal pPrincipal);
  
  	boolean hasOpenSessions(Principal pPrincipal);
--- 38,42 ----
  			throws SessionException;
  
! 	List<ISession> listSessions(Principal pPrincipal);
  
  	boolean hasOpenSessions(Principal pPrincipal);

Index: SessionException.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/services/session/SessionException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SessionException.java	13 Sep 2005 11:23:27 -0000	1.1
--- SessionException.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  public class SessionException extends PortalException
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public SessionException(String message)
  	{

[pfc-cvs-commit] pfc-api/src/java/portal/ui/form ValidatableModel.java, 1.1, 1.2 ValidationContext.java, 1.3, 1.4 FormElement.java, 1.1, 1.2

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

Update of /cvsroot/pfc/pfc-api/src/java/portal/ui/form
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7925/src/java/portal/ui/form

Modified Files:
	ValidatableModel.java ValidationContext.java FormElement.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: FormElement.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/form/FormElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FormElement.java	13 Sep 2005 11:23:27 -0000	1.1
--- FormElement.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 28,33 ****
  import portal.validate.IValidationContext;
  
! public abstract class FormElement extends Component implements IValidatable
  {
  	public FormElement()
  	{
--- 28,35 ----
  import portal.validate.IValidationContext;
  
! public abstract class FormElement extends Component<IModel> implements IValidatable
  {
+ 	private static final long serialVersionUID = 1L;
+ 	
  	public FormElement()
  	{

Index: ValidationContext.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/form/ValidationContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ValidationContext.java	6 Aug 2006 20:14:32 -0000	1.3
--- ValidationContext.java	6 Aug 2010 21:04:53 -0000	1.4
***************
*** 29,32 ****
--- 29,34 ----
  public class ValidationContext implements IValidationContext, Serializable
  {
+ 	private static final long serialVersionUID = 1L;
+ 	
  	public ValidationContext()
  	{

Index: ValidatableModel.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/form/ValidatableModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ValidatableModel.java	13 Sep 2005 11:23:27 -0000	1.1
--- ValidatableModel.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 28,31 ****
--- 28,33 ----
  public class ValidatableModel implements IValidatableUserInput
  {
+ 	private static final long serialVersionUID = 1L;
+ 	
  	public ValidatableModel()
  	{

[pfc-cvs-commit] pfc-api/src/java/portal/ui/desktop VelocityFrameRenderer.java, 1.4, 1.5 WindowEvent.java, 1.1, 1.2 RootWindow.java, 1.1, 1.2 Dialog.java, 1.1, 1.2 Frame.java, 1.1, 1.2 DesktopEvent.java, 1.1, 1.2 SimpleFrameRenderer.java, 1.3, 1.4 Window.java, 1.2, 1.3 Desktop.java, 1.3, 1.4

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

Update of /cvsroot/pfc/pfc-api/src/java/portal/ui/desktop
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7925/src/java/portal/ui/desktop

Modified Files:
	VelocityFrameRenderer.java WindowEvent.java RootWindow.java 
	Dialog.java Frame.java DesktopEvent.java 
	SimpleFrameRenderer.java Window.java Desktop.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: Frame.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/desktop/Frame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Frame.java	13 Sep 2005 11:23:27 -0000	1.1
--- Frame.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  public class Frame extends Window
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public Frame()
  	{
***************
*** 45,49 ****
  		}
  
! 		Component parent = getParent();
  
  		while (parent != null)
--- 47,51 ----
  		}
  
! 		Component<?> parent = getParent();
  
  		while (parent != null)

Index: WindowEvent.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/desktop/WindowEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WindowEvent.java	13 Sep 2005 11:23:27 -0000	1.1
--- WindowEvent.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  public class WindowEvent extends EventObject
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public WindowEvent(Object source, Window window)
  	{

Index: Dialog.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/desktop/Dialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Dialog.java	13 Sep 2005 11:23:27 -0000	1.1
--- Dialog.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  import java.util.Iterator;
  import java.util.LinkedList;
+ import java.util.List;
  
  import portal.ui.Component;
***************
*** 30,33 ****
--- 31,36 ----
  public class Dialog extends Window
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public Dialog()
  	{
***************
*** 35,43 ****
  	}
  
! 	public Dialog(Component parent)
  	{
  		setParent(parent);
  
! 		_dialogListeners = new LinkedList();
  	}
  
--- 38,46 ----
  	}
  
! 	public Dialog(Component<?> parent)
  	{
  		setParent(parent);
  
! 		_dialogListeners = new LinkedList<DialogListener>();
  	}
  
***************
*** 50,54 ****
  		}
  
! 		Component parent = getParent();
  
  		while (parent != null)
--- 53,57 ----
  		}
  
! 		Component<?> parent = getParent();
  
  		while (parent != null)
***************
*** 94,108 ****
  	protected void notifyDialogListeners(int resultCode)
  	{
! 		LinkedList list = null;
  
  		synchronized (_dialogListeners)
  		{
! 			list = (LinkedList) _dialogListeners.clone();
  		}
  
! 		Iterator it = list.iterator();
  		while (it.hasNext())
  		{
! 			DialogListener listener = (DialogListener) it.next();
  
  			listener.result(resultCode);
--- 97,111 ----
  	protected void notifyDialogListeners(int resultCode)
  	{
! 		List<DialogListener> list = null;
  
  		synchronized (_dialogListeners)
  		{
! 			list = new LinkedList<DialogListener>(_dialogListeners);
  		}
  
! 		Iterator<DialogListener> it = list.iterator();
  		while (it.hasNext())
  		{
! 			DialogListener listener = it.next();
  
  			listener.result(resultCode);
***************
*** 110,113 ****
  	}
  
! 	private LinkedList _dialogListeners;
  }
\ No newline at end of file
--- 113,116 ----
  	}
  
! 	private List<DialogListener> _dialogListeners;
  }
\ No newline at end of file

Index: SimpleFrameRenderer.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/desktop/SimpleFrameRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SimpleFrameRenderer.java	7 Feb 2009 07:17:24 -0000	1.3
--- SimpleFrameRenderer.java	6 Aug 2010 21:04:53 -0000	1.4
***************
*** 33,36 ****
--- 33,38 ----
  public class SimpleFrameRenderer implements FrameRenderer
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public void renderFrame(IRenderContext pRenderContext, Frame frame)
  			throws RenderException, IOException

Index: DesktopEvent.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/desktop/DesktopEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DesktopEvent.java	13 Sep 2005 11:23:27 -0000	1.1
--- DesktopEvent.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  public class DesktopEvent extends EventObject
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public DesktopEvent(Object source, Desktop desktop, Frame frame)
  	{

Index: Window.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/desktop/Window.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Window.java	1 Sep 2006 19:34:53 -0000	1.2
--- Window.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 26,33 ****
--- 26,35 ----
  import java.util.Iterator;
  import java.util.LinkedList;
+ import java.util.List;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  
+ import portal.model.IModel;
  import portal.ui.Component;
  import portal.ui.comp.Panel;
***************
*** 35,40 ****
  import portal.ui.render.RenderException;
  
! public abstract class Window extends Component
  {
  	private static final Log LOGGER = LogFactory.getLog(Window.class);
  
--- 37,44 ----
  import portal.ui.render.RenderException;
  
! public abstract class Window extends Component<IModel>
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(Window.class);
  
***************
*** 158,169 ****
  	private void notifyClosed()
  	{
! 		LinkedList listeners;
  
  		synchronized (_windowListeners)
  		{
! 			listeners = (LinkedList) _windowListeners.clone();
  		}
  
! 		Iterator it = listeners.iterator();
  
  		WindowEvent event = new WindowEvent(this, this);
--- 162,173 ----
  	private void notifyClosed()
  	{
! 		List<WindowListener> listeners;
  
  		synchronized (_windowListeners)
  		{
! 			listeners = new LinkedList<WindowListener>(_windowListeners);
  		}
  
! 		Iterator<WindowListener> it = listeners.iterator();
  
  		WindowEvent event = new WindowEvent(this, this);
***************
*** 171,175 ****
  		while (it.hasNext())
  		{
! 			WindowListener listener = (WindowListener) it.next();
  
  			listener.closed(event);
--- 175,179 ----
  		while (it.hasNext())
  		{
! 			WindowListener listener = it.next();
  
  			listener.closed(event);
***************
*** 181,186 ****
  	private MyWindowListener _myWindowListener = new MyWindowListener();
  
! 	private LinkedList _windowListeners = new LinkedList();
! 	private LinkedList _dialogs = new LinkedList();
  
  	private Panel _contentPanel;
--- 185,190 ----
  	private MyWindowListener _myWindowListener = new MyWindowListener();
  
! 	private List<WindowListener> _windowListeners = new LinkedList<WindowListener>();
! 	private LinkedList<Dialog> _dialogs = new LinkedList<Dialog>();
  
  	private Panel _contentPanel;
***************
*** 188,191 ****
--- 192,200 ----
  	public class MyWindowListener implements WindowListener
  	{
+ 		/**
+ 		 * 
+ 		 */
+ 		private static final long serialVersionUID = 1L;
+ 
  		public void closed(WindowEvent event)
  		{

Index: VelocityFrameRenderer.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/desktop/VelocityFrameRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VelocityFrameRenderer.java	7 Feb 2009 07:17:24 -0000	1.4
--- VelocityFrameRenderer.java	6 Aug 2010 21:04:53 -0000	1.5
***************
*** 35,38 ****
--- 35,40 ----
  	//private static final Log LOGGER = LogFactory.getLog(VelocityFrameRenderer.class);
  
+ 	private static final long serialVersionUID = 1L;
+ 
  	public VelocityFrameRenderer(String frameLayoutTmpl, String dialogLayoutTmpl)
  	{

Index: Desktop.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/desktop/Desktop.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Desktop.java	1 Sep 2006 19:34:53 -0000	1.3
--- Desktop.java	6 Aug 2010 21:04:53 -0000	1.4
***************
*** 26,39 ****
  import java.util.Iterator;
  import java.util.LinkedList;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  
  import portal.ui.Component;
  import portal.ui.render.IRenderContext;
  import portal.ui.render.RenderException;
  
! public class Desktop extends Component
  {
  	private static final Log LOGGER = LogFactory.getLog(Desktop.class);
  
--- 26,43 ----
  import java.util.Iterator;
  import java.util.LinkedList;
+ import java.util.List;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  
+ import portal.model.IModel;
  import portal.ui.Component;
  import portal.ui.render.IRenderContext;
  import portal.ui.render.RenderException;
  
! public class Desktop extends Component<IModel>
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(Desktop.class);
  
***************
*** 140,151 ****
  	private void notifyAdded(Frame frame)
  	{
! 		LinkedList listeners;
  
  		synchronized (_desktopListeners)
  		{
! 			listeners = (LinkedList) _desktopListeners.clone();
  		}
  
! 		Iterator it = listeners.iterator();
  
  		DesktopEvent event = new DesktopEvent(this, this, frame);
--- 144,155 ----
  	private void notifyAdded(Frame frame)
  	{
! 		List<DesktopListener> listeners;
  
  		synchronized (_desktopListeners)
  		{
! 			listeners =  new LinkedList<DesktopListener>(_desktopListeners);
  		}
  
! 		Iterator<DesktopListener> it = listeners.iterator();
  
  		DesktopEvent event = new DesktopEvent(this, this, frame);
***************
*** 153,157 ****
  		while (it.hasNext())
  		{
! 			DesktopListener listener = (DesktopListener) it.next();
  
  			listener.frameAdded(event);
--- 157,161 ----
  		while (it.hasNext())
  		{
! 			DesktopListener listener = it.next();
  
  			listener.frameAdded(event);
***************
*** 161,172 ****
  	private void notifyRemoved(Frame frame)
  	{
! 		LinkedList listeners;
  
  		synchronized (_desktopListeners)
  		{
! 			listeners = (LinkedList) _desktopListeners.clone();
  		}
  
! 		Iterator it = listeners.iterator();
  
  		DesktopEvent event = new DesktopEvent(this, this, frame);
--- 165,176 ----
  	private void notifyRemoved(Frame frame)
  	{
! 		List<DesktopListener> listeners;
  
  		synchronized (_desktopListeners)
  		{
! 			listeners =  new LinkedList<DesktopListener>(_desktopListeners);
  		}
  
! 		Iterator<DesktopListener> it = listeners.iterator();
  
  		DesktopEvent event = new DesktopEvent(this, this, frame);
***************
*** 174,178 ****
  		while (it.hasNext())
  		{
! 			DesktopListener listener = (DesktopListener) it.next();
  
  			listener.frameRemoved(event);
--- 178,182 ----
  		while (it.hasNext())
  		{
! 			DesktopListener listener = it.next();
  
  			listener.frameRemoved(event);
***************
*** 204,209 ****
  
  	private Frame _rootFrame;
! 	private LinkedList _frames = new LinkedList();
! 	private LinkedList _desktopListeners = new LinkedList();
  
  	private FrameRenderer _frameRenderer;
--- 208,213 ----
  
  	private Frame _rootFrame;
! 	private LinkedList<Frame> _frames = new LinkedList<Frame>();
! 	private List<DesktopListener> _desktopListeners = new LinkedList<DesktopListener>();
  
  	private FrameRenderer _frameRenderer;
***************
*** 213,216 ****
--- 217,225 ----
  	public class MyWindowListener implements WindowListener
  	{
+ 		/**
+ 		 * 
+ 		 */
+ 		private static final long serialVersionUID = 1L;
+ 
  		public void closed(WindowEvent event)
  		{

Index: RootWindow.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/desktop/RootWindow.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RootWindow.java	13 Sep 2005 11:23:27 -0000	1.1
--- RootWindow.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 25,28 ****
--- 25,30 ----
  public class RootWindow extends Window
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public RootWindow()
  	{

[pfc-cvs-commit] pfc-api/src/java/portal/services/resource ResourceServiceException.java, 1.1, 1.2 LazyResource.java, 1.2, 1.3

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

Update of /cvsroot/pfc/pfc-api/src/java/portal/services/resource
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7925/src/java/portal/services/resource

Modified Files:
	ResourceServiceException.java LazyResource.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: ResourceServiceException.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/services/resource/ResourceServiceException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceServiceException.java	13 Sep 2005 11:23:28 -0000	1.1
--- ResourceServiceException.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  public class ResourceServiceException extends ServiceException
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public ResourceServiceException(String message)
  	{

Index: LazyResource.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/services/resource/LazyResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LazyResource.java	15 Feb 2006 20:34:42 -0000	1.2
--- LazyResource.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 30,33 ****
--- 30,35 ----
  public class LazyResource implements IResource
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public LazyResource(String resourcePath)
  	{

[pfc-cvs-commit] pfc-api/src/java/portal/ui/comp/tree TreeNodeSelectAction.java, 1.1, 1.2 TreeNodeToggleAction.java, 1.1, 1.2 TreeNodeModel.java, 1.1, 1.2 Tree.java, 1.2, 1.3 TableTreeRenderHelper.java, 1.2, 1.3 TreeNodeEventAdapter.java, 1.1, 1.2 TreeModel.java, 1.1, 1.2

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

Update of /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7925/src/java/portal/ui/comp/tree

Modified Files:
	TreeNodeSelectAction.java TreeNodeToggleAction.java 
	TreeNodeModel.java Tree.java TableTreeRenderHelper.java 
	TreeNodeEventAdapter.java TreeModel.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: TreeNodeToggleAction.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree/TreeNodeToggleAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TreeNodeToggleAction.java	13 Sep 2005 11:23:27 -0000	1.1
--- TreeNodeToggleAction.java	6 Aug 2010 21:04:52 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  public class TreeNodeToggleAction implements IAction
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public TreeNodeToggleAction(TreeNodeModel treeNode)
  	{

Index: TreeNodeModel.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree/TreeNodeModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TreeNodeModel.java	13 Sep 2005 11:23:27 -0000	1.1
--- TreeNodeModel.java	6 Aug 2010 21:04:52 -0000	1.2
***************
*** 26,29 ****
--- 26,30 ----
  import java.util.Iterator;
  import java.util.LinkedList;
+ import java.util.List;
  
  import portal.model.IModel;
***************
*** 31,38 ****
  public class TreeNodeModel implements IModel
  {
  	public TreeNodeModel()
  	{
! 		_children = new LinkedList();
! 		_listeners = new LinkedList();
  
  		_opened = false;
--- 32,41 ----
  public class TreeNodeModel implements IModel
  {
+ 	private static final long serialVersionUID = 1L;
+ 	
  	public TreeNodeModel()
  	{
! 		_children = new LinkedList<TreeNodeModel>();
! 		_listeners = new LinkedList<TreeNodeEventListener>();
  
  		_opened = false;
***************
*** 68,72 ****
  	}
  
! 	public Collection getChildren()
  	{
  		return _children;
--- 71,75 ----
  	}
  
! 	public Collection<TreeNodeModel> getChildren()
  	{
  		return _children;
***************
*** 96,107 ****
  	void notifySelected()
  	{
! 		LinkedList tempListeners = null;
  
  		synchronized (_listeners)
  		{
! 			tempListeners = (LinkedList) _listeners.clone();
  		}
  
! 		Iterator it = tempListeners.iterator();
  
  		while (it.hasNext())
--- 99,110 ----
  	void notifySelected()
  	{
! 		List<TreeNodeEventListener> tempListeners = null;
  
  		synchronized (_listeners)
  		{
! 			tempListeners = new LinkedList<TreeNodeEventListener>(_listeners);
  		}
  
! 		Iterator<TreeNodeEventListener> it = tempListeners.iterator();
  
  		while (it.hasNext())
***************
*** 115,130 ****
  	private void notifyOpened()
  	{
! 		LinkedList tempListeners = null;
  
  		synchronized (_listeners)
  		{
! 			tempListeners = (LinkedList) _listeners.clone();
  		}
  
! 		Iterator it = tempListeners.iterator();
  
  		while (it.hasNext())
  		{
! 			TreeNodeEventListener listener = (TreeNodeEventListener) it.next();
  
  			listener.opened();
--- 118,133 ----
  	private void notifyOpened()
  	{
! 		List<TreeNodeEventListener> tempListeners = null;
  
  		synchronized (_listeners)
  		{
! 			tempListeners = new LinkedList<TreeNodeEventListener>(_listeners);
  		}
  
! 		Iterator<TreeNodeEventListener> it = tempListeners.iterator();
  
  		while (it.hasNext())
  		{
! 			TreeNodeEventListener listener = it.next();
  
  			listener.opened();
***************
*** 136,151 ****
  	private void notifyClosed()
  	{
! 		LinkedList tempListeners = null;
  
  		synchronized (_listeners)
  		{
! 			tempListeners = (LinkedList) _listeners.clone();
  		}
  
! 		Iterator it = tempListeners.iterator();
  
  		while (it.hasNext())
  		{
! 			TreeNodeEventListener listener = (TreeNodeEventListener) it.next();
  
  			listener.closed();
--- 139,154 ----
  	private void notifyClosed()
  	{
! 		LinkedList<TreeNodeEventListener> tempListeners = null;
  
  		synchronized (_listeners)
  		{
! 			tempListeners = new LinkedList<TreeNodeEventListener>(_listeners);
  		}
  
! 		Iterator<TreeNodeEventListener> it = tempListeners.iterator();
  
  		while (it.hasNext())
  		{
! 			TreeNodeEventListener listener = it.next();
  
  			listener.closed();
***************
*** 156,162 ****
  
  	private String _name;
! 	private LinkedList _children;
  
! 	private LinkedList _listeners;
  	private boolean _opened;
  }
\ No newline at end of file
--- 159,165 ----
  
  	private String _name;
! 	private List<TreeNodeModel> _children;
  
! 	private List<TreeNodeEventListener> _listeners;
  	private boolean _opened;
  }
\ No newline at end of file

Index: TableTreeRenderHelper.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree/TableTreeRenderHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TableTreeRenderHelper.java	1 Sep 2006 19:34:53 -0000	1.2
--- TableTreeRenderHelper.java	6 Aug 2010 21:04:52 -0000	1.3
***************
*** 118,130 ****
  				+ "cellspacing='0' " + "cellpadding='3'>");
  
! 		Collection children = parentNodeModel.getChildren();
  
  		if (children != null)
  		{
! 			Iterator it = children.iterator();
  
  			while (it.hasNext())
  			{
! 				TreeNodeModel treeNodeChild = (TreeNodeModel) it.next();
  
  				writer.println("<tr>");
--- 118,130 ----
  				+ "cellspacing='0' " + "cellpadding='3'>");
  
! 		Collection<TreeNodeModel> children = parentNodeModel.getChildren();
  
  		if (children != null)
  		{
! 			Iterator<TreeNodeModel> it = children.iterator();
  
  			while (it.hasNext())
  			{
! 				TreeNodeModel treeNodeChild = it.next();
  
  				writer.println("<tr>");

Index: TreeNodeEventAdapter.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree/TreeNodeEventAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TreeNodeEventAdapter.java	13 Sep 2005 11:23:27 -0000	1.1
--- TreeNodeEventAdapter.java	6 Aug 2010 21:04:52 -0000	1.2
***************
*** 25,28 ****
--- 25,30 ----
  public class TreeNodeEventAdapter implements TreeNodeEventListener
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public void selected()
  	{

Index: TreeNodeSelectAction.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree/TreeNodeSelectAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TreeNodeSelectAction.java	13 Sep 2005 11:23:27 -0000	1.1
--- TreeNodeSelectAction.java	6 Aug 2010 21:04:52 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  public class TreeNodeSelectAction implements IAction
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public TreeNodeSelectAction(TreeNodeModel treeNode)
  	{

Index: TreeModel.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree/TreeModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TreeModel.java	13 Sep 2005 11:23:27 -0000	1.1
--- TreeModel.java	6 Aug 2010 21:04:52 -0000	1.2
***************
*** 25,27 ****
--- 25,28 ----
  public class TreeModel extends TreeNodeModel
  {
+ 	private static final long serialVersionUID = 1L;
  }
\ No newline at end of file

Index: Tree.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree/Tree.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Tree.java	1 Sep 2006 19:34:53 -0000	1.2
--- Tree.java	6 Aug 2010 21:04:52 -0000	1.3
***************
*** 25,41 ****
  import java.io.IOException;
  
- import portal.model.IModel;
  import portal.ui.Component;
  import portal.ui.render.IRenderContext;
  import portal.ui.render.RenderException;
  
! public class Tree extends Component
  {
  	public TreeModel getTreeModel()
  	{
! 		return (TreeModel) getModel();
  	}
  
! 	public IModel createDefaultModel()
  	{
  		return new TreeModel();
--- 25,42 ----
  import java.io.IOException;
  
  import portal.ui.Component;
  import portal.ui.render.IRenderContext;
  import portal.ui.render.RenderException;
  
! public class Tree extends Component<TreeModel>
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public TreeModel getTreeModel()
  	{
! 		return getModel();
  	}
  
! 	public TreeModel createDefaultModel()
  	{
  		return new TreeModel();

[pfc-cvs-commit] pfc-api/src/java/portal/ui IApplication.java, 1.1, 1.2 PortalRuntimeException.java, 1.1, 1.2 AbstractFileFieldUpdater.java, 1.1, 1.2 Component.java, 1.4, 1.5 Container.java, 1.1, 1.2 PortalContext.java, 1.2, 1.3 ErrorState.java, 1.1, 1.2 AbstractFormFieldUpdater.java, 1.1, 1.2 PortalException.java, 1.1, 1.2

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

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

Modified Files:
	IApplication.java PortalRuntimeException.java 
	AbstractFileFieldUpdater.java Component.java Container.java 
	PortalContext.java ErrorState.java 
	AbstractFormFieldUpdater.java PortalException.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: IApplication.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/IApplication.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IApplication.java	13 Sep 2005 11:23:27 -0000	1.1
--- IApplication.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 31,35 ****
  	String getName();
  
! 	Component getComponent();
  
  	void destroy();
--- 31,35 ----
  	String getName();
  
! 	Component<?> getComponent();
  
  	void destroy();

Index: AbstractFormFieldUpdater.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/AbstractFormFieldUpdater.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractFormFieldUpdater.java	13 Sep 2005 11:23:27 -0000	1.1
--- AbstractFormFieldUpdater.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 25,28 ****
--- 25,30 ----
  public abstract class AbstractFormFieldUpdater implements IUpdater
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public final void update(Object value)
  	{

Index: Component.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/Component.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Component.java	7 Feb 2009 07:21:06 -0000	1.4
--- Component.java	6 Aug 2010 21:04:53 -0000	1.5
***************
*** 59,62 ****
--- 59,64 ----
  public class Component<ModelType extends IModel> implements Serializable, Renderable
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	/**
  	 * <p>Creates a new <code>Component</code> instance.</p>

Index: ErrorState.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/ErrorState.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ErrorState.java	13 Sep 2005 11:23:27 -0000	1.1
--- ErrorState.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  public class ErrorState implements Serializable
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public ErrorState(Throwable throwable)
  	{

Index: PortalContext.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/PortalContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PortalContext.java	23 Sep 2005 05:58:17 -0000	1.2
--- PortalContext.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 27,38 ****
  public abstract class PortalContext
  {
! 	private static ThreadLocal threadPortalContext = new ThreadLocal();
  
  	public static PortalContext getPortalContext()
  	{
! 		return (PortalContext) threadPortalContext.get();
  	}
  
! 	protected static ThreadLocal getThreadLocalPortalContext()
  	{
  		return threadPortalContext;
--- 27,40 ----
  public abstract class PortalContext
  {
! 	private static final long serialVersionUID = 1L;
! 
! 	private static ThreadLocal<PortalContext> threadPortalContext = new ThreadLocal<PortalContext>();
  
  	public static PortalContext getPortalContext()
  	{
! 		return threadPortalContext.get();
  	}
  
! 	protected static ThreadLocal<PortalContext> getThreadLocalPortalContext()
  	{
  		return threadPortalContext;

Index: Container.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/Container.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Container.java	13 Sep 2005 11:23:27 -0000	1.1
--- Container.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 27,30 ****
--- 27,31 ----
  import java.util.LinkedList;
  
+ import portal.model.IModel;
  import portal.ui.render.LayoutManager;
  
***************
*** 49,54 ****
   * @since 0.9
   */
! public class Container extends Component
  {
  	/**
  	 * <p>Create a new Container instance.</p>
--- 50,57 ----
   * @since 0.9
   */
! public class Container extends Component<IModel>
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	/**
  	 * <p>Create a new Container instance.</p>
***************
*** 94,99 ****
  		super(name);
  
! 		_components = new LinkedList();
! 		_constraints = new LinkedList();
  
  		setLayout(layout);
--- 97,102 ----
  		super(name);
  
! 		_components = new LinkedList<Component<?>>();
! 		_constraints = new LinkedList<Object>();
  
  		setLayout(layout);
***************
*** 106,110 ****
  	 * @param component The child component to add to this container.
  	 */
! 	public final void add(Component component)
  	{
  		add(size(), component, null);
--- 109,113 ----
  	 * @param component The child component to add to this container.
  	 */
! 	public final void add(Component<?> component)
  	{
  		add(size(), component, null);
***************
*** 122,126 ****
  	 * @param constraint The constraint used to add this child component to this container.
  	 */
! 	public final void add(Component component, Object constraint)
  	{
  		add(size(), component, constraint);
--- 125,129 ----
  	 * @param constraint The constraint used to add this child component to this container.
  	 */
! 	public final void add(Component<?> component, Object constraint)
  	{
  		add(size(), component, constraint);
***************
*** 140,144 ****
  	 * @param constraint The constraint used to add this child component to this container.
  	 */
! 	public final void add(int index, Component component, Object constraint)
  	{
  		if (component.getParent() == this)
--- 143,147 ----
  	 * @param constraint The constraint used to add this child component to this container.
  	 */
! 	public final void add(int index, Component<?> component, Object constraint)
  	{
  		if (component.getParent() == this)
***************
*** 173,177 ****
  	 * @param component the child component that has to be removed.
  	 */
! 	public final void remove(Component component)
  	{
  		remove(_components.indexOf(component));
--- 176,180 ----
  	 * @param component the child component that has to be removed.
  	 */
! 	public final void remove(Component<?> component)
  	{
  		remove(_components.indexOf(component));
***************
*** 223,227 ****
  		}
  
! 		Component component = (Component) _components.remove(index);
  
  		_constraints.remove(index);
--- 226,230 ----
  		}
  
! 		Component<?> component = _components.remove(index);
  
  		_constraints.remove(index);
***************
*** 241,248 ****
  	public final void removeAll()
  	{
! 		Iterator it = _components.iterator();
  		while (it.hasNext())
  		{
! 			Component component = (Component) it.next();
  			component.setParent(null);
  		}
--- 244,251 ----
  	public final void removeAll()
  	{
! 		Iterator<Component<?>> it = _components.iterator();
  		while (it.hasNext())
  		{
! 			Component<?> component = it.next();
  			component.setParent(null);
  		}
***************
*** 295,299 ****
  	 * @return the child component at the given index.
  	 */
! 	public final Component getComponent(int index)
  	{
  		if (!isIndexValid(index))
--- 298,302 ----
  	 * @return the child component at the given index.
  	 */
! 	public final Component<?> getComponent(int index)
  	{
  		if (!isIndexValid(index))
***************
*** 305,309 ****
  		}
  
! 		return (Component) _components.get(index);
  	}
  
--- 308,312 ----
  		}
  
! 		return _components.get(index);
  	}
  
***************
*** 314,320 ****
  	 * @return a copy of the list of child components in this container.
  	 */
! 	public final Collection getComponents()
  	{
! 		return (Collection) _components.clone();
  	}
  
--- 317,323 ----
  	 * @return a copy of the list of child components in this container.
  	 */
! 	public final Collection<Component<?>> getComponents()
  	{
! 		return new LinkedList<Component<?>>(_components);
  	}
  
***************
*** 327,331 ****
  	 * @return the first component found that uses this constraint.
  	 */
! 	public final Component getComponent(Object constraint)
  	{
  		if (constraint == null)
--- 330,334 ----
  	 * @return the first component found that uses this constraint.
  	 */
! 	public final Component<?> getComponent(Object constraint)
  	{
  		if (constraint == null)
***************
*** 341,345 ****
  					&& (currentConstraint.equals(constraint)))
  			{
! 				return (Component) _components.get(i);
  			}
  		}
--- 344,348 ----
  					&& (currentConstraint.equals(constraint)))
  			{
! 				return _components.get(i);
  			}
  		}
***************
*** 355,359 ****
  	 * @param child the child component
  	 */
! 	private void removeFromOldContainer(Component child)
  	{
  		if (child.getParent() != null
--- 358,362 ----
  	 * @param child the child component
  	 */
! 	private void removeFromOldContainer(Component<?> child)
  	{
  		if (child.getParent() != null
***************
*** 377,381 ****
  	}
  
! 	private LinkedList _components;
! 	private LinkedList _constraints;
  }
\ No newline at end of file
--- 380,384 ----
  	}
  
! 	private LinkedList<Component<?>> _components;
! 	private LinkedList<Object> _constraints;
  }
\ No newline at end of file

Index: AbstractFileFieldUpdater.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/AbstractFileFieldUpdater.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractFileFieldUpdater.java	13 Sep 2005 11:23:27 -0000	1.1
--- AbstractFileFieldUpdater.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 25,28 ****
--- 25,31 ----
  public abstract class AbstractFileFieldUpdater implements IUpdater
  {
+ 
+ 	private static final long serialVersionUID = 1L;
+ 
  	public final void update(Object value)
  	{

Index: PortalRuntimeException.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/PortalRuntimeException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PortalRuntimeException.java	4 Mar 2006 22:32:38 -0000	1.1
--- PortalRuntimeException.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 25,28 ****
--- 25,30 ----
  public class PortalRuntimeException extends RuntimeException
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public PortalRuntimeException(String message)
  	{

Index: PortalException.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/PortalException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PortalException.java	13 Sep 2005 11:23:27 -0000	1.1
--- PortalException.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 25,28 ****
--- 25,30 ----
  public class PortalException extends Exception
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public PortalException(String message)
  	{

[pfc-cvs-commit] pfc-api/src/java/portal/interfaces InterfaceUtils.java, 1.1, 1.2 IInterfaceImplementor.java, 1.1, 1.2 OptionalInterfaceException.java, 1.1, 1.2 InterfaceNotSupportedException.java, 1.1, 1.2 InterfaceRuntime.java, 1.1, 1.2 InterfaceRuntimeException.java, 1.1, 1.2 NotAnOptionalInterfaceException.java, 1.1, 1.2

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

Update of /cvsroot/pfc/pfc-api/src/java/portal/interfaces
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7925/src/java/portal/interfaces

Modified Files:
	InterfaceUtils.java IInterfaceImplementor.java 
	OptionalInterfaceException.java 
	InterfaceNotSupportedException.java InterfaceRuntime.java 
	InterfaceRuntimeException.java 
	NotAnOptionalInterfaceException.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: InterfaceRuntimeException.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/interfaces/InterfaceRuntimeException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceRuntimeException.java	25 Aug 2006 10:14:16 -0000	1.1
--- InterfaceRuntimeException.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 33,36 ****
--- 33,38 ----
  public class InterfaceRuntimeException extends Exception
  {
+ 	private static final long serialVersionUID = 1L;
+ 	
  	public InterfaceRuntimeException(String message)
  	{

Index: IInterfaceImplementor.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/interfaces/IInterfaceImplementor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IInterfaceImplementor.java	25 Aug 2006 10:14:16 -0000	1.1
--- IInterfaceImplementor.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 57,61 ****
  	 *         IOptionalInterface
  	 */
! 	Class[] listOptionalInterfaces();
  
  	/**
--- 57,61 ----
  	 *         IOptionalInterface
  	 */
! 	Class<?>[] listOptionalInterfaces();
  
  	/**
***************
*** 72,76 ****
  	 *             IOptionalInterface
  	 */
! 	boolean supportsInterface(Class pInterface)
  			throws NotAnOptionalInterfaceException;
  
--- 72,76 ----
  	 *             IOptionalInterface
  	 */
! 	boolean supportsInterface(Class<?> pInterface)
  			throws NotAnOptionalInterfaceException;
  
***************
*** 99,103 ****
  	 *             IOptionalInterface
  	 */
! 	IOptionalInterface getInterface(Class pInterface)
  			throws NotAnOptionalInterfaceException,
  			InterfaceNotSupportedException;
--- 99,103 ----
  	 *             IOptionalInterface
  	 */
! 	IOptionalInterface getInterface(Class<?> pInterface)
  			throws NotAnOptionalInterfaceException,
  			InterfaceNotSupportedException;

Index: NotAnOptionalInterfaceException.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/interfaces/NotAnOptionalInterfaceException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NotAnOptionalInterfaceException.java	25 Aug 2006 10:14:16 -0000	1.1
--- NotAnOptionalInterfaceException.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 36,39 ****
--- 36,41 ----
  public class NotAnOptionalInterfaceException extends OptionalInterfaceException
  {
+ 	private static final long serialVersionUID = 1L;
+ 	
  	public NotAnOptionalInterfaceException(String message)
  	{

Index: OptionalInterfaceException.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/interfaces/OptionalInterfaceException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OptionalInterfaceException.java	25 Aug 2006 10:14:16 -0000	1.1
--- OptionalInterfaceException.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 33,36 ****
--- 33,38 ----
  public class OptionalInterfaceException extends RuntimeException
  {
+ 	private static final long serialVersionUID = 1L;
+ 	
  	public OptionalInterfaceException(String message)
  	{

Index: InterfaceNotSupportedException.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/interfaces/InterfaceNotSupportedException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceNotSupportedException.java	25 Aug 2006 10:14:16 -0000	1.1
--- InterfaceNotSupportedException.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 36,39 ****
--- 36,41 ----
  public class InterfaceNotSupportedException extends OptionalInterfaceException
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public InterfaceNotSupportedException(String message)
  	{

Index: InterfaceRuntime.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/interfaces/InterfaceRuntime.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceRuntime.java	25 Aug 2006 10:14:16 -0000	1.1
--- InterfaceRuntime.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 42,57 ****
  public class InterfaceRuntime implements IInterfaceImplementor
  {
  	public InterfaceRuntime()
  	{
! 		_interfaces = new HashMap();
  
  		_interfaceAsked = false;
  	}
  
! 	public final Class[] listOptionalInterfaces()
  	{
  		_interfaceAsked = true;
  
! 		Class[] interfaces = null;
  
  		if (_interfaces.isEmpty())
--- 42,59 ----
  public class InterfaceRuntime implements IInterfaceImplementor
  {
+ 	private static final long serialVersionUID = 1L;
+ 	
  	public InterfaceRuntime()
  	{
! 		_interfaces = new HashMap<Class<?>,Object>();
  
  		_interfaceAsked = false;
  	}
  
! 	public final Class<?>[] listOptionalInterfaces()
  	{
  		_interfaceAsked = true;
  
! 		Class<?>[] interfaces = null;
  
  		if (_interfaces.isEmpty())
***************
*** 65,72 ****
  			int interfaceIndex = 0;
  
! 			Iterator interfaceIt = _interfaces.keySet().iterator();
  			while (interfaceIt.hasNext())
  			{
! 				Class supInterface = (Class) interfaceIt.next();
  
  				interfaces[interfaceIndex++] = supInterface;
--- 67,74 ----
  			int interfaceIndex = 0;
  
! 			Iterator<Class<?>> interfaceIt = _interfaces.keySet().iterator();
  			while (interfaceIt.hasNext())
  			{
! 				Class<?> supInterface = interfaceIt.next();
  
  				interfaces[interfaceIndex++] = supInterface;
***************
*** 77,81 ****
  	}
  
! 	public final boolean supportsInterface(Class pInterface)
  			throws NotAnOptionalInterfaceException
  	{
--- 79,83 ----
  	}
  
! 	public final boolean supportsInterface(Class<?> pInterface)
  			throws NotAnOptionalInterfaceException
  	{
***************
*** 97,101 ****
  	}
  
! 	public final IOptionalInterface getInterface(Class pInterface)
  			throws NotAnOptionalInterfaceException,
  			InterfaceNotSupportedException
--- 99,103 ----
  	}
  
! 	public final IOptionalInterface getInterface(Class<?> pInterface)
  			throws NotAnOptionalInterfaceException,
  			InterfaceNotSupportedException
***************
*** 150,154 ****
  	 *             once
  	 */
! 	protected final void registerInterface(Class pInterface,
  			IInterfaceFactory pFactory) throws NotAnOptionalInterfaceException,
  			InterfaceRuntimeException
--- 152,156 ----
  	 *             once
  	 */
! 	protected final void registerInterface(Class<?> pInterface,
  			IInterfaceFactory pFactory) throws NotAnOptionalInterfaceException,
  			InterfaceRuntimeException
***************
*** 170,174 ****
  	}
  
! 	private Map _interfaces;
  
  	private boolean _interfaceAsked;
--- 172,176 ----
  	}
  
! 	private Map<Class<?>,Object> _interfaces;
  
  	private boolean _interfaceAsked;

Index: InterfaceUtils.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/interfaces/InterfaceUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceUtils.java	25 Aug 2006 10:14:16 -0000	1.1
--- InterfaceUtils.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 53,57 ****
  	 */
  	public static final boolean supportsInterfaces(
! 			IInterfaceImplementor pImplementor, Class[] pInterfaces)
  	{
  		if ((pImplementor == null) || (pInterfaces == null))
--- 53,57 ----
  	 */
  	public static final boolean supportsInterfaces(
! 			IInterfaceImplementor pImplementor, Class<?>[] pInterfaces)
  	{
  		if ((pImplementor == null) || (pInterfaces == null))
***************
*** 63,67 ****
  		for (int i = 0; i != pInterfaces.length; i++)
  		{
! 			Class interfaceClass = pInterfaces[i];
  
  			if (interfaceClass == null)
--- 63,67 ----
  		for (int i = 0; i != pInterfaces.length; i++)
  		{
! 			Class<?> interfaceClass = pInterfaces[i];
  
  			if (interfaceClass == null)
***************
*** 98,102 ****
  	 *         otherwise
  	 */
! 	public static final boolean isOptionalInterface(Class pInterface)
  	{
  		return IOptionalInterface.class.isAssignableFrom(pInterface);
--- 98,102 ----
  	 *         otherwise
  	 */
! 	public static final boolean isOptionalInterface(Class<?> pInterface)
  	{
  		return IOptionalInterface.class.isAssignableFrom(pInterface);

[pfc-cvs-commit] pfc-api/src/java/portal/ui/comp/system MemoryInfo.java, 1.2, 1.3

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

Update of /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/system
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7925/src/java/portal/ui/comp/system

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

Index: MemoryInfo.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/system/MemoryInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MemoryInfo.java	7 Feb 2009 07:19:42 -0000	1.2
--- MemoryInfo.java	6 Aug 2010 21:04:53 -0000	1.3
***************
*** 30,33 ****
--- 30,35 ----
  public class MemoryInfo extends Panel
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final double BASE_PERCENTAGE = 100.0;
  	private static final double KILOBYTE = 1024.0;
***************
*** 77,80 ****
--- 79,84 ----
  	private class TotalMemoryStringModel implements IStringModel
  	{
+ 		private static final long serialVersionUID = 1L;
+ 
  		public String getValue()
  		{
***************
*** 90,93 ****
--- 94,99 ----
  	private class FreeMemoryStringModel implements IStringModel
  	{
+ 		private static final long serialVersionUID = 1L;
+ 
  		public String getValue()
  		{
***************
*** 103,106 ****
--- 109,114 ----
  	private class PercentageFreeStringModel implements IStringModel
  	{
+ 		private static final long serialVersionUID = 1L;
+ 
  		public String getValue()
  		{

[pfc-cvs-commit] pfc-api/src/java/portal/services/monitor IMonitorService.java, 1.1, 1.2

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

Update of /cvsroot/pfc/pfc-api/src/java/portal/services/monitor
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7925/src/java/portal/services/monitor

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

Index: IMonitorService.java
===================================================================
RCS file: /cvsroot/pfc/pfc-api/src/java/portal/services/monitor/IMonitorService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IMonitorService.java	13 Sep 2005 11:23:28 -0000	1.1
--- IMonitorService.java	6 Aug 2010 21:04:53 -0000	1.2
***************
*** 46,49 ****
  	 *         pInterface parameter
  	 */
! 	Object monitor(Object pTarget, Class pInterface, String pName);
  }
\ No newline at end of file
--- 46,49 ----
  	 *         pInterface parameter
  	 */
! 	Object monitor(Object pTarget, Class<?> pInterface, String pName);
  }
\ No newline at end of file