Changeset 245

Timestamp:

Mar 13, 2007, 4:19:22 PM (16 years ago)

Author:

Johan Enell

Message:

added a new method in BASEFileException and caught an exception in the reader

Location:

trunk/se/lu/onk/BaseFile/src/basefile

Files:

• BASEFileException.java (modified) (1 diff)
• BASEFileReader.java (modified) (2 diffs)

trunk/se/lu/onk/BaseFile/src/basefile/BASEFileException.java

@@ -43 +43 @@
     super(e);
   }
+
+  public BASEFileException(String message, Throwable e)
+  {
+    super(message, e);
+  }
 }

trunk/se/lu/onk/BaseFile/src/basefile/BASEFileReader.java

@@ -214 +214 @@
    */
   public String[] readDataRow(int nbr)
-    throws IOException, TooFewFieldsException, TooManyFieldsException
+    throws BASEFileException, TooFewFieldsException, TooManyFieldsException
   {
     String[] vec = new String[nbr];
@@ -223 +223 @@
       throw new TooFewFieldsException("Too few fields in " + section.getType() + ", line " + str.getLineNumber());
     }
-    if (!readLine() || dataEnd) return null;
-
-    int tok = buf.indexOf("\t"), otok = 0;
-
-    while (tok < buf.length())
-    {
-      tok = buf.indexOf("\t", otok);
-      if (tok == -1)
-      {
-        tok = buf.length();
-      }
-      vec[vec.length - nbr] = buf.substring(otok, tok);
-      otok = tok + 1;
-      nbr--;
+    try
+    {
+      if (!readLine() || dataEnd) return null;
+
+      int tok = buf.indexOf("\t"), otok = 0;
+
+      while (tok < buf.length())
+      {
+        tok = buf.indexOf("\t", otok);
+        if (tok == -1)
+        {
+          tok = buf.length();
+        }
+        vec[vec.length - nbr] = buf.substring(otok, tok);
+        otok = tok + 1;
+        nbr--;
+      }
+    }
+    catch (Exception e)
+    {
+      throw new BASEFileException("At line " + str.getLineNumber(), e);
     }