Cleanup

5 files changed, 11 insertions, 11 deletions

diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java
index 1ce662f..d6e918e 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java
@@ -173,9 +173,7 @@ public class CLParameters {
 			return new CLParameters(parameters.toArray(new String[0]));
 
 		Map<String, String>  namedParams  = new HashMap<>();
-		Map<String, Integer> nameIndices = new HashMap<>();
 
-		int currParamNo = 0;
 		for(String param : lParams) {
 			if (param.startsWith("#") && !param.equals("#")) {
 				// Named parameter
@@ -207,7 +205,7 @@ public class CLParameters {
 				parameters.add(parseParam(param, dirParams));
 			}
 
-			currParamNo += 1;
+			//currParamNo += 1;
 		}
 
 		return new CLParameters(parameters.toArray(new String[0]), namedParams);
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 d660248..d245e6a 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
@@ -4,8 +4,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.IllegalFormatConversionException;
 import java.util.List;
-import java.util.logging.Logger;
-
 import bjc.utils.ioutils.format.EscapeException;
 
 /**
@@ -15,8 +13,6 @@ import bjc.utils.ioutils.format.EscapeException;
  *
  */
 public class ConditionalDirective implements Directive {
-	private static Logger LOG = Logger.getLogger(ConditionalDirective.class.getName());
-
 	@Override
 	public void format(FormatParameters dirParams) throws IOException {
 		StringBuffer condBody = new StringBuffer();
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java
index 2fe3903..8790cf2 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java
@@ -2,13 +2,16 @@ package bjc.utils.ioutils.format.directives;
 
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.regex.Pattern;
-
 import bjc.inflexion.InflectionML;
 import bjc.utils.ioutils.ReportWriter;
 
+/**
+ * Inflection directive.
+ * @author bjculkin
+ *
+ */
 public class InflectDirective implements Directive {
-	private static final Pattern wordPattern = Pattern.compile("(\\w+)(\\b*)");
+	//private static final Pattern wordPattern = Pattern.compile("(\\w+)(\\b*)");
 
 	@Override
 	public void format(FormatParameters dirParams) throws IOException {
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 2a702ea..afc1c6b 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
@@ -99,6 +99,7 @@ public class IterationDirective implements Directive {
 					iter = dirParams.tParams.item();
 				} while (dirParams.tParams.position() < dirParams.tParams.size());
 			} catch (EscapeException eex) {
+				// Do nothing
 			}
 		} else if (dirParams.mods.atMod) {
 			try {
@@ -143,6 +144,7 @@ public class IterationDirective implements Directive {
 					}
 				}
 			} catch (EscapeException eex) {
+				// Do nothing
 			}
 		} else {
 			if (!(dirParams.item instanceof Iterable<?>)) {
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 d4dcbb2..c0c752c 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
@@ -31,9 +31,10 @@ public class RecursiveDirective implements Directive {
 			Object o = dirParams.tParams.item();
 			dirParams.tParams.right();
 
-			if (!(o instanceof Iterable))
+			if (!(o instanceof Iterable<?>))
 				throw new IllegalFormatConversionException('?', o.getClass());
 
+			@SuppressWarnings("unchecked")
 			Iterable<Object> itb = (Iterable<Object>)o;
 			Tape<Object> newParams = new SingleTape<>(itb);