louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

closes #104

Browse Source
This commit is contained in:
Jochen Stärk
2019-07-21 17:55:41 +02:00
parent 24b27a9b51
commit b5a88460c8
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
History.md
View File

@@ -1,6 +1,7 @@
- migration: testIndicator entfernen - migration: testIndicator entfernen
- in ram:ExchangedDocument: ram:name entfernen - in ram:ExchangedDocument: ram:name entfernen
- updated javadoc - updated javadoc
- fixed #104 nullpointerex when specifying no parameter
1.7.2 1.7.2
===== =====

14
src/main/java/org/mustangproject/toecount/Toecount.java
View File

@@ -299,19 +299,19 @@ public class Toecount {
} }
// Retrieve all options // Retrieve all options
String action = parser.getOptionValue(actionOption);
String directoryName = parser.getOptionValue(dirnameOption); String directoryName = parser.getOptionValue(dirnameOption);
Boolean filesFromStdIn = parser.getOptionValue(filesFromStdInOption, Boolean.FALSE); Boolean filesFromStdIn = parser.getOptionValue(filesFromStdInOption, Boolean.FALSE);
Boolean combineRequested = parser.getOptionValue(combineOption, Boolean.FALSE); Boolean combineRequested = parser.getOptionValue(combineOption, Boolean.FALSE) || ((action!=null)&&(action.equals("combine")));
Boolean extractRequested = parser.getOptionValue(extractOption, Boolean.FALSE); Boolean extractRequested = parser.getOptionValue(extractOption, Boolean.FALSE) || ((action!=null)&&(action.equals("extract")));
Boolean helpRequested = parser.getOptionValue(helpOption, Boolean.FALSE); Boolean helpRequested = parser.getOptionValue(helpOption, Boolean.FALSE) || ((action!=null)&&(action.equals("help")));
Boolean upgradeRequested = parser.getOptionValue(upgradeOption, Boolean.FALSE); Boolean upgradeRequested = parser.getOptionValue(upgradeOption, Boolean.FALSE) || ((action!=null)&&(action.equals("upgrade")));
Boolean ignoreFileExt = parser.getOptionValue(ignoreFileExtOption, Boolean.FALSE); Boolean ignoreFileExt = parser.getOptionValue(ignoreFileExtOption, Boolean.FALSE);
Boolean a3only = parser.getOptionValue(a3onlyOption, Boolean.FALSE); Boolean a3only = parser.getOptionValue(a3onlyOption, Boolean.FALSE) || ((action!=null)&&(action.equals("a3")));
String sourceName = parser.getOptionValue(sourceOption); String sourceName = parser.getOptionValue(sourceOption);
String sourceXMLName = parser.getOptionValue(sourceXmlOption); String sourceXMLName = parser.getOptionValue(sourceXmlOption);
String outName = parser.getOptionValue(outOption); String outName = parser.getOptionValue(outOption);
String format = parser.getOptionValue(formatOption); String format = parser.getOptionValue(formatOption);
String action = parser.getOptionValue(actionOption);
String zugferdVersion = parser.getOptionValue(zugferdVersionOption); String zugferdVersion = parser.getOptionValue(zugferdVersionOption);
String zugferdProfile = parser.getOptionValue(zugferdProfileOption); String zugferdProfile = parser.getOptionValue(zugferdProfileOption);
@@ -327,7 +327,7 @@ public class Toecount {
performConvert(sourceName, outName); performConvert(sourceName, outName);
} else if (upgradeRequested) { } else if (upgradeRequested) {
performUpgrade(sourceName, outName); performUpgrade(sourceName, outName);
} else if (action.equals("visualize")) { } else if ((action!=null)&&(action.equals("visualize"))) {
performVisualization(sourceName, outName); performVisualization(sourceName, outName);
} else { } else {
// no argument or argument unknown // no argument or argument unknown