From 47b755db5ec896725038c45d8d6143c0f8821e8b Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Fri, 25 Sep 2020 19:04:55 -0400 Subject: Warning cleanup Take care of some various warnings that were occuring --- base/src/main/java/bjc/utils/cli/objects/Command.java | 6 ++++-- .../src/main/java/bjc/utils/cli/objects/DelimSplitterCLI.java | 3 +++ base/src/main/java/bjc/utils/ioutils/LevelSplitter.java | 11 ++++++++++- .../main/java/bjc/utils/ioutils/RuleBasedConfigReader.java | 4 +++- base/src/main/java/bjc/utils/ioutils/SimpleProperties.java | 4 ---- base/src/main/java/bjc/utils/math/DualExprParser.java | 1 + base/src/main/java/bjc/utils/math/NumberUtils.java | 2 +- .../test/java/bjc/utils/test/ioutils/ReportWriterTest.java | 2 +- 8 files changed, 23 insertions(+), 10 deletions(-) (limited to 'base/src') diff --git a/base/src/main/java/bjc/utils/cli/objects/Command.java b/base/src/main/java/bjc/utils/cli/objects/Command.java index ce2a985..af22643 100644 --- a/base/src/main/java/bjc/utils/cli/objects/Command.java +++ b/base/src/main/java/bjc/utils/cli/objects/Command.java @@ -263,7 +263,7 @@ public class Command { * The main thing this does is ignore blank lines, as well as comments marked by * #'s either at the start of the line or part of the way through the line. * - * @param ln + * @param lne * The string to get the command from. * * @param lno @@ -273,7 +273,9 @@ public class Command { * The name of where the I/O came from. * @return The parsed command */ - public static Command fromString(String ln, int lno, String srcName) { + public static Command fromString(String lne, int lno, String srcName) { + String ln = lne; + /* Ignore blank lines and comments. */ if (ln.equals("")) return null; diff --git a/base/src/main/java/bjc/utils/cli/objects/DelimSplitterCLI.java b/base/src/main/java/bjc/utils/cli/objects/DelimSplitterCLI.java index 59822e4..a6820f2 100644 --- a/base/src/main/java/bjc/utils/cli/objects/DelimSplitterCLI.java +++ b/base/src/main/java/bjc/utils/cli/objects/DelimSplitterCLI.java @@ -463,6 +463,9 @@ public class DelimSplitterCLI { intPrintDelimTree(contents.getChild(0), sb); intPrintDelimNode(tree.getChild(2), sb); + break; + default: + // Don't think this is ever a case we have to handle, but maybe it is break; } } diff --git a/base/src/main/java/bjc/utils/ioutils/LevelSplitter.java b/base/src/main/java/bjc/utils/ioutils/LevelSplitter.java index 735dd3a..c2467ae 100644 --- a/base/src/main/java/bjc/utils/ioutils/LevelSplitter.java +++ b/base/src/main/java/bjc/utils/ioutils/LevelSplitter.java @@ -76,6 +76,9 @@ public class LevelSplitter { case '>': nestLevel = Math.max(0, nestLevel - 1); break; + default: + // Not a character we care about + break; } } @@ -156,7 +159,7 @@ public class LevelSplitter { } } else { /* - * @TODO Ben Culkin 9/4/18 + * @TODO Ben Culkin 9/4/18 :DelimiterEnd * * This currently crashes if the string ends with one of the delimiters in * question. @@ -182,6 +185,9 @@ public class LevelSplitter { case '>': nestLevel = Math.max(0, nestLevel - 1); break; + default: + // Not a character we care about + break; } } @@ -266,6 +272,9 @@ public class LevelSplitter { case '>': nestLevel = Math.max(0, nestLevel - 1); break; + default: + // Not a character we care about + break; } } diff --git a/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java b/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java index 88a3b81..fe303f3 100644 --- a/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java +++ b/base/src/main/java/bjc/utils/ioutils/RuleBasedConfigReader.java @@ -244,7 +244,9 @@ public class RuleBasedConfigReader { this.start = start; } - private boolean startRule(final E state, boolean isRuleOpen, final String line) { + private boolean startRule(final E state, boolean isRulOpen, final String line) { + boolean isRuleOpen = isRulOpen; + /* * Create the line tokenizer */ diff --git a/base/src/main/java/bjc/utils/ioutils/SimpleProperties.java b/base/src/main/java/bjc/utils/ioutils/SimpleProperties.java index e035894..754ed45 100644 --- a/base/src/main/java/bjc/utils/ioutils/SimpleProperties.java +++ b/base/src/main/java/bjc/utils/ioutils/SimpleProperties.java @@ -170,19 +170,16 @@ public class SimpleProperties implements Map { return props.isEmpty(); } - @SuppressWarnings("unlikely-arg-type") @Override public boolean containsKey(final Object key) { return props.containsKey(key); } - @SuppressWarnings("unlikely-arg-type") @Override public boolean containsValue(final Object value) { return props.containsValue(value); } - @SuppressWarnings("unlikely-arg-type") @Override public String get(final Object key) { return props.get(key); @@ -193,7 +190,6 @@ public class SimpleProperties implements Map { return props.put(key, value); } - @SuppressWarnings("unlikely-arg-type") @Override public String remove(final Object key) { return props.remove(key); diff --git a/base/src/main/java/bjc/utils/math/DualExprParser.java b/base/src/main/java/bjc/utils/math/DualExprParser.java index f130a9a..624a876 100644 --- a/base/src/main/java/bjc/utils/math/DualExprParser.java +++ b/base/src/main/java/bjc/utils/math/DualExprParser.java @@ -75,6 +75,7 @@ public class DualExprParser { Result res = new Result(); if (preVars == null) { + res.varMap = new HashMap<>(); } else { res.varMap = preVars; } diff --git a/base/src/main/java/bjc/utils/math/NumberUtils.java b/base/src/main/java/bjc/utils/math/NumberUtils.java index 7d138fb..b411161 100644 --- a/base/src/main/java/bjc/utils/math/NumberUtils.java +++ b/base/src/main/java/bjc/utils/math/NumberUtils.java @@ -437,7 +437,7 @@ public class NumberUtils { work.reverse(); /* - * @TODO + * @TODO :PadDirection Ben Culkin 5/20/20 * * Should we have some way to specify how to pad? * diff --git a/base/src/test/java/bjc/utils/test/ioutils/ReportWriterTest.java b/base/src/test/java/bjc/utils/test/ioutils/ReportWriterTest.java index 8a5807e..3c4583a 100644 --- a/base/src/test/java/bjc/utils/test/ioutils/ReportWriterTest.java +++ b/base/src/test/java/bjc/utils/test/ioutils/ReportWriterTest.java @@ -24,7 +24,7 @@ public class ReportWriterTest { assertEquals("foo", rw.toString()); } catch (IOException ioex) { - + // Do nothing } } } -- cgit v1.2.3