[jetrix-cvs] SF.net SVN: jetrix:[755] jetrix/trunk/src/java/net/jetrix

[<sm...@us...>]

Revision: 755
          http://jetrix.svn.sourceforge.net/jetrix/?rev=755&view=rev
Author:   smanux
Date:     2008-09-02 07:28:18 +0000 (Tue, 02 Sep 2008)

Log Message:
-----------
Improved error reporting

Modified Paths:
--------------
    jetrix/trunk/src/java/net/jetrix/LogManager.java
    jetrix/trunk/src/java/net/jetrix/winlist/SimpleWinlist.java
    jetrix/trunk/src/java/net/jetrix/winlist/TetrixWinlist.java
    jetrix/trunk/src/java/net/jetrix/winlist/WinlistManager.java

Modified: jetrix/trunk/src/java/net/jetrix/LogManager.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/LogManager.java	2008-09-02 07:26:19 UTC (rev 754)
+++ jetrix/trunk/src/java/net/jetrix/LogManager.java	2008-09-02 07:28:18 UTC (rev 755)
@@ -71,7 +71,7 @@
         }
         catch (IOException e)
         {
-            log.log(Level.WARNING, e.getMessage(), e);
+            log.log(Level.WARNING, "Unable to configure the logger", e);
         }
     }
 

Modified: jetrix/trunk/src/java/net/jetrix/winlist/SimpleWinlist.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/winlist/SimpleWinlist.java	2008-09-02 07:26:19 UTC (rev 754)
+++ jetrix/trunk/src/java/net/jetrix/winlist/SimpleWinlist.java	2008-09-02 07:28:18 UTC (rev 755)
@@ -248,21 +248,11 @@
                 }
                 catch (Exception e)
                 {
-                    log.log(Level.WARNING, e.getMessage(), e);
+                    log.log(Level.WARNING, "Unable to read the winlist file " + file, e);
                 }
                 finally
                 {
-                    try
-                    {
-                        if (reader != null)
-                        {
-                            reader.close();
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        log.log(Level.WARNING, e.getMessage(), e);
-                    }
+                    close(reader);
                 }
             }
         }
@@ -278,9 +268,10 @@
         if (id != null)
         {
             BufferedWriter writer = null;
+            File file = new File(id + ".winlist");
             try
             {
-                writer = new BufferedWriter(new FileWriter(id + ".winlist"));
+                writer = new BufferedWriter(new FileWriter(file));
 
                 for (Score score : scores)
                 {
@@ -297,21 +288,11 @@
             }
             catch (Exception e)
             {
-                log.log(Level.WARNING, e.getMessage(), e);
+                log.log(Level.WARNING, "Unable to write the winlist file " + file, e);
             }
             finally
             {
-                try
-                {
-                    if (writer != null)
-                    {
-                        writer.close();
-                    }
-                }
-                catch (Exception e)
-                {
-                    log.log(Level.WARNING, e.getMessage(), e);
-                }
+                close(writer);
             }
         }
     }
@@ -338,4 +319,21 @@
         return message;
     }
 
+    /**
+     * Close quietly the specified stream or reader.
+     */
+    void close(Closeable closeable)
+    {
+        if (closeable != null)
+        {
+            try
+            {
+                closeable.close();
+            }
+            catch (IOException e)
+            {
+            }
+        }
+    }
+
 }

Modified: jetrix/trunk/src/java/net/jetrix/winlist/TetrixWinlist.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/winlist/TetrixWinlist.java	2008-09-02 07:26:19 UTC (rev 754)
+++ jetrix/trunk/src/java/net/jetrix/winlist/TetrixWinlist.java	2008-09-02 07:28:18 UTC (rev 755)
@@ -55,9 +55,11 @@
 
         if (file.exists())
         {
+            InputStream in = null;
+
             try
             {
-                InputStream in = new BufferedInputStream(new FileInputStream(file));
+                in = new BufferedInputStream(new FileInputStream(file));
 
                 scoreCount = Math.max(scoreCount,  file.length() / STRUCT_SIZE);
                 byte[] struct = new byte[STRUCT_SIZE];
@@ -68,13 +70,15 @@
                     if (score == null) break;
                     scores.add(score);
                 }
-
-                in.close();
             }
             catch (IOException e)
             {
-                log.log(Level.WARNING, e.getMessage(), e);
+                log.log(Level.WARNING, "Unable to read the winlist file " + file, e);
             }
+            finally
+            {
+                close(in);
+            }
         }
 
         initialized = true;
@@ -83,10 +87,11 @@
     protected void save()
     {
         File file = new File(filename);
+        OutputStream out = null;
 
         try
         {
-            OutputStream out = new BufferedOutputStream(new FileOutputStream(file));
+            out = new BufferedOutputStream(new FileOutputStream(file));
 
             for (int i = 0; i < scoreCount; i++)
             {
@@ -101,12 +106,15 @@
             }
 
             out.flush();
-            out.close();
         }
         catch (IOException e)
         {
-            log.log(Level.WARNING, e.getMessage(), e);
+            log.log(Level.WARNING, "Unable to write the winlist file " + file, e);
         }
+        finally
+        {
+            close(out);
+        }
     }
 
     /**

Modified: jetrix/trunk/src/java/net/jetrix/winlist/WinlistManager.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/winlist/WinlistManager.java	2008-09-02 07:26:19 UTC (rev 754)
+++ jetrix/trunk/src/java/net/jetrix/winlist/WinlistManager.java	2008-09-02 07:28:18 UTC (rev 755)
@@ -80,7 +80,7 @@
             }
             catch (Exception e)
             {
-                log.log(Level.WARNING, e.getMessage(), e);
+                log.log(Level.WARNING, "Unable to create the winlist '" + config.getName() + "'", e);
             }
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.