[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/util/log Log4jLoggerFactory.java, 1.3, 1.4 ILoggerFactory.java, 1.3, 1.4 Log4jLogger.java, 1.4, 1.5 LoggerController.java, 1.2, 1.3 ILoggerListener.java, 1.1, 1.2

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/util/log
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14106/fw/src/net/sourceforge/squirrel_sql/fw/util/log

Modified Files:
	Log4jLoggerFactory.java ILoggerFactory.java Log4jLogger.java 
	LoggerController.java ILoggerListener.java 
Log Message:
1761706 (Miscellaneous Java 5 Generics) from patch submitted by Bron Eubanks

Index: ILoggerListener.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/util/log/ILoggerListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ILoggerListener.java	1 Nov 2005 01:15:23 -0000	1.1
--- ILoggerListener.java	31 Jul 2007 01:02:20 -0000	1.2
***************
*** 3,11 ****
  public interface ILoggerListener
  {
! 	public void info(Class source, Object message);
! 	public void info(Class source, Object message, Throwable th);
! 	public void warn(Class source, Object message);
! 	public void warn(Class source, Object message, Throwable th);
! 	public void error(Class source, Object message);
! 	public void error(Class source, Object message, Throwable th);
  }
--- 3,11 ----
  public interface ILoggerListener
  {
! 	public void info(Class<?> source, Object message);
! 	public void info(Class<?> source, Object message, Throwable th);
! 	public void warn(Class<?> source, Object message);
! 	public void warn(Class<?> source, Object message, Throwable th);
! 	public void error(Class<?> source, Object message);
! 	public void error(Class<?> source, Object message, Throwable th);
  }

Index: Log4jLogger.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/util/log/Log4jLogger.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Log4jLogger.java	11 May 2007 22:34:53 -0000	1.4
--- Log4jLogger.java	31 Jul 2007 01:02:20 -0000	1.5
***************
*** 31,35 ****
  	private Logger _log;
  	private ILoggerListener _listener;
! 	private Class _clazz;
  
  	/**
--- 31,35 ----
  	private Logger _log;
  	private ILoggerListener _listener;
! 	private Class<?> _clazz;
  
  	/**
***************
*** 43,47 ****
  	 * 			Thrown if <TT>clazz</TT> is <TT>null</TT>.
  	 */
! 	Log4jLogger(Class clazz, ILoggerListener listener)
  	{
  		if (clazz == null)
--- 43,47 ----
  	 * 			Thrown if <TT>clazz</TT> is <TT>null</TT>.
  	 */
! 	Log4jLogger(Class<?> clazz, ILoggerListener listener)
  	{
  		if (clazz == null)

Index: Log4jLoggerFactory.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/util/log/Log4jLoggerFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Log4jLoggerFactory.java	1 Nov 2005 01:15:23 -0000	1.3
--- Log4jLoggerFactory.java	31 Jul 2007 01:02:20 -0000	1.4
***************
*** 25,29 ****
  {
  	private ILoggerListener _listenerOfAllLoggers;
! 	private Vector _listeners =new Vector();
  
  	public Log4jLoggerFactory()
--- 25,29 ----
  {
  	private ILoggerListener _listenerOfAllLoggers;
! 	private Vector<ILoggerListener> _listeners =new Vector<ILoggerListener>();
  
  	public Log4jLoggerFactory()
***************
*** 48,56 ****
  		_listenerOfAllLoggers = new ILoggerListener()
  		{
! 			public void info(Class source, Object message)
  			{
  				try
  				{
! 					ILoggerListener[] listeners = (ILoggerListener[]) _listeners.toArray(new ILoggerListener[_listeners.size()]);
  					for (int i = 0; i < listeners.length; i++)
  					{
--- 48,56 ----
  		_listenerOfAllLoggers = new ILoggerListener()
  		{
! 			public void info(Class<?> source, Object message)
  			{
  				try
  				{
! 					ILoggerListener[] listeners = _listeners.toArray(new ILoggerListener[_listeners.size()]);
  					for (int i = 0; i < listeners.length; i++)
  					{
***************
*** 64,72 ****
  			}
  
! 			public void info(Class source, Object message, Throwable th)
  			{
  				try
  				{
! 					ILoggerListener[] listeners = (ILoggerListener[]) _listeners.toArray(new ILoggerListener[_listeners.size()]);
  					for (int i = 0; i < listeners.length; i++)
  					{
--- 64,72 ----
  			}
  
! 			public void info(Class<?> source, Object message, Throwable th)
  			{
  				try
  				{
! 					ILoggerListener[] listeners = _listeners.toArray(new ILoggerListener[_listeners.size()]);
  					for (int i = 0; i < listeners.length; i++)
  					{
***************
*** 80,88 ****
  			}
  
! 			public void warn(Class source, Object message)
  			{
  				try
  				{
! 					ILoggerListener[] listeners = (ILoggerListener[]) _listeners.toArray(new ILoggerListener[_listeners.size()]);
  					for (int i = 0; i < listeners.length; i++)
  					{
--- 80,88 ----
  			}
  
! 			public void warn(Class<?> source, Object message)
  			{
  				try
  				{
! 					ILoggerListener[] listeners = _listeners.toArray(new ILoggerListener[_listeners.size()]);
  					for (int i = 0; i < listeners.length; i++)
  					{
***************
*** 96,104 ****
  			}
  
! 			public void warn(Class source, Object message, Throwable th)
  			{
  				try
  				{
! 					ILoggerListener[] listeners = (ILoggerListener[]) _listeners.toArray(new ILoggerListener[_listeners.size()]);
  					for (int i = 0; i < listeners.length; i++)
  					{
--- 96,104 ----
  			}
  
! 			public void warn(Class<?> source, Object message, Throwable th)
  			{
  				try
  				{
! 					ILoggerListener[] listeners = _listeners.toArray(new ILoggerListener[_listeners.size()]);
  					for (int i = 0; i < listeners.length; i++)
  					{
***************
*** 112,120 ****
  			}
  
! 			public void error(Class source, Object message)
  			{
  				try
  				{
! 					ILoggerListener[] listeners = (ILoggerListener[]) _listeners.toArray(new ILoggerListener[_listeners.size()]);
  					for (int i = 0; i < listeners.length; i++)
  					{
--- 112,120 ----
  			}
  
! 			public void error(Class<?> source, Object message)
  			{
  				try
  				{
! 					ILoggerListener[] listeners = _listeners.toArray(new ILoggerListener[_listeners.size()]);
  					for (int i = 0; i < listeners.length; i++)
  					{
***************
*** 128,136 ****
  			}
  
! 			public void error(Class source, Object message, Throwable th)
  			{
  				try
  				{
! 					ILoggerListener[] listeners = (ILoggerListener[]) _listeners.toArray(new ILoggerListener[_listeners.size()]);
  					for (int i = 0; i < listeners.length; i++)
  					{
--- 128,136 ----
  			}
  
! 			public void error(Class<?> source, Object message, Throwable th)
  			{
  				try
  				{
! 					ILoggerListener[] listeners = _listeners.toArray(new ILoggerListener[_listeners.size()]);
  					for (int i = 0; i < listeners.length; i++)
  					{
***************
*** 151,155 ****
  	}
  
! 	public ILogger createLogger(Class clazz)
  	{
  		return new Log4jLogger(clazz, _listenerOfAllLoggers);
--- 151,155 ----
  	}
  
! 	public ILogger createLogger(Class<?> clazz)
  	{
  		return new Log4jLogger(clazz, _listenerOfAllLoggers);

Index: ILoggerFactory.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/util/log/ILoggerFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ILoggerFactory.java	1 Nov 2005 01:15:23 -0000	1.3
--- ILoggerFactory.java	31 Jul 2007 01:02:20 -0000	1.4
***************
*** 20,24 ****
  public interface ILoggerFactory
  {
! 	ILogger createLogger(Class clazz);
  	void shutdown();
  
--- 20,24 ----
  public interface ILoggerFactory
  {
! 	ILogger createLogger(Class<?> clazz);
  	void shutdown();
  

Index: LoggerController.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/util/log/LoggerController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LoggerController.java	1 Nov 2005 01:15:23 -0000	1.2
--- LoggerController.java	31 Jul 2007 01:02:20 -0000	1.3
***************
*** 22,26 ****
  public class LoggerController
  {
! 	private static Vector s_oldfactories = new Vector();
  	private static ILoggerFactory s_factory = new Log4jLoggerFactory();
  
--- 22,26 ----
  public class LoggerController
  {
! 	private static Vector<ILoggerFactory> s_oldfactories = new Vector<ILoggerFactory>();
  	private static ILoggerFactory s_factory = new Log4jLoggerFactory();
  
***************
*** 31,35 ****
  	}
  
! 	public static ILogger createLogger(Class clazz)
  	{
  		return s_factory.createLogger(clazz);
--- 31,35 ----
  	}
  
! 	public static ILogger createLogger(Class<?> clazz)
  	{
  		return s_factory.createLogger(clazz);
***************
*** 47,51 ****
  		for (int i = 0; i < s_oldfactories.size(); i++)
  		{
! 			ILoggerFactory iLoggerFactory = (ILoggerFactory) s_oldfactories.get(i);
  			iLoggerFactory.addLoggerListener(l);
  		}
--- 47,51 ----
  		for (int i = 0; i < s_oldfactories.size(); i++)
  		{
! 			ILoggerFactory iLoggerFactory = s_oldfactories.get(i);
  			iLoggerFactory.addLoggerListener(l);
  		}
***************
*** 58,62 ****
  		for (int i = 0; i < s_oldfactories.size(); i++)
  		{
! 			ILoggerFactory iLoggerFactory = (ILoggerFactory) s_oldfactories.get(i);
  			iLoggerFactory.removeLoggerListener(l);
  		}
--- 58,62 ----
  		for (int i = 0; i < s_oldfactories.size(); i++)
  		{
! 			ILoggerFactory iLoggerFactory = s_oldfactories.get(i);
  			iLoggerFactory.removeLoggerListener(l);
  		}