- general maintenance

[mir.git] / source / mir / util / GeneratorStringFunctions.java

diff --git a/source/mir/util/GeneratorStringFunctions.java b/source/mir/util/GeneratorStringFunctions.java
index 9aed006..66f7533 100755 (executable)
--- a/source/mir/util/GeneratorStringFunctions.java
+++ b/source/mir/util/GeneratorStringFunctions.java
@@ -38,21 +38,6 @@ public class GeneratorStringFunctions {
 
   private GeneratorStringFunctions() {}
 
-  public static int interpretAsInteger(Object aValue) throws GeneratorExc {
-    if (aValue instanceof Integer)
-      return ((Integer) aValue).intValue();
-
-    if (aValue instanceof String)
-      try {
-        return Integer.parseInt((String) aValue);
-      }
-      catch (Throwable t) {
-        throw new GeneratorExc("Integer expected, "+aValue+" found");
-      }
-
-    throw new GeneratorExc("Integer expected, "+aValue+" found");
-  }
-
   public static String interpretAsString(Object aValue) throws GeneratorExc {
     if (aValue instanceof String)
       return (String) aValue;
@@ -74,12 +59,12 @@ public class GeneratorStringFunctions {
 
         if (aParameters.size()==3) {
           return interpretAsString(aParameters.get(0)).substring(
-              interpretAsInteger(aParameters.get(1)),
-              interpretAsInteger(aParameters.get(2)));
+              StringRoutines.interpretAsInteger(aParameters.get(1)),
+              StringRoutines.interpretAsInteger(aParameters.get(2)));
         }
         else {
           return interpretAsString(aParameters.get(0)).substring(
-              interpretAsInteger(aParameters.get(1)));
+              StringRoutines.interpretAsInteger(aParameters.get(1)));
         }
       }
       catch (GeneratorExc e) {