From 89ecc3004f9f513d249d9df9b2e48e08fd56f315 Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Sat, 13 Mar 2021 08:16:49 -0500 Subject: Clear up some warnings --- base/src/main/java/bjc/utils/ioutils/SimpleProperties.java | 12 ++++++++---- .../main/java/bjc/utils/patterns/MutablePatternMatcher.java | 3 ++- .../utils/ioutils/format/directives/AestheticDirective.java | 13 ------------- .../utils/ioutils/format/directives/DecimalDirective.java | 2 -- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/base/src/main/java/bjc/utils/ioutils/SimpleProperties.java b/base/src/main/java/bjc/utils/ioutils/SimpleProperties.java index 754ed45..d380866 100644 --- a/base/src/main/java/bjc/utils/ioutils/SimpleProperties.java +++ b/base/src/main/java/bjc/utils/ioutils/SimpleProperties.java @@ -170,17 +170,20 @@ public class SimpleProperties implements Map { return props.isEmpty(); } - @Override + @SuppressWarnings("unlikely-arg-type") + @Override public boolean containsKey(final Object key) { return props.containsKey(key); } - @Override + @SuppressWarnings("unlikely-arg-type") + @Override public boolean containsValue(final Object value) { return props.containsValue(value); } - @Override + @SuppressWarnings("unlikely-arg-type") + @Override public String get(final Object key) { return props.get(key); } @@ -190,7 +193,8 @@ public class SimpleProperties implements Map { return props.put(key, value); } - @Override + @SuppressWarnings("unlikely-arg-type") + @Override public String remove(final Object key) { return props.remove(key); } diff --git a/base/src/main/java/bjc/utils/patterns/MutablePatternMatcher.java b/base/src/main/java/bjc/utils/patterns/MutablePatternMatcher.java index 28e9cd7..176f588 100644 --- a/base/src/main/java/bjc/utils/patterns/MutablePatternMatcher.java +++ b/base/src/main/java/bjc/utils/patterns/MutablePatternMatcher.java @@ -79,7 +79,8 @@ public class MutablePatternMatcher * * @return Whether or not the pattern was removed. */ - public boolean removePattern(ComplexPattern pattern) { + @SuppressWarnings("unlikely-arg-type") + public boolean removePattern(ComplexPattern pattern) { return patterns.remove(pattern); } } diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/AestheticDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/AestheticDirective.java index 3dfb45b..0589992 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/AestheticDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/AestheticDirective.java @@ -93,12 +93,8 @@ class AestheticEdict implements Edict { int minpad = minpadPar.asInt(itemTape, "minumum amount of padding", "A", 0); - // if (padBefore) doPadding(work, padchar, mincol, colinc, minpad); - work.append(itemString); - // if (!padBefore) doPadding(work, padchar, mincol, colinc, minpad); - String padding = createPadding(work, padchar, mincol, colinc, minpad); if (padBefore) work.insert(0, padding); else work.append(padding); @@ -126,13 +122,4 @@ class AestheticEdict implements Edict { return padding.toString(); } - - private void doPadding(StringBuilder work, char padchar, int mincol, int colinc, - int minpad) { - for (int i = 0; i < minpad; i++) work.append(padchar); - - for (int i = work.length(); i < mincol; i++) { - for (int k = 0; k < colinc; k++) work.append(padchar); - } - } } diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/DecimalDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/DecimalDirective.java index 0d1d0df..6447eef 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/DecimalDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/DecimalDirective.java @@ -48,8 +48,6 @@ public class DecimalDirective implements Directive { } class DecimalEdict implements Edict { - private static final FieldPosition ZERO_FIELD = new FieldPosition(0); - private CLValue decFormat; public DecimalEdict(CLValue decForm) { -- cgit v1.2.3