[vassalengine-svn] SF.net SVN: vassalengine: [2773] VASSAL-src/branches/uckelman-caching/src/ VASSAL

[<uck...@us...>]

Revision: 2773
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=2773&view=rev
Author:   uckelman
Date:     2007-12-28 14:10:38 -0800 (Fri, 28 Dec 2007)

Log Message:
-----------
Properly close Readers and Writers.

Modified Paths:
--------------
    VASSAL-src/branches/uckelman-caching/src/VASSAL/build/module/dice/BonesDiceServer.java
    VASSAL-src/branches/uckelman-caching/src/VASSAL/chat/node/Server.java
    VASSAL-src/branches/uckelman-caching/src/VASSAL/counters/Deck.java
    VASSAL-src/branches/uckelman-caching/src/VASSAL/launch/EditModuleAction.java

Modified: VASSAL-src/branches/uckelman-caching/src/VASSAL/build/module/dice/BonesDiceServer.java
===================================================================
--- VASSAL-src/branches/uckelman-caching/src/VASSAL/build/module/dice/BonesDiceServer.java	2007-12-28 21:40:21 UTC (rev 2772)
+++ VASSAL-src/branches/uckelman-caching/src/VASSAL/build/module/dice/BonesDiceServer.java	2007-12-28 22:10:38 UTC (rev 2773)
@@ -118,7 +118,7 @@
     }
     finally {
       try {
-        if (in != null) in.close();
+        in.close();
       }
       catch (IOException e) {
         e.printStackTrace();

Modified: VASSAL-src/branches/uckelman-caching/src/VASSAL/chat/node/Server.java
===================================================================
--- VASSAL-src/branches/uckelman-caching/src/VASSAL/chat/node/Server.java	2007-12-28 21:40:21 UTC (rev 2772)
+++ VASSAL-src/branches/uckelman-caching/src/VASSAL/chat/node/Server.java	2007-12-28 22:10:38 UTC (rev 2773)
@@ -82,45 +82,57 @@
       });
       handler.start();
       handler.writeLine(Protocol.encodeRegisterCommand("rk", "test/Main Room", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-      BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
-      String line;
-      while ((line = reader.readLine()) != null) {
-        if (line.startsWith("JOIN")) { //$NON-NLS-1$
-          String room = line.substring("JOIN".length()).trim(); //$NON-NLS-1$
-          handler.writeLine(Protocol.encodeJoinCommand("test/" + room)); //$NON-NLS-1$
-        }
-        else if (line.startsWith("BYE")) { //$NON-NLS-1$
-          handler.close();
-        }
-        else if (line.startsWith("HELLO")) { //$NON-NLS-1$
-          soc = new Socket("localHost", port); //$NON-NLS-1$
-          handler = new BufferedSocketHandler(soc, new SocketWatcher() {
-            public void handleMessage(String msg) {
-              System.err.println(msg);
-            }
 
-            public void socketClosed(SocketHandler handler) {
+      final BufferedReader reader =
+        new BufferedReader(new InputStreamReader(System.in));
+      try {
+        String line;
+        while ((line = reader.readLine()) != null) {
+          if (line.startsWith("JOIN")) { //$NON-NLS-1$
+            final String room = line.substring("JOIN".length()).trim(); //$NON-NLS-1$
+            handler.writeLine(Protocol.encodeJoinCommand("test/" + room)); //$NON-NLS-1$
+          }
+          else if (line.startsWith("BYE")) { //$NON-NLS-1$
+            handler.close();
+          }
+          else if (line.startsWith("HELLO")) { //$NON-NLS-1$
+            soc = new Socket("localHost", port); //$NON-NLS-1$
+            handler = new BufferedSocketHandler(soc, new SocketWatcher() {
+              public void handleMessage(String msg) {
+                System.err.println(msg);
+              }
+  
+              public void socketClosed(SocketHandler handler) {
+              }
+            });
+            handler.start();
+            handler.writeLine(Protocol.encodeRegisterCommand("rk", "test/Main Room", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+          }
+          else if (line.startsWith("*")) { //$NON-NLS-1$
+            int length = Integer.parseInt(line.substring(1));
+            final StringBuilder buffer = new StringBuilder();
+            for (int i=0;i<length;++i) {
+              char c = (char) ('a' + i%10);
+              if (c == 'a') {
+                c = 'A';
+              }
+              buffer.append(c);
             }
-          });
-          handler.start();
-          handler.writeLine(Protocol.encodeRegisterCommand("rk", "test/Main Room", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        }
-        else if (line.startsWith("*")) { //$NON-NLS-1$
-          int length = Integer.parseInt(line.substring(1));
-          final StringBuilder buffer = new StringBuilder();
-          for (int i=0;i<length;++i) {
-            char c = (char) ('a' + i%10);
-            if (c == 'a') {
-              c = 'A';
-            }
-            buffer.append(c);
+            String msg = Protocol.encodeForwardCommand("test/*",buffer.toString()); //$NON-NLS-1$
+            handler.writeLine(msg);
           }
-          String msg = Protocol.encodeForwardCommand("test/*",buffer.toString()); //$NON-NLS-1$
-          handler.writeLine(msg);
+          else {
+            handler.writeLine(line);
+          }
         }
-        else {
-          handler.writeLine(line);
+      }
+      finally {
+        try {
+          reader.close();
         }
+        catch (IOException e) {
+          e.printStackTrace();
+        }
       }
     }
   }

Modified: VASSAL-src/branches/uckelman-caching/src/VASSAL/counters/Deck.java
===================================================================
--- VASSAL-src/branches/uckelman-caching/src/VASSAL/counters/Deck.java	2007-12-28 21:40:21 UTC (rev 2772)
+++ VASSAL-src/branches/uckelman-caching/src/VASSAL/counters/Deck.java	2007-12-28 22:10:38 UTC (rev 2773)
@@ -1196,16 +1196,25 @@
   public void saveDeck(File f) throws IOException {
     Command comm = new LoadDeckCommand(null);
 
-    FileWriter dest = new FileWriter(f);
-    for (Enumeration<GamePiece> e = getPieces(); e.hasMoreElements();) {
-      GamePiece p = e.nextElement();
-      p.setMap(null);
-      comm = comm.append(new AddPiece(p));
+    final FileWriter dest = new FileWriter(f);
+    try {
+      for (Enumeration<GamePiece> e = getPieces(); e.hasMoreElements();) {
+        final GamePiece p = e.nextElement();
+        p.setMap(null);
+        comm = comm.append(new AddPiece(p));
+      }
+      GameModule.getGameModule().addCommandEncoder(commandEncoder);
+      dest.write(GameModule.getGameModule().encode(comm));
+      GameModule.getGameModule().removeCommandEncoder(commandEncoder);
     }
-    GameModule.getGameModule().addCommandEncoder(commandEncoder);
-    dest.write(GameModule.getGameModule().encode(comm));
-    GameModule.getGameModule().removeCommandEncoder(commandEncoder);
-    dest.close();
+    finally {
+      try {
+        dest.close();
+      }
+      catch (IOException e) {
+        e.printStackTrace();
+      }
+    }
   }
 
   private File getLoadFileName() {
@@ -1237,14 +1246,24 @@
   }
 
   public Command loadDeck(File f) throws IOException {
-    FileReader src = new FileReader(f);
-    char[] data = new char[10000];
     final StringBuilder buffer = new StringBuilder();
-    int len;
-    while ((len = src.read(data)) > 0) {
-      buffer.append(data, 0, len);
+    final FileReader src = new FileReader(f);
+    try {
+      final char[] data = new char[10000];
+      int len;
+      while ((len = src.read(data)) > 0) {
+        buffer.append(data, 0, len);
+      }
     }
-    src.close();
+    finally {
+      try {
+        src.close();
+      }
+      catch (IOException e) {
+        e.printStackTrace();
+      }
+    }
+
     GameModule.getGameModule().addCommandEncoder(commandEncoder);
     Command c = GameModule.getGameModule().decode(buffer.toString());
     GameModule.getGameModule().removeCommandEncoder(commandEncoder);

Modified: VASSAL-src/branches/uckelman-caching/src/VASSAL/launch/EditModuleAction.java
===================================================================
--- VASSAL-src/branches/uckelman-caching/src/VASSAL/launch/EditModuleAction.java	2007-12-28 21:40:21 UTC (rev 2772)
+++ VASSAL-src/branches/uckelman-caching/src/VASSAL/launch/EditModuleAction.java	2007-12-28 22:10:38 UTC (rev 2773)
@@ -39,6 +39,4 @@
     GameModule.getGameModule().getFrame().setVisible(true);
     new VASSAL.configure.ModuleEditWindow().setVisible(true);
   }
-  
-  
 }


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