From 3d3108419b4f585be17b91686b944867838f2f30 Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Mon, 22 Aug 2011 23:04:21 +0000
Subject: [PATCH] Bug fix (again) - to compile on Java 7 (via some import
 tidying/fixes).

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3524 bbc10eb1-c90d-0410-af57-cb519fbb1720
---
 prism/src/userinterface/GUIConstantsPicker.java        | 10 +++++-----
 prism/src/userinterface/GUISimulationPicker.java       |  4 ++--
 .../userinterface/properties/GUIExperimentPicker.java  |  2 +-
 .../userinterface/simulator/GUIInitialStatePicker.java |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/prism/src/userinterface/GUIConstantsPicker.java b/prism/src/userinterface/GUIConstantsPicker.java
index aa6bc71b..0167eaaa 100644
--- a/prism/src/userinterface/GUIConstantsPicker.java
+++ b/prism/src/userinterface/GUIConstantsPicker.java
@@ -40,9 +40,9 @@ import javax.swing.JTable;
 import javax.swing.border.TitledBorder;
 import javax.swing.table.AbstractTableModel;
 
-import parser.*;
-import parser.type.*;
-import prism.*;
+import parser.Values;
+import prism.PrismException;
+import prism.UndefinedConstants;
 
 public class GUIConstantsPicker extends javax.swing.JDialog
 {
@@ -449,10 +449,10 @@ public class GUIConstantsPicker extends javax.swing.JDialog
 	class Constant
 	{
 	String name;
-	Type type;
+	parser.type.Type type;
 	Object value;
 	
-	public Constant(String name, Type type, Object value)
+	public Constant(String name, parser.type.Type type, Object value)
 	{
 		this.name = name;
 		this.type = type;
diff --git a/prism/src/userinterface/GUISimulationPicker.java b/prism/src/userinterface/GUISimulationPicker.java
index d64a19eb..42acfd38 100644
--- a/prism/src/userinterface/GUISimulationPicker.java
+++ b/prism/src/userinterface/GUISimulationPicker.java
@@ -1134,10 +1134,10 @@ public class GUISimulationPicker extends javax.swing.JDialog implements KeyListe
 	class Value
 	{
 		String name;
-		Type type;
+		parser.type.Type type;
 		Object value;
 
-		public Value(String name, Type type, Object value)
+		public Value(String name, parser.type.Type type, Object value)
 		{
 			this.name = name;
 			this.type = type;
diff --git a/prism/src/userinterface/properties/GUIExperimentPicker.java b/prism/src/userinterface/properties/GUIExperimentPicker.java
index c7663764..40da366a 100644
--- a/prism/src/userinterface/properties/GUIExperimentPicker.java
+++ b/prism/src/userinterface/properties/GUIExperimentPicker.java
@@ -498,7 +498,7 @@ public class GUIExperimentPicker extends javax.swing.JDialog
 		static class Rememberance
 		{
 			String varName;
-			Type type;
+			parser.type.Type type;
 			boolean isRange;
 			String singleValue;
 			String start;
diff --git a/prism/src/userinterface/simulator/GUIInitialStatePicker.java b/prism/src/userinterface/simulator/GUIInitialStatePicker.java
index ac22e829..4ff0d12b 100644
--- a/prism/src/userinterface/simulator/GUIInitialStatePicker.java
+++ b/prism/src/userinterface/simulator/GUIInitialStatePicker.java
@@ -415,10 +415,10 @@ public class GUIInitialStatePicker extends javax.swing.JDialog implements KeyLis
 	class Value
 	{
 		String name;
-		Type type;
+		parser.type.Type type;
 		Object value;
             
-		public Value(String name, Type type, Object value)
+		public Value(String name, parser.type.Type type, Object value)
 		{
 			this.name = name;
 			this.type = type;