diff options
| -rw-r--r-- | base/src/main/java/bjc/utils/cli/objects/DefineCLI.java | 15 | ||||
| -rw-r--r-- | clformat/.gitignore | 1 | ||||
| -rw-r--r-- | clformat/pom.xml | 89 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/App.java | 13 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java (renamed from base/src/main/java/bjc/utils/ioutils/format/CLFormatter.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/CLModifiers.java (renamed from base/src/main/java/bjc/utils/ioutils/format/CLModifiers.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java (renamed from base/src/main/java/bjc/utils/ioutils/format/CLParameters.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/EscapeException.java (renamed from base/src/main/java/bjc/utils/ioutils/format/EscapeException.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/AestheticDirective.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/AestheticDirective.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/Directive.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/GotoDirective.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/GotoDirective.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java) | 0 | ||||
| -rw-r--r-- | clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java (renamed from base/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java) | 0 | ||||
| -rw-r--r-- | clformat/src/test/java/bjc/AppTest.java | 20 | ||||
| -rw-r--r-- | clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java (renamed from base/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java) | 0 | ||||
| -rw-r--r-- | pom.xml | 9 |
26 files changed, 135 insertions, 12 deletions
diff --git a/base/src/main/java/bjc/utils/cli/objects/DefineCLI.java b/base/src/main/java/bjc/utils/cli/objects/DefineCLI.java index 6ebcf39..3a03d18 100644 --- a/base/src/main/java/bjc/utils/cli/objects/DefineCLI.java +++ b/base/src/main/java/bjc/utils/cli/objects/DefineCLI.java @@ -1,7 +1,6 @@ package bjc.utils.cli.objects; import bjc.utils.funcutils.StringUtils; -import bjc.utils.ioutils.format.CLFormatter; import java.io.IOException; import java.util.ArrayList; @@ -227,15 +226,15 @@ public class DefineCLI { } } - CLFormatter fmt = new CLFormatter(); + // CLFormatter fmt = new CLFormatter(); String formatted = ""; - try { - formatted = fmt.formatString(stat.formats.get(formatName), fillIns); - } catch (IOException ioex) { - LOGGER.severe(com.error("IOException formatting string: %s", ioex.getMessage())); - return FAIL; - } + // try { + // formatted = fmt.formatString(stat.formats.get(formatName), fillIns); + // } catch (IOException ioex) { + // LOGGER.severe(com.error("IOException formatting string: %s", ioex.getMessage())); + // return FAIL; + // } stat.strings.put(bindName, formatted); diff --git a/clformat/.gitignore b/clformat/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/clformat/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/clformat/pom.xml b/clformat/pom.xml new file mode 100644 index 0000000..23ddb58 --- /dev/null +++ b/clformat/pom.xml @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>BJCUtils-Parent</artifactId> + <groupId>bjc</groupId> + <version>1.0.0</version> + </parent> + + <artifactId>clformat</artifactId> + <packaging>jar</packaging> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <name>clformat</name> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>bjc</groupId> + <artifactId>BJC-Utils2</artifactId> + <version>1.0.0</version> + </dependency> + + <dependency> + <groupId>bjc</groupId> + <artifactId>inflexion</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>data/</directory> + + <includes> + <include>**/*.txt</include> + <include>**/*.sprop</include> + </includes> + </resource> + </resources> + <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) --> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> + + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>3.0.0</version> + </plugin> + <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging --> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>3.0.2</version> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.20.1</version> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>3.0.2</version> + </plugin> + <plugin> + <artifactId>maven-install-plugin</artifactId> + <version>2.5.2</version> + </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.2</version> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> diff --git a/clformat/src/main/java/bjc/App.java b/clformat/src/main/java/bjc/App.java new file mode 100644 index 0000000..ff1c4f9 --- /dev/null +++ b/clformat/src/main/java/bjc/App.java @@ -0,0 +1,13 @@ +package bjc; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff --git a/base/src/main/java/bjc/utils/ioutils/format/CLFormatter.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java index 9e01ca6..9e01ca6 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/CLFormatter.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLFormatter.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/CLModifiers.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLModifiers.java index 68127b6..68127b6 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/CLModifiers.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLModifiers.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/CLParameters.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java index bde7a7d..bde7a7d 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/CLParameters.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLParameters.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/EscapeException.java b/clformat/src/main/java/bjc/utils/ioutils/format/EscapeException.java index 086f1cd..086f1cd 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/EscapeException.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/EscapeException.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/AestheticDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/AestheticDirective.java index 9bad6d7..9bad6d7 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/AestheticDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/AestheticDirective.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java index 728bb43..728bb43 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java index 899e8e8..899e8e8 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CharacterDirective.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java index ed0b39b..ed0b39b 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/ConditionalDirective.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/Directive.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java index 61abfc1..61abfc1 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/Directive.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/Directive.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java index 74488ed..74488ed 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/EscapeDirective.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java index 3c02bfc..3c02bfc 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/FreshlineDirective.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java index 3eb741e..3eb741e 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/GeneralNumberDirective.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/GotoDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/GotoDirective.java index 7e30eab..7e30eab 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/GotoDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/GotoDirective.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java index 2ce6309..2ce6309 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/IterationDirective.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java index d833654..d833654 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/LiteralDirective.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java index 88b3e7e..88b3e7e 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/NumberDirective.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java index e8dd4b0..e8dd4b0 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RadixDirective.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java index 44a25ad..44a25ad 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/RecursiveDirective.java diff --git a/base/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java index d9136f2..d9136f2 100644 --- a/base/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java +++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/TabulateDirective.java diff --git a/clformat/src/test/java/bjc/AppTest.java b/clformat/src/test/java/bjc/AppTest.java new file mode 100644 index 0000000..6f70e21 --- /dev/null +++ b/clformat/src/test/java/bjc/AppTest.java @@ -0,0 +1,20 @@ +package bjc; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +/** + * Unit test for simple App. + */ +public class AppTest +{ + /** + * Rigorous Test :-) + */ + @Test + public void shouldAnswerWithTrue() + { + assertTrue( true ); + } +} diff --git a/base/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java b/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java index 08dfe78..08dfe78 100644 --- a/base/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java +++ b/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java @@ -1,5 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>bjc</groupId> @@ -20,5 +20,6 @@ <modules> <module>base</module> - </modules> -</project> + <module>clformat</module> + </modules> +</project>
\ No newline at end of file |
