Skip to content

Test branch felicity #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 1, 2024
Merged

Test branch felicity #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f3361d
Minor refactoring to test new branch
May 1, 2024
e282979
Minor refactoring for testing new branch
newellf May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qsplit/src/org/qcmg/split/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public final class Main {
private static boolean performLogging = true; // Default to true
private static QLogger logger;

public static void main(final String[] args) throws URISyntaxException, IOException, ClassNotFoundException {
public static void main(final String[] args) {
try {
Options options = new Options(args);
if (options.hasHelpOption()) {
Expand Down
8 changes: 4 additions & 4 deletions qsplit/src/org/qcmg/split/SingleLevelSplit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ private void checkSingleSplitMap() throws SplitException {
StringBuilder sb = new StringBuilder();
for (Integer zc : zcToFileNameMap.keySet()) {
if ( ! singleSplitMap.containsKey(zc)) {
if (sb.length() > 0) sb.append('\n');
if (!sb.isEmpty()) sb.append('\n');
sb.append("no entry in singleSplitMap for zc: ").append(zc);
}
}
if (sb.length() != 0) {
if (!sb.isEmpty()) {
logger.error(sb.toString());
throw new SplitException(sb.toString());
}
Expand All @@ -142,12 +142,12 @@ private void checkSingleSplitMap(List<String> inputs) throws SplitException {
StringBuilder sb = new StringBuilder();
for (Entry<Integer, String> entry : singleSplitMap.entrySet()) {
if (entry.getValue().equals(input)) {
if (sb.length() > 0) sb.append('\n');
if (!sb.isEmpty()) sb.append('\n');

sb.append(zcToFileNameMap.get(entry.getKey()));
}
}
if (sb.length() == 0) {
if (sb.isEmpty()) {
logger.error("Could not find zc's for input: " + input);
throw new SplitException("Could not find zc's for input: " + input);
} else {
Expand Down