summaryrefslogtreecommitdiff
path: root/BJC-Utils2/src/main/java/bjc
diff options
context:
space:
mode:
authorbculkin2442 <bjculkin@mix.wvu.edu>2016-03-22 12:29:26 -0400
committerbculkin2442 <bjculkin@mix.wvu.edu>2016-03-22 12:29:26 -0400
commit7ed88d289b0bbc00b097e345dfac90208038cab3 (patch)
treef9e047616595cf2c644752b39fc2a81c83c64f41 /BJC-Utils2/src/main/java/bjc
parent01cb9f504c860bc1c037a44f3a76bf342a293d46 (diff)
General formatting changes
Diffstat (limited to 'BJC-Utils2/src/main/java/bjc')
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/data/IPair.java4
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/dice/Die.java2
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/dice/ScalarDiceExpression.java4
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/dice/ast/DiceASTExpression.java3
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeNode.java3
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/funcutils/StatementUtils.java3
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/graph/Graph.java4
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/gui/SimpleDialogs.java4
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/parserutils/AST.java10
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java3
10 files changed, 30 insertions, 10 deletions
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/IPair.java b/BJC-Utils2/src/main/java/bjc/utils/data/IPair.java
index 9923099..fcf5618 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/IPair.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/IPair.java
@@ -46,7 +46,9 @@ public interface IPair<L, R> {
/**
* Collapse this pair to a single value. Does not change the internal
* contents of this pair.
- * @param <E> The resulting type after merging
+ *
+ * @param <E>
+ * The resulting type after merging
*
* @param bf
* The function to use to collapse the pair.
diff --git a/BJC-Utils2/src/main/java/bjc/utils/dice/Die.java b/BJC-Utils2/src/main/java/bjc/utils/dice/Die.java
index 0bd6964..c768aa5 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/dice/Die.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/dice/Die.java
@@ -31,6 +31,7 @@ public class Die implements IDiceExpression {
/*
* (non-Javadoc)
+ *
* @see bjc.utils.dice.IDiceExpression#roll()
*/
@Override
@@ -40,6 +41,7 @@ public class Die implements IDiceExpression {
/*
* (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
diff --git a/BJC-Utils2/src/main/java/bjc/utils/dice/ScalarDiceExpression.java b/BJC-Utils2/src/main/java/bjc/utils/dice/ScalarDiceExpression.java
index 267e6ef..4c3f244 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/dice/ScalarDiceExpression.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/dice/ScalarDiceExpression.java
@@ -11,7 +11,7 @@ public class ScalarDiceExpression implements IDiceExpression {
* The operation to combine with
*/
private DiceExpressionType det;
-
+
/**
* The expression to be combined
*/
@@ -41,6 +41,7 @@ public class ScalarDiceExpression implements IDiceExpression {
/*
* (non-Javadoc)
+ *
* @see bjc.utils.dice.IDiceExpression#roll()
*/
@Override
@@ -63,6 +64,7 @@ public class ScalarDiceExpression implements IDiceExpression {
/*
* (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
diff --git a/BJC-Utils2/src/main/java/bjc/utils/dice/ast/DiceASTExpression.java b/BJC-Utils2/src/main/java/bjc/utils/dice/ast/DiceASTExpression.java
index aceeed0..89adb65 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/dice/ast/DiceASTExpression.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/dice/ast/DiceASTExpression.java
@@ -162,6 +162,7 @@ public class DiceASTExpression implements IDiceExpression {
/**
* Get the AST bound to this expression
+ *
* @return the ast
*/
public AST<IDiceASTNode> getAst() {
@@ -170,6 +171,7 @@ public class DiceASTExpression implements IDiceExpression {
/*
* (non-Javadoc)
+ *
* @see bjc.utils.dice.IDiceExpression#roll()
*/
@Override
@@ -183,6 +185,7 @@ public class DiceASTExpression implements IDiceExpression {
/*
* (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeNode.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeNode.java
index 715456c..0ab1769 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeNode.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeNode.java
@@ -38,7 +38,8 @@ public class BinarySearchTreeNode<T> extends BinarySearchTreeLeaf<T> {
* @param right
* The right child of this node.
*/
- public BinarySearchTreeNode(T data, ITreePart<T> left, ITreePart<T> right) {
+ public BinarySearchTreeNode(T data, ITreePart<T> left,
+ ITreePart<T> right) {
super(data);
this.left = left;
this.right = right;
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/StatementUtils.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/StatementUtils.java
index 57895f9..9b4b03f 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/StatementUtils.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/StatementUtils.java
@@ -2,9 +2,10 @@ package bjc.utils.funcutils;
/**
* Contains methods that produce effects mimicking statements
+ *
* @author ben
*
*/
public class StatementUtils {
-
+
}
diff --git a/BJC-Utils2/src/main/java/bjc/utils/graph/Graph.java b/BJC-Utils2/src/main/java/bjc/utils/graph/Graph.java
index 2f2ac04..d7aff34 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/graph/Graph.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/graph/Graph.java
@@ -237,7 +237,9 @@ public class Graph<T> {
/**
* Create a graph from a list of edges
- * @param <E> The type of data stored in the edges
+ *
+ * @param <E>
+ * The type of data stored in the edges
*
* @param edges
* The list of edges to build from
diff --git a/BJC-Utils2/src/main/java/bjc/utils/gui/SimpleDialogs.java b/BJC-Utils2/src/main/java/bjc/utils/gui/SimpleDialogs.java
index f18378e..c85a86e 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/gui/SimpleDialogs.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/gui/SimpleDialogs.java
@@ -140,7 +140,9 @@ public class SimpleDialogs {
/**
* Get a value parsable from a string from the user.
- * @param <E> The type of the value parsed from the string
+ *
+ * @param <E>
+ * The type of the value parsed from the string
*
* @param parent
* The parent component for dialogs.
diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/AST.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/AST.java
index 943d177..52248f0 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/AST.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/AST.java
@@ -90,8 +90,10 @@ public class AST<T> {
/**
* Collapse this tree into a single node
- * @param <E> The final value of the collapsed tree
- * @param <T2>
+ *
+ * @param <E>
+ * The final value of the collapsed tree
+ * @param <T2>
*
* @param tokenTransform
* The function to transform nodes into data
@@ -199,7 +201,9 @@ public class AST<T> {
/**
* Transmute the tokens in an AST into a different sort of token
- * @param <E> The type of the transformed tokens
+ *
+ * @param <E>
+ * The type of the transformed tokens
*
* @param tokenTransformer
* The transform to run on the tokens
diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java
index b5f48e7..8dfe9fa 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java
@@ -82,7 +82,8 @@ public class ShuntingYard<E> {
*
* @param tok
* The token representing the operator
- * @param i The precedence of the operator to add
+ * @param i
+ * The precedence of the operator to add
*/
public void addOp(String tok, int i) {
this.addOp(tok, IPrecedent.newSimplePrecedent(i));