Added text to the exceptions for FloatList and IntList

pvrs12 · pvrs12 · commit 66082fe8ca2b · 2015-01-21T15:26:46.000-05:00
Fixed formatting of IntList
diff --git a/core/src/processing/data/FloatList.java b/core/src/processing/data/FloatList.java
@@ -423,6 +423,10 @@ public boolean hasValue(float value) {
   }
 
 
+  private String exceptionText(int count, int index, String method){
+    return "The list size is "+count+". Trying to "+method+" the element at "+index+" which does not exist.";
+  }
+
   /**
    * @webref floatlist:method
    * @brief Add to a value
@@ -431,7 +435,7 @@ public void add(int index, float amount) {
     if (index < count) {
       data[index] += amount;
     } else {
-      throw new IndexOutOfBoundsException();
+      throw new ArrayIndexOutOfBoundsException(exceptionText(count, index, "add"));
     }
   }
 
@@ -444,7 +448,7 @@ public void sub(int index, float amount) {
     if (index < count) {
       data[index] -= amount;
     } else {
-      throw new IndexOutOfBoundsException();
+      throw new ArrayIndexOutOfBoundsException(exceptionText(count, index, "sub"));
     }
   }
 
@@ -457,7 +461,7 @@ public void mult(int index, float amount) {
     if (index < count) {
       data[index] *= amount;
     } else {
-      throw new IndexOutOfBoundsException();
+      throw new ArrayIndexOutOfBoundsException(exceptionText(count, index, "mult"));
     }
   }
 
@@ -470,7 +474,7 @@ public void div(int index, float amount) {
     if (index < count) {
       data[index] /= amount;
     } else {
-      throw new IndexOutOfBoundsException();
+      throw new ArrayIndexOutOfBoundsException(exceptionText(count, index, "div"));
     }
   }
 
diff --git a/core/src/processing/data/IntList.java b/core/src/processing/data/IntList.java
@@ -407,52 +407,56 @@ public void increment(int index) {
     data[index]++;
   }
 
+  private String exceptionText(int count, int index, String method){
+    return "The list size is "+count+". Trying to "+method+" the element at "+index+" which does not exist.";
+  }
+
   /**
    * @webref intlist:method
    * @brief Add to a value
    */
   public void add(int index, int amount) {
-    if( index  < count) {
-	  data[index] += amount;
+    if (index < count) {
+      data[index] += amount;
     } else {
-	  throw new IndexOutOfBoundsException();
-	}
+      throw new IndexOutOfBoundsException(exceptionText(count, index, "add"));
+    }
   }
 
   /**
    * @webref intlist:method
    * @brief Subtract from a value
    */
   public void sub(int index, int amount) {
-    if( index  < count) {
-	  data[index] -= amount;
+    if (index < count) {
+      data[index] -= amount;
     } else {
-	  throw new IndexOutOfBoundsException();
-	}
+      throw new IndexOutOfBoundsException(exceptionText(count, index, "sub"));
+    }
   }
 
   /**
    * @webref intlist:method
    * @brief Multiply a value
    */
   public void mult(int index, int amount) {
-    if( index  < count) {
-	  data[index] *= amount;
+    if (index < count) {
+      data[index] *= amount;
     } else {
-	  throw new IndexOutOfBoundsException();
-	}
+      throw new IndexOutOfBoundsException(exceptionText(count, index, "mult"));
+    }
   }
 
   /**
    * @webref intlist:method
    * @brief Divide a value
    */
   public void div(int index, int amount) {
-    if( index  < count) {
-	  data[index] /= amount;
+    if (index < count) {
+      data[index] /= amount;
     } else {
-	  throw new IndexOutOfBoundsException();
-	}
+      throw new IndexOutOfBoundsException(exceptionText(count, index, "div"));
+    }
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,10 @@ public boolean hasValue(float value) {`
`423`	`423`	`}`
`424`	`424`
`425`	`425`
	`426`	`+ private String exceptionText(int count, int index, String method){`
	`427`	`+ return "The list size is "+count+". Trying to "+method+" the element at "+index+" which does not exist.";`
	`428`	`+ }`
	`429`	`+`
`426`	`430`	`/**`
`427`	`431`	`* @webref floatlist:method`
`428`	`432`	`* @brief Add to a value`
`@@ -431,7 +435,7 @@ public void add(int index, float amount) {`
`431`	`435`	`if (index < count) {`
`432`	`436`	`data[index] += amount;`
`433`	`437`	`} else {`
`434`		`- throw new IndexOutOfBoundsException();`
	`438`	`+ throw new ArrayIndexOutOfBoundsException(exceptionText(count, index, "add"));`
`435`	`439`	`}`
`436`	`440`	`}`
`437`	`441`
`@@ -444,7 +448,7 @@ public void sub(int index, float amount) {`
`444`	`448`	`if (index < count) {`
`445`	`449`	`data[index] -= amount;`
`446`	`450`	`} else {`
`447`		`- throw new IndexOutOfBoundsException();`
	`451`	`+ throw new ArrayIndexOutOfBoundsException(exceptionText(count, index, "sub"));`
`448`	`452`	`}`
`449`	`453`	`}`
`450`	`454`
`@@ -457,7 +461,7 @@ public void mult(int index, float amount) {`
`457`	`461`	`if (index < count) {`
`458`	`462`	`data[index] *= amount;`
`459`	`463`	`} else {`
`460`		`- throw new IndexOutOfBoundsException();`
	`464`	`+ throw new ArrayIndexOutOfBoundsException(exceptionText(count, index, "mult"));`
`461`	`465`	`}`
`462`	`466`	`}`
`463`	`467`
`@@ -470,7 +474,7 @@ public void div(int index, float amount) {`
`470`	`474`	`if (index < count) {`
`471`	`475`	`data[index] /= amount;`
`472`	`476`	`} else {`
`473`		`- throw new IndexOutOfBoundsException();`
	`477`	`+ throw new ArrayIndexOutOfBoundsException(exceptionText(count, index, "div"));`
`474`	`478`	`}`
`475`	`479`	`}`
`476`	`480`