From c02983ea26c472de7a90056ba024bdb6a7aa0a02 Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Tue, 11 Jun 2013 10:30:59 +0000
Subject: [PATCH] Small code tidies.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6901 bbc10eb1-c90d-0410-af57-cb519fbb1720
---
 prism/src/explicit/DTMCSimple.java | 4 +++-
 prism/src/explicit/MDPSimple.java  | 4 +++-
 prism/src/explicit/MDPSparse.java  | 4 +++-
 prism/src/explicit/Model.java      | 5 +++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/prism/src/explicit/DTMCSimple.java b/prism/src/explicit/DTMCSimple.java
index ec92d2b2..3d5ecd89 100644
--- a/prism/src/explicit/DTMCSimple.java
+++ b/prism/src/explicit/DTMCSimple.java
@@ -145,8 +145,10 @@ public class DTMCSimple extends DTMCExplicit implements ModelSimple
 			// Parse first line to get num states
 			s = in.readLine();
 			lineNum = 1;
-			if (s == null)
+			if (s == null) {
+				in.close();
 				throw new PrismException("Missing first line of .tra file");
+			}
 			ss = s.split(" ");
 			n = Integer.parseInt(ss[0]);
 			// Initialise
diff --git a/prism/src/explicit/MDPSimple.java b/prism/src/explicit/MDPSimple.java
index 8531cb75..de3d8667 100644
--- a/prism/src/explicit/MDPSimple.java
+++ b/prism/src/explicit/MDPSimple.java
@@ -283,8 +283,10 @@ public class MDPSimple extends MDPExplicit implements ModelSimple
 			// Parse first line to get num states
 			s = in.readLine();
 			lineNum = 1;
-			if (s == null)
+			if (s == null) {
+				in.close();
 				throw new PrismException("Missing first line of .tra file");
+			}
 			ss = s.split(" ");
 			n = Integer.parseInt(ss[0]);
 			// Initialise
diff --git a/prism/src/explicit/MDPSparse.java b/prism/src/explicit/MDPSparse.java
index e6278dc7..315ae1cd 100644
--- a/prism/src/explicit/MDPSparse.java
+++ b/prism/src/explicit/MDPSparse.java
@@ -304,8 +304,10 @@ public class MDPSparse extends MDPExplicit
 			// Parse first line to get num states
 			s = in.readLine();
 			lineNum = 1;
-			if (s == null)
+			if (s == null) {
+				in.close();
 				throw new PrismException("Missing first line of .tra file");
+			}
 			ss = s.split(" ");
 			n = Integer.parseInt(ss[0]);
 			// Initialise
diff --git a/prism/src/explicit/Model.java b/prism/src/explicit/Model.java
index bc713171..d5e8f565 100644
--- a/prism/src/explicit/Model.java
+++ b/prism/src/explicit/Model.java
@@ -27,8 +27,9 @@
 package explicit;
 
 import java.io.File;
-import java.util.*;
-import java.util.Map.Entry;
+import java.util.BitSet;
+import java.util.Iterator;
+import java.util.List;
 
 import parser.State;
 import parser.Values;