[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/util Utilities.java,1.9,1.10 Pair.java,1.3,NONE

[Gerd W. <ger...@us...>]

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

Modified Files:
	Utilities.java 
Removed Files:
	Pair.java 
Log Message:
Feature request #1446675 Output tables to CSV files

--- Pair.java DELETED ---

Index: Utilities.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/util/Utilities.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Utilities.java	11 Nov 2005 07:07:21 -0000	1.9
--- Utilities.java	26 May 2006 17:54:18 -0000	1.10
***************
*** 18,27 ****
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
  import java.io.*;
  import java.text.NumberFormat;
- import java.net.URLClassLoader;
  
- import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
- import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
  /**
   * General purpose utilities functions.
--- 18,27 ----
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
+ import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+ import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+ 
  import java.io.*;
  import java.text.NumberFormat;
  
  /**
   * General purpose utilities functions.
***************
*** 31,357 ****
  public class Utilities
  {
! 	/** Logger for this class. */
! 	private static ILogger s_log =
! 		LoggerController.createLogger(Utilities.class);
  
! 	/**
! 	 * Ctor. <TT>private</TT> as all methods are static.
! 	 */
! 	private Utilities()
! 	{
! 		super();
! 	}
  
! 	/**
! 	 * Print the current stack trace to <TT>ps</TT>.
! 	 *
! 	 * @param	ps	The <TT>PrintStream</TT> to print stack trace to.
! 	 *
! 	 * @throws	IllegalArgumentException	If a null <TT>ps</TT> passed.
! 	 */
! 	public static void printStackTrace(PrintStream ps)
! 	{
! 		if (ps == null)
! 		{
! 			throw new IllegalArgumentException("PrintStream == null");
! 		}
  
! 		try
! 		{
! 			throw new Exception();
! 		}
! 		catch (Exception ex)
! 		{
! 			ps.println(getStackTrace(ex));
! 		}
! 	}
  
! 	/**
! 	 * Return the stack trace from the passed exception as a string
! 	 *
! 	 * @param	th	The exception to retrieve stack trace for.
! 	 */
! 	public static String getStackTrace(Throwable th)
! 	{
! 		if (th == null)
! 		{
! 			throw new IllegalArgumentException("Throwable == null");
! 		}
  
! 		StringWriter sw = new StringWriter();
! 		try
! 		{
! 			PrintWriter pw = new PrintWriter(sw);
! 			try
! 			{
! 				th.printStackTrace(pw);
! 				return sw.toString();
! 			}
! 			finally
! 			{
! 				pw.close();
! 			}
! 		}
! 		finally
! 		{
! 			try
! 			{
! 				sw.close();
! 			}
! 			catch (IOException ex)
! 			{
! 				s_log.error("Unexpected error closing StringWriter", ex);
! 			}
! 		}
! 	}
  
! 	/**
! 	 * Change the passed class name to its corresponding file name. E.G.
! 	 * change &quot;Utilities&quot; to &quot;Utilities.class&quot;.
! 	 *
! 	 * @param	name	Class name to be changed.
! 	 *
! 	 * @throws	IllegalArgumentException	If a null <TT>name</TT> passed.
! 	 */
! 	public static String changeClassNameToFileName(String name)
! 	{
! 		if (name == null)
! 		{
! 			throw new IllegalArgumentException("Class Name == null");
! 		}
! 		return name.replace('.', '/').concat(".class");
! 	}
  
! 	/**
! 	 * Change the passed file name to its corresponding class name. E.G.
! 	 * change &quot;Utilities.class&quot; to &quot;Utilities&quot;.
! 	 *
! 	 * @param	name	Class name to be changed. If this does not represent
! 	 *					a Java class then <TT>null</TT> is returned.
! 	 *
! 	 * @throws IllegalArgumentException	If a null <TT>name</TT> passed.
! 	 */
! 	public static String changeFileNameToClassName(String name)
! 	{
! 		if (name == null)
! 		{
! 			throw new IllegalArgumentException("File Name == null");
! 		}
! 		String className = null;
! 		if (name.toLowerCase().endsWith(".class"))
! 		{
! 			className = name.replace('/', '.');
! 			className = className.replace('\\', '.');
! 			className = className.substring(0, className.length() - 6);
! 		}
! 		return className;
! 	}
  
! 	/**
! 	 * Clean the passed string. Replace whitespace characters with a single
! 	 * space. If a <TT>null</TT> string passed return an empty string. E.G.
! 	 * replace
! 	 *
! 	 * [pre]
! 	 * \t\tselect\t* from\t\ttab01
! 	 * [/pre]
! 	 *
! 	 * with
! 	 *
! 	 * [pre]
! 	 * select * from tab01
! 	 * [/pre]
! 	 *
! 	 * @deprecated	Use <tt>StringUtilities.cleanString(String)</tt> instead.
! 	 *
! 	 * @param	str	String to be cleaned.
! 	 *
! 	 * @return	Cleaned string.
! 	 */
! 	public static String cleanString(String str)
! 	{
! 		return StringUtilities.cleanString(str);
! 	}
  
! 	/**
! 	 * Return whether the 2 passed strings are equal. This function
! 	 * allows for <TT>null</TT> strings. If <TT>s1</TT> and <TT>s1</TT> are
! 	 * both <TT>null</TT> they are considered equal.
! 	 *
! 	 * @deprecated	Use <tt>StringUtilities.areStringsEqual(String, String)</tt>
! 	 *				instead.
! 	 */
! 	public static boolean areStringsEqual(String s1, String s2)
! 	{
! 		return StringUtilities.areStringsEqual(s1, s2);
! 	}
  
! 	/**
! 	 * Return the suffix of the passed file name.
! 	 *
! 	 * @param	fileName	File name to retrieve suffix for.
! 	 *
! 	 * @return	Suffix for <TT>fileName</TT> or an empty string
! 	 * 			if unable to get the suffix.
! 	 *
! 	 * @throws	IllegalArgumentException	if <TT>null</TT> file name passed.
! 	 */
! 	public static String getFileNameSuffix(String fileName)
! 	{
! 		if (fileName == null)
! 		{
! 			throw new IllegalArgumentException("file name == null");
! 		}
! 		int pos = fileName.lastIndexOf('.');
! 		if (pos > 0 && pos < fileName.length() - 1)
! 		{
! 			return fileName.substring(pos + 1);
! 		}
! 		return "";
! 	}
  
  
! 	/**
! 	 * Remove the suffix from the passed file name.
! 	 *
! 	 * @param	fileName	File name to remove suffix from.
! 	 *
! 	 * @return	<TT>fileName</TT> without a suffix.
! 	 *
! 	 * @throws	IllegalArgumentException	if <TT>null</TT> file name passed.
! 	 */
! 	public static String removeFileNameSuffix(String fileName)
! 	{
! 		if (fileName == null)
! 		{
! 			throw new IllegalArgumentException("file name == null");
! 		}
! 		int pos = fileName.lastIndexOf('.');
! 		if (pos > 0 && pos < fileName.length() - 1)
! 		{
! 			return fileName.substring(0, pos);
! 		}
! 		return fileName;
! 	}
  
! 	/**
! 	 * Return <tt>true</tt> if the passed string is <tt>null</tt> or empty.
! 	 *
! 	 * @deprecated	Use <tt>StringUtilities.isEmpty(String)</tt> instead.
! 	 *
! 	 * @param	str		String to be tested.
! 	 *
! 	 * @return	<tt>true</tt> if the passed string is <tt>null</tt> or empty.
! 	 */
! 	public static boolean isStringEmpty(String str)
! 	{
! 		return StringUtilities.isEmpty(str);
! 	}
  
! 	public static String formatSize(long longSize)
! 	{
! 		return formatSize(longSize, -1);
! 	}
  
! 	// TODO: i18n
! 	public static String formatSize(long longSize, int decimalPos)
! 	{
! 		NumberFormat fmt = NumberFormat.getNumberInstance();
! 		if (decimalPos >= 0)
! 		{
! 			fmt.setMaximumFractionDigits(decimalPos);
! 		}
! 		final double size = longSize;
! 		double val = size / (1024 * 1024);
! 		if (val > 1)
! 		{
! 			return fmt.format(val).concat(" MB");
! 		}
! 		val = size / 1024;
! 		if (val > 10)
! 		{
! 			return fmt.format(val).concat(" KB");
! 		}
! 		return fmt.format(val).concat(" bytes");
! 	}
  
! 	/**
! 	 * Split a string based on the given delimiter, but don't remove
! 	 * empty elements.
! 	 *
! 	 * @deprecated	Use <tt>StringUtilities.split(String, char)</tt>
! 	 *				instead.
! 	 *
! 	 * @param	str			The string to be split.
! 	 * @param	delimiter	Split string based on this delimiter.
! 	 *
! 	 * @return	Array of split strings. Guaranteeded to be not null.
! 	 */
! 	public static String[] splitString(String str, char delimiter)
! 	{
! 		return StringUtilities.split(str, delimiter);
! 	}
  
! 	/**
! 	 * Split a string based on the given delimiter, optionally removing
! 	 * empty elements.
! 	 *
! 	 * @deprecated	Use <tt>StringUtilities.split(String, char, boolean)</tt>
! 	 *				instead.
! 	 *
! 	 * @param	str			The string to be split.
! 	 * @param	delimiter	Split string based on this delimiter.
! 	 * @param	removeEmpty	If <tt>true</tt> then remove empty elements.
! 	 *
! 	 * @return	Array of split strings. Guaranteeded to be not null.
! 	 */
! 	public static String[] splitString(String str, char delimiter,
! 									   	boolean removeEmpty)
! 	{
! 		return StringUtilities.split(str, delimiter, removeEmpty);
! 	}
  
! 	/**
! 	 * Creates a clone of any serializable object. Collections and arrays
! 	 * may be cloned if the entries are serializable.
! 	 *
! 	 * Caution super class members are not cloned if a super class is not serializable. 
! 	 */
! 	public static Object cloneObject(Object toClone, final ClassLoader classLoader)
! 	{
! 		if(null == toClone)
! 		{
! 			return null;
! 		}
! 		else
! 		{
! 			try
! 			{
! 				ByteArrayOutputStream bOut = new ByteArrayOutputStream();
! 				ObjectOutputStream oOut = new ObjectOutputStream(bOut);
! 				oOut.writeObject(toClone);
! 				oOut.close();
! 				ByteArrayInputStream bIn = new ByteArrayInputStream(bOut.toByteArray());
! 				bOut.close();
! 				ObjectInputStream oIn = new ObjectInputStream(bIn)
! 				{
! 					protected Class resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException
! 					{
! 						return classLoader.loadClass(desc.getName());	 //To change body of overridden methods use File | Settings | File Templates.
! 					}
! 				};
! 				bIn.close();
! 				Object copy = oIn.readObject();
! 				oIn.close();
  
! 				return copy;
! 			}
! 			catch (Exception e)
! 			{
! 				throw new RuntimeException(e);
! 			}
  
! 		}
! 	}
  
  }
--- 31,357 ----
  public class Utilities
  {
!    /** Logger for this class. */
!    private static ILogger s_log =
!       LoggerController.createLogger(Utilities.class);
  
!    /**
!     * Ctor. <TT>private</TT> as all methods are static.
!     */
!    private Utilities()
!    {
!       super();
!    }
  
!    /**
!     * Print the current stack trace to <TT>ps</TT>.
!     *
!     * @param	ps	The <TT>PrintStream</TT> to print stack trace to.
!     *
!     * @throws	IllegalArgumentException	If a null <TT>ps</TT> passed.
!     */
!    public static void printStackTrace(PrintStream ps)
!    {
!       if (ps == null)
!       {
!          throw new IllegalArgumentException("PrintStream == null");
!       }
  
!       try
!       {
!          throw new Exception();
!       }
!       catch (Exception ex)
!       {
!          ps.println(getStackTrace(ex));
!       }
!    }
  
!    /**
!     * Return the stack trace from the passed exception as a string
!     *
!     * @param	th	The exception to retrieve stack trace for.
!     */
!    public static String getStackTrace(Throwable th)
!    {
!       if (th == null)
!       {
!          throw new IllegalArgumentException("Throwable == null");
!       }
  
!       StringWriter sw = new StringWriter();
!       try
!       {
!          PrintWriter pw = new PrintWriter(sw);
!          try
!          {
!             th.printStackTrace(pw);
!             return sw.toString();
!          }
!          finally
!          {
!             pw.close();
!          }
!       }
!       finally
!       {
!          try
!          {
!             sw.close();
!          }
!          catch (IOException ex)
!          {
!             s_log.error("Unexpected error closing StringWriter", ex);
!          }
!       }
!    }
  
!    /**
!     * Change the passed class name to its corresponding file name. E.G.
!     * change &quot;Utilities&quot; to &quot;Utilities.class&quot;.
!     *
!     * @param	name	Class name to be changed.
!     *
!     * @throws	IllegalArgumentException	If a null <TT>name</TT> passed.
!     */
!    public static String changeClassNameToFileName(String name)
!    {
!       if (name == null)
!       {
!          throw new IllegalArgumentException("Class Name == null");
!       }
!       return name.replace('.', '/').concat(".class");
!    }
  
!    /**
!     * Change the passed file name to its corresponding class name. E.G.
!     * change &quot;Utilities.class&quot; to &quot;Utilities&quot;.
!     *
!     * @param	name	Class name to be changed. If this does not represent
!     *					a Java class then <TT>null</TT> is returned.
!     *
!     * @throws IllegalArgumentException	If a null <TT>name</TT> passed.
!     */
!    public static String changeFileNameToClassName(String name)
!    {
!       if (name == null)
!       {
!          throw new IllegalArgumentException("File Name == null");
!       }
!       String className = null;
!       if (name.toLowerCase().endsWith(".class"))
!       {
!          className = name.replace('/', '.');
!          className = className.replace('\\', '.');
!          className = className.substring(0, className.length() - 6);
!       }
!       return className;
!    }
  
!    /**
!     * Clean the passed string. Replace whitespace characters with a single
!     * space. If a <TT>null</TT> string passed return an empty string. E.G.
!     * replace
!     *
!     * [pre]
!     * \t\tselect\t* from\t\ttab01
!     * [/pre]
!     *
!     * with
!     *
!     * [pre]
!     * select * from tab01
!     * [/pre]
!     *
!     * @deprecated	Use <tt>StringUtilities.cleanString(String)</tt> instead.
!     *
!     * @param	str	String to be cleaned.
!     *
!     * @return	Cleaned string.
!     */
!    public static String cleanString(String str)
!    {
!       return StringUtilities.cleanString(str);
!    }
  
!    /**
!     * Return whether the 2 passed strings are equal. This function
!     * allows for <TT>null</TT> strings. If <TT>s1</TT> and <TT>s1</TT> are
!     * both <TT>null</TT> they are considered equal.
!     *
!     * @deprecated	Use <tt>StringUtilities.areStringsEqual(String, String)</tt>
!     *				instead.
!     */
!    public static boolean areStringsEqual(String s1, String s2)
!    {
!       return StringUtilities.areStringsEqual(s1, s2);
!    }
  
!    /**
!     * Return the suffix of the passed file name.
!     *
!     * @param	fileName	File name to retrieve suffix for.
!     *
!     * @return	Suffix for <TT>fileName</TT> or an empty string
!     * 			if unable to get the suffix.
!     *
!     * @throws	IllegalArgumentException	if <TT>null</TT> file name passed.
!     */
!    public static String getFileNameSuffix(String fileName)
!    {
!       if (fileName == null)
!       {
!          throw new IllegalArgumentException("file name == null");
!       }
!       int pos = fileName.lastIndexOf('.');
!       if (pos > 0 && pos < fileName.length() - 1)
!       {
!          return fileName.substring(pos + 1);
!       }
!       return "";
!    }
  
  
!    /**
!     * Remove the suffix from the passed file name.
!     *
!     * @param	fileName	File name to remove suffix from.
!     *
!     * @return	<TT>fileName</TT> without a suffix.
!     *
!     * @throws	IllegalArgumentException	if <TT>null</TT> file name passed.
!     */
!    public static String removeFileNameSuffix(String fileName)
!    {
!       if (fileName == null)
!       {
!          throw new IllegalArgumentException("file name == null");
!       }
!       int pos = fileName.lastIndexOf('.');
!       if (pos > 0 && pos < fileName.length() - 1)
!       {
!          return fileName.substring(0, pos);
!       }
!       return fileName;
!    }
  
!    /**
!     * Return <tt>true</tt> if the passed string is <tt>null</tt> or empty.
!     *
!     * @deprecated	Use <tt>StringUtilities.isEmpty(String)</tt> instead.
!     *
!     * @param	str		String to be tested.
!     *
!     * @return	<tt>true</tt> if the passed string is <tt>null</tt> or empty.
!     */
!    public static boolean isStringEmpty(String str)
!    {
!       return StringUtilities.isEmpty(str);
!    }
  
!    public static String formatSize(long longSize)
!    {
!       return formatSize(longSize, -1);
!    }
  
!    // TODO: i18n
!    public static String formatSize(long longSize, int decimalPos)
!    {
!       NumberFormat fmt = NumberFormat.getNumberInstance();
!       if (decimalPos >= 0)
!       {
!          fmt.setMaximumFractionDigits(decimalPos);
!       }
!       final double size = longSize;
!       double val = size / (1024 * 1024);
!       if (val > 1)
!       {
!          return fmt.format(val).concat(" MB");
!       }
!       val = size / 1024;
!       if (val > 10)
!       {
!          return fmt.format(val).concat(" KB");
!       }
!       return fmt.format(val).concat(" bytes");
!    }
  
!    /**
!     * Split a string based on the given delimiter, but don't remove
!     * empty elements.
!     *
!     * @deprecated	Use <tt>StringUtilities.split(String, char)</tt>
!     *				instead.
!     *
!     * @param	str			The string to be split.
!     * @param	delimiter	Split string based on this delimiter.
!     *
!     * @return	Array of split strings. Guaranteeded to be not null.
!     */
!    public static String[] splitString(String str, char delimiter)
!    {
!       return StringUtilities.split(str, delimiter);
!    }
  
!    /**
!     * Split a string based on the given delimiter, optionally removing
!     * empty elements.
!     *
!     * @deprecated	Use <tt>StringUtilities.split(String, char, boolean)</tt>
!     *				instead.
!     *
!     * @param	str			The string to be split.
!     * @param	delimiter	Split string based on this delimiter.
!     * @param	removeEmpty	If <tt>true</tt> then remove empty elements.
!     *
!     * @return	Array of split strings. Guaranteeded to be not null.
!     */
!    public static String[] splitString(String str, char delimiter,
!                                       boolean removeEmpty)
!    {
!       return StringUtilities.split(str, delimiter, removeEmpty);
!    }
  
!    /**
!     * Creates a clone of any serializable object. Collections and arrays
!     * may be cloned if the entries are serializable.
!     *
!     * Caution super class members are not cloned if a super class is not serializable.
!     */
!    public static Object cloneObject(Object toClone, final ClassLoader classLoader)
!    {
!       if(null == toClone)
!       {
!          return null;
!       }
!       else
!       {
!          try
!          {
!             ByteArrayOutputStream bOut = new ByteArrayOutputStream();
!             ObjectOutputStream oOut = new ObjectOutputStream(bOut);
!             oOut.writeObject(toClone);
!             oOut.close();
!             ByteArrayInputStream bIn = new ByteArrayInputStream(bOut.toByteArray());
!             bOut.close();
!             ObjectInputStream oIn = new ObjectInputStream(bIn)
!             {
!                protected Class resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException
!                {
!                   return classLoader.loadClass(desc.getName());	 //To change body of overridden methods use File | Settings | File Templates.
!                }
!             };
!             bIn.close();
!             Object copy = oIn.readObject();
!             oIn.close();
  
!             return copy;
!          }
!          catch (Exception e)
!          {
!             throw new RuntimeException(e);
!          }
  
!       }
!    }
  
  }