dorkbox
/
JavaBuilder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code polish

This commit is contained in:
nathan 2017-07-29 12:10:27 +02:00
parent b65f7eaaed
commit 7df0bdcc09
1 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/dorkbox/BuildVersion.java
View File

@ -223,6 +223,46 @@ class BuildVersion {
validate(file, null, origText, original.toString());
}
private static
void validate(final File file, final String precedingText, final String origText, final String expectedVersion) throws IOException {
if (file == null) {
throw new IOException("Unable to save the version information if the calling class is not detected.");
}
List<String> strings = FileUtil.read(file, true);
boolean hasPrecedingText = precedingText != null && !precedingText.isEmpty();
boolean foundPrecedingText = false;
boolean found = false;
if (hasPrecedingText) {
for (String string : strings) {
if (string.contains(precedingText)) {
foundPrecedingText = true;
}
if (foundPrecedingText && string.contains(origText)) {
found = true;
break;
}
}
}
else {
for (String string : strings) {
// the source string (in the file) cannot be "final", because "final" (if static) is inlined by the compiler.
if (string.contains(origText)) {
found = true;
break;
}
}
}
if (!found) {
throw new IOException("Expected version string/info '" + expectedVersion + "' NOT FOUND in '" + file +
"'. Check spacing/formatting and try again.");
}
}
/**
* Saves this file (if specified) and the README.md file (if specified)
@ -359,47 +399,6 @@ class BuildVersion {
}
}
private static
void validate(final File file, final String precedingText, final String origText, final String expectedVersion) throws IOException {
if (file == null) {
throw new IOException("Unable to save the version information if the calling class is not detected.");
}
List<String> strings = FileUtil.read(file, true);
boolean hasPrecedingText = precedingText != null && !precedingText.isEmpty();
boolean foundPrecedingText = false;
boolean found = false;
if (hasPrecedingText) {
for (String string : strings) {
if (string.contains(precedingText)) {
foundPrecedingText = true;
}
if (foundPrecedingText && string.contains(origText)) {
found = true;
break;
}
}
}
else {
for (String string : strings) {
// the source string (in the file) cannot be "final", because "final" (if static) is inlined by the compiler.
if (string.contains(origText)) {
found = true;
break;
}
}
}
if (!found) {
throw new IOException("Expected version string/info '" + expectedVersion + "' NOT FOUND in '" + file +
"'. Check spacing/formatting and try again.");
}
}
/**
* Gets the [MAJOR][MINOR] version from a string. The passed in string can start with letters/words, as the first digit is used.
*