8 files changed, 38 insertions, 16 deletions

diff --git a/instance-calculator/src/Main.java b/instance-calculator/src/Main.java
index 6fc950f..b66a63b 100644
--- a/instance-calculator/src/Main.java
+++ b/instance-calculator/src/Main.java
@@ -1,7 +1,9 @@
-/* FIXME: Finer imports */
-import java.util.*;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Deque;
 
-import java.io.*;
+import java.io.FileWriter;
 
 public class Main
 {
diff --git a/instance-calculator/src/ModelFile.java b/instance-calculator/src/ModelFile.java
index 1f9297e..be84674 100644
--- a/instance-calculator/src/ModelFile.java
+++ b/instance-calculator/src/ModelFile.java
@@ -1,4 +1,5 @@
-import java.io.*;
+import java.io.IOException;
+import java.io.FileNotFoundException;
 
 public class ModelFile
 {
diff --git a/instance-calculator/src/QuickParser.java b/instance-calculator/src/QuickParser.java
index 47cea27..383373e 100644
--- a/instance-calculator/src/QuickParser.java
+++ b/instance-calculator/src/QuickParser.java
@@ -1,7 +1,11 @@
-/* FIXME: Finer imports */
-import java.io.*;
-import java.util.regex.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.FileNotFoundException;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class QuickParser
 {
diff --git a/instance-calculator/src/VHDLArchitecture.java b/instance-calculator/src/VHDLArchitecture.java
index 407a09f..a3aa7ac 100644
--- a/instance-calculator/src/VHDLArchitecture.java
+++ b/instance-calculator/src/VHDLArchitecture.java
@@ -1,4 +1,9 @@
-import java.util.*;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.Map;
+import java.util.HashMap;
 
 public class VHDLArchitecture
 {
diff --git a/instance-calculator/src/VHDLComponent.java b/instance-calculator/src/VHDLComponent.java
index 958a2e4..76b1dc9 100644
--- a/instance-calculator/src/VHDLComponent.java
+++ b/instance-calculator/src/VHDLComponent.java
@@ -1,4 +1,7 @@
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.HashMap;
 
 public class VHDLComponent
 {
diff --git a/instance-calculator/src/VHDLEntity.java b/instance-calculator/src/VHDLEntity.java
index 2765229..d2a8e07 100644
--- a/instance-calculator/src/VHDLEntity.java
+++ b/instance-calculator/src/VHDLEntity.java
@@ -1,5 +1,7 @@
-import java.util.*;
-import java.io.BufferedWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.HashMap;
 
 public class VHDLEntity
 {
diff --git a/instance-calculator/src/VHDLProcess.java b/instance-calculator/src/VHDLProcess.java
index ff5d32c..a4f150e 100644
--- a/instance-calculator/src/VHDLProcess.java
+++ b/instance-calculator/src/VHDLProcess.java
@@ -1,5 +1,8 @@
-import java.util.*;
-import java.io.BufferedWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
 
 public class VHDLProcess
 {
diff --git a/instance-calculator/src/VHDLWaveform.java b/instance-calculator/src/VHDLWaveform.java
index 89cf945..feb1e51 100644
--- a/instance-calculator/src/VHDLWaveform.java
+++ b/instance-calculator/src/VHDLWaveform.java
@@ -1,5 +1,7 @@
-import java.util.*;
-import java.io.BufferedWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.HashMap;
 
 public class VHDLWaveform
 {