X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Flauncher%2FMain.java;h=6d552febfae8c16955cde0ad95480f32ef5bdc40;hb=d459d7e12a3398344e021b1b12c94a8d647cb6c4;hp=65fbf9c635f51d4a097ca16604680faabe63c3eb;hpb=a1783d00d03245556a833bc02fbe2865225c2501;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/launcher/Main.java b/src/be/nikiroo/jvcard/launcher/Main.java
index 65fbf9c..6d552fe 100644
--- 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) {
-					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;
+				} else {
+					e.printStackTrace();
+					ERR(StringId.CLI_ERR, StringId.CLI_ERR, ERR_INTERNAL);
+					return;
 				}
 			}
 			break;
@@ -302,9 +307,9 @@ public class Main {
 			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;
 		}
@@ -392,9 +397,13 @@ public class Main {
 					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;
+				} else {
+					e.printStackTrace();
+					ERR(StringId.CLI_ERR, StringId.CLI_ERR, ERR_INTERNAL);
+					return;
 				}
 			}
 			break;
@@ -429,7 +438,8 @@ public class Main {
 					+ trans(StringId.CLI_HELP_LANG));
 			System.out.println("\t--tui : " + trans(StringId.CLI_HELP_TUI));
 			System.out.println("\t--gui : " + trans(StringId.CLI_HELP_GUI));
-			System.out.println("\t--noutf : " + trans(StringId.CLI_HELP_NOUTF));
+			System.out.println("\t--noutf : "
+					+ trans(StringId.CLI_HELP_NOUTF_OPTION));
 			System.out.println("\t--config : "
 					+ trans(StringId.CLI_HELP_CONFIG));
 			System.out.println();
@@ -500,7 +510,7 @@ public class Main {
 					Data name = contact.getPreferredData("FN");
 					if (name == null || name.getValue().length() == 0
 							|| forceComputedFn) {
-						name.setValue(contact.toString(defaultFn, ""));
+						name.setValue(contact.toString(defaultFn, "").trim());
 					}
 				}
 			} catch (Exception e) {