[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[4548] VASSAL-src/trunk/src/VASSAL/tools/imports/ adc2

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

Revision: 4548
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4548&view=rev
Author:   uckelman
Date:     2008-11-26 21:47:06 +0000 (Wed, 26 Nov 2008)

Log Message:
-----------
Partial merge of swampwallaby-work 4509, 4526.
* Fixed Bug 2301594: LoadExtensionException trying to open an Extension  
* Also improved error checking and messages when opening/importing files
* Refactor Metadata

Modified Paths:
--------------
    VASSAL-src/trunk/src/VASSAL/tools/imports/adc2/ADC2Module.java
    VASSAL-src/trunk/src/VASSAL/tools/imports/adc2/MapBoard.java
    VASSAL-src/trunk/src/VASSAL/tools/imports/adc2/SymbolSet.java

Modified: VASSAL-src/trunk/src/VASSAL/tools/imports/adc2/ADC2Module.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/tools/imports/adc2/ADC2Module.java	2008-11-26 19:53:39 UTC (rev 4547)
+++ VASSAL-src/trunk/src/VASSAL/tools/imports/adc2/ADC2Module.java	2008-11-26 21:47:06 UTC (rev 4548)
@@ -2876,10 +2876,16 @@
 
   @Override
   public boolean isValidImportFile(File f) throws IOException {
-    DataInputStream in = new DataInputStream(new FileInputStream(f));
-    int header = in.readByte();
-    boolean valid = header == -3 || header == -2;
-    in.close();
-    return valid;
+    DataInputStream in = null;
+    try { 
+      in = new DataInputStream(new FileInputStream(f));
+      int header = in.readByte();
+      boolean valid = header == -3 || header == -2;
+      in.close();
+      return valid;
+    }
+    finally {
+      IOUtils.closeQuietly(in);
+    }
   }
 }

Modified: VASSAL-src/trunk/src/VASSAL/tools/imports/adc2/MapBoard.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/tools/imports/adc2/MapBoard.java	2008-11-26 19:53:39 UTC (rev 4547)
+++ VASSAL-src/trunk/src/VASSAL/tools/imports/adc2/MapBoard.java	2008-11-26 21:47:06 UTC (rev 4548)
@@ -3085,9 +3085,15 @@
 
   @Override
   public boolean isValidImportFile(File f) throws IOException {
-    DataInputStream in = new DataInputStream(new FileInputStream(f));
-    boolean valid = in.readByte() == -3;
-    in.close();
-    return valid;
+    DataInputStream in = null;
+    try {
+      in = new DataInputStream(new FileInputStream(f));
+      boolean valid = in.readByte() == -3;
+      in.close();
+      return valid;
+    }
+    finally {
+      IOUtils.closeQuietly(in);
+    }
   }
 }

Modified: VASSAL-src/trunk/src/VASSAL/tools/imports/adc2/SymbolSet.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/tools/imports/adc2/SymbolSet.java	2008-11-26 19:53:39 UTC (rev 4547)
+++ VASSAL-src/trunk/src/VASSAL/tools/imports/adc2/SymbolSet.java	2008-11-26 21:47:06 UTC (rev 4548)
@@ -640,9 +640,15 @@
 
   @Override
   public boolean isValidImportFile(File f) throws IOException {
-    DataInputStream in = new DataInputStream(new FileInputStream(f));
-    boolean valid = in.readUnsignedByte() >= 0xFA;
-    in.close();
-    return valid;
+    DataInputStream in = null;
+    try {
+      in = new DataInputStream(new FileInputStream(f));
+      boolean valid = in.readUnsignedByte() >= 0xFA;
+      in.close();
+      return valid;
+    }
+    finally {
+      IOUtils.closeQuietly(in);
+    }
   }
 }


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

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
vassalengine-svn mailing list
vas...@li...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn