Skip to content

Commit 5284d88

Browse files
committed
Problems resulting from headless nonsense
1 parent 3ee2a82 commit 5284d88

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

src/main/java/js/app/App.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public abstract class App extends BaseObject {
4141

4242
@Deprecated
4343
public void setCustomArgs(String spaceDelimitedArgs) {
44-
if (alert("using custom args: " + spaceDelimitedArgs)) {
44+
if (alert("<1using custom args: " + spaceDelimitedArgs)) {
4545
mCustomArgs = DataUtil.toStringArray(split(spaceDelimitedArgs, ' '));
4646
}
4747
}
@@ -106,6 +106,7 @@ public final void startApplication(String[] cmdLineArguments) {
106106
protected abstract void registerOperations();
107107

108108
protected void registerOper(AppOper oper) {
109+
checkNotNull(oper.userCommand());
109110
AppOper previousMapping = mOperMap.put(oper.userCommand(), oper);
110111
checkState(previousMapping == null, "duplicate operation key:", oper.userCommand());
111112
mOrderedOperCommands.add(oper.userCommand());
@@ -228,6 +229,8 @@ private void defineCommandLineArgs(CmdLineArgs args) {
228229
var hf = new HelpFormatter();
229230
for (String key : mOrderedOperCommands) {
230231
AppOper oper = findOper(key);
232+
var cmd = oper.userCommand();
233+
checkNonEmpty(cmd, "no userCommand() found for oper:", oper);
231234
hf.addItem(oper.userCommand(), oper.shortHelp());
232235
}
233236
var help = hf.toString();
@@ -246,7 +249,7 @@ private void defineCommandLineArgs(CmdLineArgs args) {
246249
sb.append("\nUsage: " + DataUtil.convertUnderscoresToCamelCase(name()));
247250
sb.append(help);
248251
}
249-
252+
250253
cmdLineArgs().banner(sb.toString());
251254
}
252255

src/main/java/js/file/Files.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1293,7 +1293,7 @@ public static BufferedInputStream openResource(Class theClass, String resourceNa
12931293
throw die("stream returned null");
12941294
return new BufferedInputStream(is);
12951295
} catch (Throwable e) {
1296-
pr("Failed to open resource for class:", theClass, "name:", resourceName);
1296+
// pr("Failed to open resource for class:", theClass, "name:", resourceName);
12971297
throw asFileException(e);
12981298
}
12991299
}

src/main/java/js/system/SystemUtil.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ public static boolean consoleAppFlag() {
165165
public static void setConsoleAppFlag(boolean consoleAppFlag) {
166166
checkState(sConsoleAppFlag == null || sConsoleAppFlag == consoleAppFlag,
167167
"console app flag has already been set to", sConsoleAppFlag);
168+
if (sConsoleAppFlag != null)
169+
return;
168170
sConsoleAppFlag = consoleAppFlag;
169171
if (consoleAppFlag)
170172
System.setProperty("java.awt.headless", "true");

0 commit comments

Comments
 (0)