summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--base/src/main/java/bjc/utils/components/MemoryComponentRepository.java2
-rw-r--r--base/src/main/java/bjc/utils/data/QueuedIterator.java2
-rw-r--r--base/src/main/java/bjc/utils/esodata/Tape.java2
-rw-r--r--base/src/main/java/bjc/utils/ioutils/SimpleProperties.java2
-rw-r--r--base/src/main/java/bjc/utils/math/DualExprParser.java17
-rw-r--r--clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java2
6 files changed, 15 insertions, 12 deletions
diff --git a/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java b/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java
index a4b8dda..1dae6e7 100644
--- a/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java
+++ b/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java
@@ -7,7 +7,7 @@ import bjc.utils.funcdata.IMap;
*
* @author bjculkin
*
- * @param <ComponentType>
+ * @param <ComponentType> The type of component stored in the repository.
*/
public class MemoryComponentRepository<ComponentType extends IDescribedComponent>
implements IComponentRepository<ComponentType> {
diff --git a/base/src/main/java/bjc/utils/data/QueuedIterator.java b/base/src/main/java/bjc/utils/data/QueuedIterator.java
index ae3afb8..571f2b5 100644
--- a/base/src/main/java/bjc/utils/data/QueuedIterator.java
+++ b/base/src/main/java/bjc/utils/data/QueuedIterator.java
@@ -9,7 +9,7 @@ import java.util.Iterator;
*
* @author bjculkin
*
- * @param <E>
+ * @param <E> The type of element this iterator iterates over.
*/
public class QueuedIterator<E> implements Iterator<E> {
private Iterator<E> cur;
diff --git a/base/src/main/java/bjc/utils/esodata/Tape.java b/base/src/main/java/bjc/utils/esodata/Tape.java
index 24319c2..c6e3b3a 100644
--- a/base/src/main/java/bjc/utils/esodata/Tape.java
+++ b/base/src/main/java/bjc/utils/esodata/Tape.java
@@ -1,7 +1,5 @@
package bjc.utils.esodata;
-import com.sun.rowset.internal.InsertRow;
-
/**
* Interface for something that acts like a tape.
*
diff --git a/base/src/main/java/bjc/utils/ioutils/SimpleProperties.java b/base/src/main/java/bjc/utils/ioutils/SimpleProperties.java
index 35dc47c..3a07fbc 100644
--- a/base/src/main/java/bjc/utils/ioutils/SimpleProperties.java
+++ b/base/src/main/java/bjc/utils/ioutils/SimpleProperties.java
@@ -75,7 +75,7 @@ public class SimpleProperties implements Map<String, String> {
*
* All leading/trailing spaces from the name &amp; body are removed.
*
- * @param is
+ * @param rdr
* The reader to read from.
*
* @param allowDuplicates
diff --git a/base/src/main/java/bjc/utils/math/DualExprParser.java b/base/src/main/java/bjc/utils/math/DualExprParser.java
index 71d62c7..0288702 100644
--- a/base/src/main/java/bjc/utils/math/DualExprParser.java
+++ b/base/src/main/java/bjc/utils/math/DualExprParser.java
@@ -33,9 +33,8 @@ public class DualExprParser {
/**
* Parses a dual expression from a postfix expression string.
*
- * @param expr The string to parse the dual expression from.
- *
- * @param preVars Any pre-existing variables to use.
+ * @param expr
+ * The string to parse the dual expression from.
*
* @return Both the parsed expression, and a map of all the variables used
*/
@@ -46,13 +45,16 @@ public class DualExprParser {
/**
* Parses a dual expression from a postfix expression string.
*
- * @param expr The string to parse the dual expression from.
+ * @param expr
+ * The string to parse the dual expression from.
*
- * @param preVars Any pre-existing variables to use.
+ * @param preVars
+ * Any pre-existing variables to use.
*
* @return Both the parsed expression, and a map of all the variables used
*
- * @throws StackUnderflowException If the expression is not properly formatted.
+ * @throws StackUnderflowException
+ * If the expression is not properly formatted.
*/
public static Result parseExpression(String expr, Map<String, DualExpr> preVars) {
Result res = new Result();
@@ -157,7 +159,8 @@ public class DualExprParser {
DualExpr dual = exprStack.pop();
DualExpr real = exprStack.pop();
- exprStack.push(new DualExpr(new Dual(real.evaluate().real, dual.evaluate().real)));
+ exprStack.push(new DualExpr(
+ new Dual(real.evaluate().real, dual.evaluate().real)));
break;
}
default:
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 ae3ca05..3b78d39 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
@@ -74,6 +74,8 @@ class ConditionalEdict implements Edict {
private List<CLString> clauses;
private CLString defClause;
+ // Think I might need this for something...
+ @SuppressWarnings("unused")
private CLFormatter formatter;
public ConditionalEdict(Mode condMode, boolean decrementIndex,