merged 1.1 branch into head

[mir.git] / source / tool / BundleTool.java

diff --git a/source/tool/BundleTool.java b/source/tool/BundleTool.java
index 0b007d4..d8dcf9f 100755 (executable)
--- a/source/tool/BundleTool.java
+++ b/source/tool/BundleTool.java
@@ -40,7 +40,7 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import mir.util.ExceptionFunctions;
+import mir.util.ExceptionRoutines;
 import mir.util.PropertiesManipulator;
 
 public class BundleTool {
@@ -48,7 +48,6 @@ public class BundleTool {
   public static void compare(String aMaster, String aSlave) {
     PropertiesManipulator master;
     PropertiesManipulator slave;
-    PropertiesManipulator result;
 
     try {
       master = PropertiesManipulator.readProperties(
@@ -223,7 +222,7 @@ public class BundleTool {
           new FileInputStream(new File(aSourceFile)),8192), anEncoding);
     }
     catch (Throwable t) {
-      Throwable s = ExceptionFunctions.traceCauseException(t);
+      Throwable s = ExceptionRoutines.traceCauseException(t);
 
       System.out.println("Unable to read sourcefile: " + s.toString());
       return;