Changeset 3593 for trunk/gsdl3/src/java/org/greenstone/gsdl3/selfContained/IncrementRange.java

Timestamp:

2002-11-30T15:07:07+13:00 (22 years ago)

Author:

say1

Message:

more comments and error handling

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/selfContained/IncrementRange.java (modified) (4 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/selfContained/IncrementRange.java

@@ -42 +42 @@
   implements Cloneable, Serializable
 {
- /**
+  /**
    * Create an IncrementRange which counts between first and last inclusive
    * 
@@ -83 +83 @@
    * Increment a stream of characters, reading from the reader and writing the incremented characters to the writer
    * 
-   * @exception java.io.Exception if any of the characters in the string are outside the range of first-last
+   * @exception java.io.Error if any of the characters in the string are outside the range of first-last
    * @param str the string to be incremented
    * @return the incremented string
    * @see Increment
    */
-  long incrementStream(Reader rdr, Writer wtr)
-    throws Exception {
-    long count = 0; // the return value
+  long incrementStream(Reader rdr, Writer wtr) {
+    try {
+      long count = 0; // the return value
     
-    int i = rdr.read();
-    boolean carry = true;
+      int i = rdr.read();
+      boolean carry = true;
     
-    while (i != -1) {
-      char c = (char) i;
+      while (i != -1) {
+    char c = (char) i;
       
-      // check the validity of the character we're about to increment
-      if (c < first || c > last) 
-    throw new Exception("Character '" + c + "' is ouside range");
+    // check the validity of the character we're about to increment
+    if (c < first || c > last) 
+      throw new Error("Character '" + c + "' is ouside range");
       
-      if (c == last) {
-    if (carry == true) {
-      wtr.write(first);
-      carry = true;
+    if (c == last) {
+      if (carry == true) {
+        wtr.write(first);
+        carry = true;
+      } else {
+        wtr.write(c);
+        carry = false;
+      }
     } else {
-      wtr.write(c);
-      carry = false;
+      if (carry == true) {
+        wtr.write(++c);
+        carry = false;
+      } else {
+        wtr.write(c);
+        carry = false;
+      } 
     }
-      } else {
-    if (carry == true) {
-      wtr.write(++c);
-      carry = false;
-    } else {
-      wtr.write(c);
-      carry = false;
-    } 
-      }
-      count++;
-
-      // read the next character
-      i = rdr.read();
-    }
-    if (carry == true) {
-      wtr.write(first);
-      count++;
-    }
-    return count;
+    count++;
+
+    // read the next character
+    i = rdr.read();
+      }
+      if (carry == true) {
+    wtr.write(first);
+    count++;
+      }
+      return count;
+    } catch (IOException e) {
+      System.err.println("IOException in incrementStream()");
+      throw new Error(e.toString());
+    }
   }
 
@@ -134 +138 @@
    * Increment a string of characters
    * 
-   * @exception java.io.Exception if any of the characters in the string are outside the range of first-last
+   * @exception java.lang.Error if any of the characters in the string are outside the range of first-last
    * @param str the string to be incremented
    * @return the incremented string
    * @see Increment
    */
-  public final String incrementString(String str) 
-    throws Exception {
+  public final String incrementString(String str)  {
     StringBuffer buffer = new StringBuffer();
     if (str == "") {
@@ -150 +153 @@
     char c = str.charAt(i);
     if (c < first || c > last) 
-      throw new Exception("Character '" + c + "' is ouside range");
+      throw new Error("Character '" + c + "' is ouside range");
 
     if (c == last) {