6 files changed, 16 insertions, 16 deletions
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java
index d2dd82a..0aa2efe 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java
@@ -357,7 +357,7 @@ public class CLFormatter {
 					throw new IllegalArgumentException(msg);
 				}
 			}
-		} catch (EscapeException eex) {
+		} catch (DirectiveEscape eex) {
 			if (!isToplevel) throw eex;
 		}
 	}
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/EscapeException.java b/clformat/src/main/java/bjc/utils/ioutils/format/DirectiveEscape.java
index 086f1cd..c0908f0 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/EscapeException.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/DirectiveEscape.java
@@ -6,7 +6,7 @@ package bjc.utils.ioutils.format;
  * @author EVE
  *
  */
-public class EscapeException extends RuntimeException {
+public class DirectiveEscape extends RuntimeException {
 	private static final long serialVersionUID = -4552821131068559005L;
 
 	/**
@@ -15,19 +15,19 @@ public class EscapeException extends RuntimeException {
 	public final boolean endIteration;
 
 	/**
-	 * Create a new escape exception.
+	 * Create a new directive escape.
 	 */
-	public EscapeException() {
+	public DirectiveEscape() {
 		endIteration = false;
 	}
 
 	/**
-	 * Create a new escape exception.
+	 * Create a new directive escape.
 	 * 
 	 * @param end
 	 *        Whether or not to end the iteration.
 	 */
-	public EscapeException(boolean end) {
+	public DirectiveEscape(boolean end) {
 		endIteration = end;
 	}
 }
 \ No newline at end of file
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java
index a1ed7a8..099c793 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java
@@ -237,7 +237,7 @@ class ConditionalEdict implements Edict {
 				throw new IllegalArgumentException("INTERNAL ERROR: ConditionalEdict mode " + condMode
 						+ " is not supported. This is a bug.");
 			}
-		} catch (EscapeException eex) {
+		} catch (DirectiveEscape eex) {
 			// Conditionals are transparent to iteration-escapes
 			throw eex;
 		}
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java
index e8e4eb8..5191c1a 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java
@@ -132,7 +132,7 @@ class EscapeEdict implements Edict {
 		}
 
 		if (shouldExit) {
-			throw new EscapeException(terminateIteration);
+			throw new DirectiveEscape(terminateIteration);
 		}
 	}
 }
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java
index 995acc8..cdf047b 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java
@@ -141,7 +141,7 @@ class IterationEdict implements Edict {
 						} else {
 							body.format(formCTX.writer, nParams);
 						}
-					} catch (EscapeException eex) {
+					} catch (DirectiveEscape eex) {
 						if (eex.endIteration) {
 							if (formCTX.items.atEnd()) {
 								throw eex;
@@ -152,7 +152,7 @@ class IterationEdict implements Edict {
 					formCTX.items.right();
 					iter = formCTX.items.item();
 				} while (formCTX.items.position() < formCTX.items.size());
-			} catch (EscapeException eex) {
+			} catch (DirectiveEscape eex) {
 				// Do nothing
 			}
 			break;
@@ -170,7 +170,7 @@ class IterationEdict implements Edict {
 						body.format(formCTX);
 					}
 				}
-			} catch (EscapeException eex) {
+			} catch (DirectiveEscape eex) {
 				if (eex.endIteration)
 					throw new UnsupportedOperationException("Colon mod not allowed on escape marker without colon mod on iteration");
 			}
@@ -205,11 +205,11 @@ class IterationEdict implements Edict {
 						} else {
 							body.format(formCTX.writer, nParams);
 						}
-					} catch (EscapeException eex) {
+					} catch (DirectiveEscape eex) {
 						if(eex.endIteration && !itr.hasNext()) throw eex;
 					}
 				}
-			} catch (EscapeException eex) {
+			} catch (DirectiveEscape eex) {
 				// Do nothing
 			}
 			break;
@@ -234,7 +234,7 @@ class IterationEdict implements Edict {
 						body.format(formCTX.writer, nParams);
 					}
 				}
-			} catch (EscapeException eex) {
+			} catch (DirectiveEscape eex) {
 				if (eex.endIteration)
 					throw new UnsupportedOperationException("Colon mod not allowed on escape marker without colon mod on iteration");
 			}
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java
index a52a3ba..c7dc200 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java
@@ -45,7 +45,7 @@ class RecursiveEdict implements Edict {
 				String bod = (String)body;
 
 				fmt.doFormatString(bod, formCTX.writer, formCTX.items, true);
-			} catch (EscapeException eex) {
+			} catch (DirectiveEscape eex) {
 				if (eex.endIteration) {
 					throw new UnexpectedColonEscape();
 				}
@@ -75,7 +75,7 @@ class RecursiveEdict implements Edict {
 
 				// :DynamicString
 				fmt.doFormatString(bod, formCTX.writer, newParams, true);
-			} catch (EscapeException eex) {
+			} catch (DirectiveEscape eex) {
 				throw new UnexpectedColonEscape();
 			}
 		}