From 454816ab9ede978a3081020e9ba5b4d9d2f7c483 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Mon, 17 Sep 2018 11:37:57 -0400 Subject: Rename FormatParameter to FormatParameters --- .../java/bjc/utils/ioutils/format/CLFormatter.java | 4 +-- .../format/directives/AestheticDirective.java | 2 +- .../ioutils/format/directives/CaseDirective.java | 2 +- .../format/directives/CharacterDirective.java | 2 +- .../format/directives/ConditionalDirective.java | 2 +- .../utils/ioutils/format/directives/Directive.java | 2 +- .../ioutils/format/directives/EscapeDirective.java | 2 +- .../ioutils/format/directives/FormatParameter.java | 30 ---------------------- .../format/directives/FormatParameters.java | 30 ++++++++++++++++++++++ .../format/directives/FreshlineDirective.java | 2 +- .../ioutils/format/directives/GotoDirective.java | 2 +- .../format/directives/InflectDirective.java | 2 +- .../format/directives/IterationDirective.java | 2 +- .../format/directives/LiteralDirective.java | 2 +- .../ioutils/format/directives/NumberDirective.java | 2 +- .../ioutils/format/directives/RadixDirective.java | 2 +- .../format/directives/RecursiveDirective.java | 2 +- .../format/directives/TabulateDirective.java | 2 +- 18 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatParameter.java create mode 100644 clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatParameters.java (limited to 'clformat/src/main/java') diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java index 0a15c1f..f614d9a 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java @@ -235,7 +235,7 @@ public class CLFormatter { } if(extraDirectives.containsKey(dirName)) { - extraDirectives.get(dirName).format(new FormatParameter(rw, item, mods, arrParams, tParams, dirMatcher, this)); + extraDirectives.get(dirName).format(new FormatParameters(rw, item, mods, arrParams, tParams, dirMatcher, this)); continue; } @@ -243,7 +243,7 @@ public class CLFormatter { if(builtinDirectives.containsKey(dirName)) { // System.err.printf("Executing directive %s (%s) (%d to %d) from string %s\n", dirName, dirMatcher.group(), dirMatcher.start(), dirMatcher.end(), format); - builtinDirectives.get(dirName).format(new FormatParameter(rw, item, mods, arrParams, tParams, dirMatcher, this)); + builtinDirectives.get(dirName).format(new FormatParameters(rw, item, mods, arrParams, tParams, dirMatcher, this)); continue; } 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 59fa58c..87a6d6b 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 @@ -13,7 +13,7 @@ import bjc.utils.ioutils.format.CLFormatter; public class AestheticDirective implements Directive { @Override - public void format(FormatParameter dirParams) throws IOException { + public void format(FormatParameters dirParams) throws IOException { // System.err.printf("Aesthetic directive with item \"%s\" and params: %s\n", item, tParams); CLFormatter.checkItem(dirParams.item, 'A'); diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java index 0a5ebff..0135129 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java @@ -16,7 +16,7 @@ public class CaseDirective implements Directive { private static final Pattern wordPattern = Pattern.compile("(\\w+)(\\b*)"); @Override - public void format(FormatParameter dirParams) throws IOException { + public void format(FormatParameters dirParams) throws IOException { StringBuffer condBody = new StringBuffer(); int nestLevel = 1; diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java index 685fa1c..1a2d196 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java @@ -14,7 +14,7 @@ import java.util.IllegalFormatConversionException; public class CharacterDirective implements Directive { @Override - public void format(FormatParameter dirParams) throws IOException { + public void format(FormatParameters dirParams) throws IOException { CLFormatter.checkItem(dirParams.item, 'C'); if (!(dirParams.item instanceof Character)) { 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 e1f3c42..c4bde66 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 @@ -18,7 +18,7 @@ public class ConditionalDirective implements Directive { private static Logger LOG = Logger.getLogger(ConditionalDirective.class.getName()); @Override - public void format(FormatParameter dirParams) throws IOException { + public void format(FormatParameters dirParams) throws IOException { StringBuffer condBody = new StringBuffer(); List clauses = new ArrayList<>(); diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java index 641d76d..243bd43 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java @@ -16,7 +16,7 @@ public interface Directive { * @param sb * The buffer the string is being output to. */ - public void format(FormatParameter dirParams) throws IOException; + public void format(FormatParameters dirParams) throws IOException; public static boolean isOpening(String str) { switch(str) { diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java index a9d6e4f..f0aa6ec 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java @@ -10,7 +10,7 @@ import bjc.utils.ioutils.format.EscapeException; public class EscapeDirective implements Directive { @Override - public void format(FormatParameter dirParams) { + public void format(FormatParameters dirParams) { boolean shouldExit; if (dirParams.mods.dollarMod) dirParams.tParams.right(); diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatParameter.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatParameter.java deleted file mode 100644 index 35882a4..0000000 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatParameter.java +++ /dev/null @@ -1,30 +0,0 @@ -package bjc.utils.ioutils.format.directives; - -import java.util.regex.Matcher; - -import bjc.utils.esodata.Tape; -import bjc.utils.ioutils.ReportWriter; -import bjc.utils.ioutils.format.CLFormatter; -import bjc.utils.ioutils.format.CLModifiers; -import bjc.utils.ioutils.format.CLParameters; - -public class FormatParameter { - public ReportWriter rw; - public Object item; - public CLModifiers mods; - public CLParameters arrParams; - public Tape tParams; - public Matcher dirMatcher; - public CLFormatter fmt; - - public FormatParameter(ReportWriter rw, Object item, CLModifiers mods, CLParameters arrParams, - Tape tParams, Matcher dirMatcher, CLFormatter fmt) { - this.rw = rw; - this.item = item; - this.mods = mods; - this.arrParams = arrParams; - this.tParams = tParams; - this.dirMatcher = dirMatcher; - this.fmt = fmt; - } -} \ No newline at end of file diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatParameters.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatParameters.java new file mode 100644 index 0000000..b49933d --- /dev/null +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatParameters.java @@ -0,0 +1,30 @@ +package bjc.utils.ioutils.format.directives; + +import java.util.regex.Matcher; + +import bjc.utils.esodata.Tape; +import bjc.utils.ioutils.ReportWriter; +import bjc.utils.ioutils.format.CLFormatter; +import bjc.utils.ioutils.format.CLModifiers; +import bjc.utils.ioutils.format.CLParameters; + +public class FormatParameters { + public ReportWriter rw; + public Object item; + public CLModifiers mods; + public CLParameters arrParams; + public Tape tParams; + public Matcher dirMatcher; + public CLFormatter fmt; + + public FormatParameters(ReportWriter rw, Object item, CLModifiers mods, CLParameters arrParams, + Tape tParams, Matcher dirMatcher, CLFormatter fmt) { + this.rw = rw; + this.item = item; + this.mods = mods; + this.arrParams = arrParams; + this.tParams = tParams; + this.dirMatcher = dirMatcher; + this.fmt = fmt; + } +} \ No newline at end of file diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java index b0561cf..afd4c5a 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java @@ -10,7 +10,7 @@ import java.io.IOException; public class FreshlineDirective implements Directive { @Override - public void format(FormatParameter dirParams) throws IOException { + public void format(FormatParameters dirParams) throws IOException { int nTimes = 1; if(dirParams.arrParams.length() >= 1) { diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/GotoDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/GotoDirective.java index a64591f..9a8d416 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/GotoDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/GotoDirective.java @@ -9,7 +9,7 @@ package bjc.utils.ioutils.format.directives; public class GotoDirective implements Directive { @Override - public void format(FormatParameter dirParams) { + public void format(FormatParameters dirParams) { if (dirParams.mods.colonMod) { int num = 1; if (dirParams.arrParams.length() >= 1) { diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java index e76b2f7..48de9b3 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/InflectDirective.java @@ -16,7 +16,7 @@ public class InflectDirective implements Directive { private static final Pattern wordPattern = Pattern.compile("(\\w+)(\\b*)"); @Override - public void format(FormatParameter dirParams) throws IOException { + public void format(FormatParameters dirParams) throws IOException { StringBuffer condBody = new StringBuffer(); int nestLevel = 1; diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java index 10f1608..304f991 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java @@ -19,7 +19,7 @@ import java.util.IllegalFormatConversionException; public class IterationDirective implements Directive { @Override - public void format(FormatParameter dirParams) throws IOException { + public void format(FormatParameters dirParams) throws IOException { CLFormatter.checkItem(dirParams.item, '{'); StringBuffer condBody = new StringBuffer(); diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java index 5ca454e..9ad647f 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java @@ -27,7 +27,7 @@ public class LiteralDirective implements Directive { } @Override - public void format(FormatParameter dirParams) throws IOException { + public void format(FormatParameters dirParams) throws IOException { int nTimes = 1; if (dirParams.arrParams.length() >= 1) { diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java index da55271..338cd61 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java @@ -34,7 +34,7 @@ public class NumberDirective extends GeneralNumberDirective { private char directive; @Override - public void format(FormatParameter dirParams) throws IOException { + public void format(FormatParameters dirParams) throws IOException { CLFormatter.checkItem(dirParams.item, directive); if (!(dirParams.item instanceof Number)) { diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java index a5b1a84..da41276 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java @@ -15,7 +15,7 @@ import java.util.IllegalFormatConversionException; public class RadixDirective extends GeneralNumberDirective { @Override - public void format(FormatParameter dirParams) throws IOException { + public void format(FormatParameters dirParams) throws IOException { CLFormatter.checkItem(dirParams.item, 'R'); if (!(dirParams.item instanceof Number)) { diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java index 33f57e1..dddae77 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java @@ -9,7 +9,7 @@ import java.util.IllegalFormatConversionException; import java.io.IOException; public class RecursiveDirective implements Directive { - public void format(FormatParameter dirParams) throws IOException { + public void format(FormatParameters dirParams) throws IOException { dirParams.tParams.right(); CLFormatter.checkItem(dirParams.item, '?'); diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java index b3204e0..1fd95ff 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java @@ -5,7 +5,7 @@ import java.io.IOException; import bjc.utils.ioutils.format.*; public class TabulateDirective implements Directive { - public void format(FormatParameter dirParams) throws IOException { + public void format(FormatParameters dirParams) throws IOException { // Unsupported feature. // // I can't really make out what this is supposed to do from the -- cgit v1.2.3