From 373464d30d87bd8702fe27b920ed1406a0833ef3 Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Fri, 27 Mar 2020 16:39:52 -0400 Subject: Refactor test structure Tests are now in a 'test' sub-package, so it is clear that they are indeed test code, not just disjoint parts of the main code --- clformat/.classpath | 32 ++++++++++++++++++++++ clformat/.project | 23 ++++++++++++++++ .../.settings/org.eclipse.core.resources.prefs | 5 ++++ clformat/.settings/org.eclipse.jdt.core.prefs | 8 ++++++ clformat/.settings/org.eclipse.m2e.core.prefs | 4 +++ .../java/bjc/utils/ioutils/format/CLFormatter.java | 2 +- .../bjc/utils/ioutils/format/CLParameters.java | 12 ++------ .../java/bjc/utils/ioutils/format/CLString.java | 2 +- .../bjc/utils/ioutils/format/ClauseDecree.java | 4 +-- .../java/bjc/utils/ioutils/format/GroupDecree.java | 4 +-- .../ioutils/format/directives/CaseDirective.java | 2 +- .../format/directives/CharacterDirective.java | 2 +- .../format/directives/ConditionalDirective.java | 1 - .../ioutils/format/directives/FormatContext.java | 2 +- .../format/directives/FormatParameters.java | 2 +- .../format/directives/InflectDirective.java | 3 +- .../format/directives/TabulateDirective.java | 2 +- 17 files changed, 87 insertions(+), 23 deletions(-) create mode 100644 clformat/.classpath create mode 100644 clformat/.project create mode 100644 clformat/.settings/org.eclipse.core.resources.prefs create mode 100644 clformat/.settings/org.eclipse.jdt.core.prefs create mode 100644 clformat/.settings/org.eclipse.m2e.core.prefs (limited to 'clformat') diff --git a/clformat/.classpath b/clformat/.classpath new file mode 100644 index 0000000..2efb9ee --- /dev/null +++ b/clformat/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/clformat/.project b/clformat/.project new file mode 100644 index 0000000..3a9c3f2 --- /dev/null +++ b/clformat/.project @@ -0,0 +1,23 @@ + + + clformat + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/clformat/.settings/org.eclipse.core.resources.prefs b/clformat/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..41654f9 --- /dev/null +++ b/clformat/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 +encoding/=UTF-8 +encoding/data=UTF-8 diff --git a/clformat/.settings/org.eclipse.jdt.core.prefs b/clformat/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..2f5cc74 --- /dev/null +++ b/clformat/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/clformat/.settings/org.eclipse.m2e.core.prefs b/clformat/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/clformat/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 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 56c64f6..a306b9c 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java @@ -4,7 +4,7 @@ import java.io.*; import java.util.*; import bjc.utils.esodata.*; -import bjc.utils.ioutils.*; +import bjc.utils.ioutils.ReportWriter; import bjc.utils.ioutils.format.directives.*; // Grab our easy converters/constructors diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java index 498d9d5..cd3d0f3 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java @@ -4,7 +4,7 @@ import java.util.*; import bjc.esodata.AbbrevMap2; import bjc.utils.esodata.Tape; -import bjc.utils.parserutils.*; +import bjc.utils.parserutils.TokenUtils; /** * Represents a set of parameters to a CL format directive. @@ -82,17 +82,11 @@ public class CLParameters { // // If it becomes an issue, I'll resolve it for (String key : namedParams.keySet()) { - if (abbrevWords.contains(key)) continue; - - abbrevWords.add(key); - nameAbbrevs.add(key); + refreshAbbrev(key); } for (String key : nameIndices.keySet()) { - if (abbrevWords.contains(key)) continue; - - abbrevWords.add(key); - nameAbbrevs.add(key); + refreshAbbrev(key); } } diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/CLString.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLString.java index 5e74cc1..ed830d4 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/CLString.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLString.java @@ -4,7 +4,7 @@ import java.io.*; import java.util.*; import bjc.utils.esodata.*; -import bjc.utils.ioutils.*; +import bjc.utils.ioutils.ReportWriter; import bjc.utils.ioutils.format.directives.*; /** diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/ClauseDecree.java b/clformat/src/main/java/bjc/utils/ioutils/format/ClauseDecree.java index 4188e03..2fd7eda 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/ClauseDecree.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/ClauseDecree.java @@ -1,10 +1,10 @@ package bjc.utils.ioutils.format; -import bjc.utils.ioutils.*; - import java.io.*; import java.util.*; +import bjc.utils.ioutils.ReportWriter; + /** * A decree that represents a single clause in a {@link GroupDecree}. * diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/GroupDecree.java b/clformat/src/main/java/bjc/utils/ioutils/format/GroupDecree.java index b3ae69b..47401a9 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/GroupDecree.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/GroupDecree.java @@ -1,10 +1,10 @@ package bjc.utils.ioutils.format; -import bjc.utils.ioutils.*; - import java.io.*; import java.util.*; +import bjc.utils.ioutils.ReportWriter; + /** * Represents an enclosed group of decrees. * 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 3b21074..d1ab4ab 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 @@ -3,7 +3,7 @@ package bjc.utils.ioutils.format.directives; import java.io.*; import java.util.regex.*; -import bjc.utils.ioutils.*; +import bjc.utils.ioutils.ReportWriter; import bjc.utils.ioutils.format.*; /** 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 bca488c..f8cc039 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 @@ -3,7 +3,7 @@ package bjc.utils.ioutils.format.directives; import java.io.*; import java.util.*; -import bjc.utils.ioutils.*; +import bjc.utils.ioutils.ReportWriter; import bjc.utils.ioutils.format.*; /** 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 2eb5e4c..ae3ca05 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 @@ -2,7 +2,6 @@ package bjc.utils.ioutils.format.directives; import java.io.*; import java.util.*; -import java.util.regex.*; import bjc.utils.esodata.*; import bjc.utils.ioutils.format.*; diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatContext.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatContext.java index f1147fb..f8791a5 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatContext.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatContext.java @@ -3,7 +3,7 @@ package bjc.utils.ioutils.format.directives; import java.io.*; import bjc.utils.esodata.*; -import bjc.utils.ioutils.*; +import bjc.utils.ioutils.ReportWriter; /** * Encapsulates all of the state that is provided to edicts when they are 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 index e55fdd8..e47545c 100644 --- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatParameters.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FormatParameters.java @@ -1,7 +1,7 @@ package bjc.utils.ioutils.format.directives; import bjc.utils.esodata.*; -import bjc.utils.ioutils.*; +import bjc.utils.ioutils.ReportWriter; import bjc.utils.ioutils.format.*; /** 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 ead1c06..b9de4af 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 @@ -3,8 +3,7 @@ package bjc.utils.ioutils.format.directives; import java.io.*; import java.util.*; import bjc.inflexion.*; - -import bjc.utils.ioutils.*; +import bjc.utils.ioutils.ReportWriter; import bjc.utils.ioutils.format.*; /** 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 2aaef19..87bde35 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 @@ -3,7 +3,7 @@ package bjc.utils.ioutils.format.directives; import java.io.*; import bjc.utils.esodata.*; -import bjc.utils.ioutils.*; +import bjc.utils.ioutils.ReportWriter; import bjc.utils.ioutils.format.*; /** -- cgit v1.2.3