git://git.nikiroo.be
/
jvcard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ContactDetailsRaw: list of types on ADD + Main: better syserr
[jvcard.git]
/
src
/
be
/
nikiroo
/
jvcard
/
launcher
/
Main.java
diff --git
a/src/be/nikiroo/jvcard/launcher/Main.java
b/src/be/nikiroo/jvcard/launcher/Main.java
index f96e5581b05f99c12f69c3af4603284f4065815f..6d552febfae8c16955cde0ad95480f32ef5bdc40 100644
(file)
--- a/
src/be/nikiroo/jvcard/launcher/Main.java
+++ b/
src/be/nikiroo/jvcard/launcher/Main.java
@@
-288,12
+288,17
@@
public class Main {
Optional.runServer(port);
} catch (Exception e) {
if (e instanceof IOException) {
Optional.runServer(port);
} catch (Exception e) {
if (e instanceof IOException) {
- System.err
- .println("I/O Exception: Cannot start the server");
- } else {
+ ERR(StringId.CLI_ERR, StringId.CLI_ERR_CANNOT_START,
+ ERR_INTERNAL);
+ return;
+ } else if (e instanceof ClassNotFoundException) {
ERR(StringId.CLI_ERR, StringId.CLI_ERR_NO_REMOTING,
ERR_INTERNAL);
return;
ERR(StringId.CLI_ERR, StringId.CLI_ERR_NO_REMOTING,
ERR_INTERNAL);
return;
+ } else {
+ e.printStackTrace();
+ ERR(StringId.CLI_ERR, StringId.CLI_ERR, ERR_INTERNAL);
+ return;
}
}
break;
}
}
break;
@@
-302,9
+307,9
@@
public class Main {
try {
transService.updateFile(dir);
} catch (IOException e) {
try {
transService.updateFile(dir);
} catch (IOException e) {
-
System.err.println(trans(
StringId.CLI_ERR_CANNOT_CREATE_LANG,
-
dir)
);
-
e.printStackTrace()
;
+
ERR(StringId.CLI_ERR,
StringId.CLI_ERR_CANNOT_CREATE_LANG,
+
ERR_INTERNAL
);
+
return
;
}
break;
}
}
break;
}
@@
-392,9
+397,13
@@
public class Main {
ERR(StringId.CLI_ERR, StringId.CLI_ERR_CANNOT_START,
ERR_NO_FILE);
return;
ERR(StringId.CLI_ERR, StringId.CLI_ERR_CANNOT_START,
ERR_NO_FILE);
return;
- } else {
+ } else
if (e instanceof ClassNotFoundException)
{
ERR(StringId.CLI_ERR, StringId.CLI_ERR_NO_TUI, ERR_INTERNAL);
return;
ERR(StringId.CLI_ERR, StringId.CLI_ERR_NO_TUI, ERR_INTERNAL);
return;
+ } else {
+ e.printStackTrace();
+ ERR(StringId.CLI_ERR, StringId.CLI_ERR, ERR_INTERNAL);
+ return;
}
}
break;
}
}
break;