From 251419e1f0ab8eb04d21287b708b06a552f4c58a Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Mon, 10 Apr 2017 16:49:31 -0400
Subject: Warning resolution

---
 JPratt/src/main/java/bjc/pratt/commands/ChainCommand.java    |  4 ++--
 .../src/main/java/bjc/pratt/commands/PreTernaryCommand.java  | 12 ++++++------
 JPratt/src/main/java/bjc/pratt/commands/TernaryCommand.java  |  4 ++--
 .../java/bjc/pratt/commands/TransformingInitialCommand.java  | 10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'JPratt/src/main/java/bjc/pratt/commands')

diff --git a/JPratt/src/main/java/bjc/pratt/commands/ChainCommand.java b/JPratt/src/main/java/bjc/pratt/commands/ChainCommand.java
index c7a10b1..6ab126a 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/ChainCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/ChainCommand.java
@@ -61,9 +61,9 @@ public class ChainCommand<K, V, C> extends BinaryPostCommand<K, V, C> {
 					new ParserContext<>(ctx.tokens, ctx.parse, ctx.state));
 
 			return new Tree<>(chain, res, other);
-		} else {
-			return res;
 		}
+
+		return res;
 	}
 
 	@Override
diff --git a/JPratt/src/main/java/bjc/pratt/commands/PreTernaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/PreTernaryCommand.java
index efa7872..072c58c 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/PreTernaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/PreTernaryCommand.java
@@ -22,7 +22,7 @@ import bjc.utils.parserutils.ParserException;
  *                The state type of the parser.
  */
 public class PreTernaryCommand<K, V, C> extends AbstractInitialCommand<K, V, C> {
-	private Token<K, V> term;
+	private Token<K, V> trm;
 
 	private ParseBlock<K, V, C> condBlock;
 
@@ -54,11 +54,11 @@ public class PreTernaryCommand<K, V, C> extends AbstractInitialCommand<K, V, C>
 			throw new NullPointerException("Op block #1 must not be null");
 		else if (op2 == null) throw new NullPointerException("Op block #2 must not be null");
 
-		this.condBlock = cond;
-		this.opblock1 = op1;
-		this.opblock2 = op2;
+		condBlock = cond;
+		opblock1 = op1;
+		opblock2 = op2;
 
-		this.term = term;
+		trm = term;
 	}
 
 	@Override
@@ -70,6 +70,6 @@ public class PreTernaryCommand<K, V, C> extends AbstractInitialCommand<K, V, C>
 
 		ITree<Token<K, V>> op2 = opblock2.parse(ctx);
 
-		return new Tree<>(term, cond, op1, op2);
+		return new Tree<>(trm, cond, op1, op2);
 	}
 }
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/pratt/commands/TernaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/TernaryCommand.java
index bac12cd..0152471 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/TernaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/TernaryCommand.java
@@ -70,8 +70,8 @@ public class TernaryCommand<K, V, C> extends BinaryPostCommand<K, V, C> {
 	public int nextBinding() {
 		if (nonassoc) {
 			return leftBinding() - 1;
-		} else {
-			return leftBinding();
 		}
+
+		return leftBinding();
 	}
 }
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/pratt/commands/TransformingInitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/TransformingInitialCommand.java
index 9ec3631..d75c8ce 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/TransformingInitialCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/TransformingInitialCommand.java
@@ -23,9 +23,9 @@ import bjc.utils.parserutils.ParserException;
  *                The state type of the parser.
  */
 public class TransformingInitialCommand<K, V, C> extends AbstractInitialCommand<K, V, C> {
-	private InitialCommand<K, V, C> internal;
+	private InitialCommand<K, V, C> internl;
 
-	private UnaryOperator<ITree<Token<K, V>>> transform;
+	private UnaryOperator<ITree<Token<K, V>>> transfrm;
 
 	/**
 	 * Create a new transforming initial command.
@@ -39,14 +39,14 @@ public class TransformingInitialCommand<K, V, C> extends AbstractInitialCommand<
 	public TransformingInitialCommand(InitialCommand<K, V, C> internal,
 			UnaryOperator<ITree<Token<K, V>>> transform) {
 		super();
-		this.internal = internal;
-		this.transform = transform;
+		internl = internal;
+		transfrm = transform;
 	}
 
 	@Override
 	protected ITree<Token<K, V>> intNullDenotation(Token<K, V> operator, ParserContext<K, V, C> ctx)
 			throws ParserException {
-		return transform.apply(internal.denote(operator, ctx));
+		return transfrm.apply(internl.denote(operator, ctx));
 	}
 
 }
-- 
cgit v1.2.3