X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Flauncher%2FMain.java;h=06c55c655819b8517c13fa55dd44141556e90e46;hb=5ad0e17e7fea1c602cb2638a006424af9c7e33e8;hp=925ade4a4e23a0133385162cf4a03297a0fca5de;hpb=845fb1d7c3adc0d6cdf9465c0e983ba447cfab6d;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/launcher/Main.java b/src/be/nikiroo/jvcard/launcher/Main.java
index 925ade4..06c55c6 100644
--- a/src/be/nikiroo/jvcard/launcher/Main.java
+++ b/src/be/nikiroo/jvcard/launcher/Main.java
@@ -3,14 +3,13 @@ package be.nikiroo.jvcard.launcher;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.Socket;
 import java.nio.charset.Charset;
 import java.util.LinkedList;
 import java.util.List;
 
 import be.nikiroo.jvcard.Card;
+import be.nikiroo.jvcard.launcher.CardResult.MergeCallback;
 import be.nikiroo.jvcard.parsers.Format;
 import be.nikiroo.jvcard.remote.Command;
 import be.nikiroo.jvcard.remote.SimpleSocket;
@@ -205,7 +204,7 @@ public class Main {
 
 		if (port != null) {
 			try {
-				runServer(port);
+				Optional.runServer(port);
 			} catch (Exception e) {
 				if (e instanceof IOException) {
 					System.err
@@ -225,7 +224,7 @@ public class Main {
 			}
 		} else {
 			try {
-				startTui(textMode, files);
+				Optional.startTui(textMode, files);
 			} catch (Exception e) {
 				if (e instanceof IOException) {
 					System.err
@@ -245,13 +244,18 @@ public class Main {
 	 * @param input
 	 *            a filename or a remote jvcard url with named resource (e.g.:
 	 *            <tt>jvcard://localhost:4444/coworkers.vcf</tt>)
+	 * @param callback
+	 *            the {@link MergeCallback} to call in case of conflict, or NULL
+	 *            to disallow conflict management (the {@link Card} will not be
+	 *            allowed to synchronise in case of conflicts)
 	 * 
 	 * @return the {@link Card}
 	 * 
 	 * @throws IOException
 	 *             in case of IO error or remoting not available
 	 */
-	static public Card getCard(String input) throws IOException {
+	static public CardResult getCard(String input, MergeCallback callback)
+			throws IOException {
 		boolean remote = false;
 		Format format = Format.Abook;
 		String ext = input;
@@ -267,12 +271,13 @@ public class Main {
 			remote = true;
 		}
 
-		Card card = null;
+		CardResult card = null;
 		try {
 			if (remote) {
-				card = syncCard(input);
+				card = Optional.syncCard(input, callback);
 			} else {
-				card = new Card(new File(input), format);
+				card = new CardResult(new Card(new File(input), format), false,
+						false, false);
 			}
 		} catch (IOException ioe) {
 			throw ioe;
@@ -283,121 +288,6 @@ public class Main {
 		return card;
 	}
 
-	/**
-	 * Create a new jVCard server on the given port, then run it.
-	 * 
-	 * @param port
-	 *            the port to run on
-	 *
-	 * @throws SecurityException
-	 *             in case of internal error
-	 * @throws NoSuchMethodException
-	 *             in case of internal error
-	 * @throws ClassNotFoundException
-	 *             in case of internal error
-	 * @throws IllegalAccessException
-	 *             in case of internal error
-	 * @throws InstantiationException
-	 *             in case of internal error
-	 * @throws InvocationTargetException
-	 *             in case of internal error
-	 * @throws IllegalArgumentException
-	 *             in case of internal error
-	 * @throws IOException
-	 *             in case of IO error
-	 */
-	@SuppressWarnings("unchecked")
-	static private void runServer(int port) throws NoSuchMethodException,
-			SecurityException, ClassNotFoundException, InstantiationException,
-			IllegalAccessException, IllegalArgumentException,
-			InvocationTargetException {
-		@SuppressWarnings("rawtypes")
-		Class serverClass = Class.forName("be.nikiroo.jvcard.remote.Server");
-		Method run = serverClass.getDeclaredMethod("run", new Class[] {});
-		run.invoke(serverClass.getConstructor(int.class).newInstance(port));
-	}
-
-	/**
-	 * Start the TUI program.
-	 * 
-	 * @param textMode
-	 *            TRUE to force text mode, FALSE to force the Swing terminal
-	 *            emulator, null to automatically determine the best choice
-	 * @param files
-	 *            the files to show at startup
-	 * 
-	 * @throws SecurityException
-	 *             in case of internal error
-	 * @throws NoSuchMethodException
-	 *             in case of internal error
-	 * @throws ClassNotFoundException
-	 *             in case of internal error
-	 * @throws IllegalAccessException
-	 *             in case of internal error
-	 * @throws InstantiationException
-	 *             in case of internal error
-	 * @throws InvocationTargetException
-	 *             in case of internal error
-	 * @throws IllegalArgumentException
-	 *             in case of internal error
-	 * @throws IOException
-	 *             in case of IO error
-	 */
-	@SuppressWarnings("unchecked")
-	static private void startTui(Boolean textMode, List<String> files)
-			throws NoSuchMethodException, SecurityException,
-			ClassNotFoundException, InstantiationException,
-			IllegalAccessException, IllegalArgumentException,
-			InvocationTargetException {
-		@SuppressWarnings("rawtypes")
-		Class launcherClass = Class
-				.forName("be.nikiroo.jvcard.tui.TuiLauncher");
-		Method start = launcherClass.getDeclaredMethod("start", new Class[] {
-				Boolean.class, List.class });
-		start.invoke(launcherClass.newInstance(), textMode, files);
-	}
-
-	/**
-	 * Return the {@link Card} corresponding to the given URL, synchronised if
-	 * necessary.
-	 * 
-	 * @param input
-	 *            the jvcard:// with resource name URL (e.g.:
-	 *            <tt>jvcard://localhost:4444/coworkers</tt>)
-	 * 
-	 * @throws SecurityException
-	 *             in case of internal error
-	 * @throws NoSuchMethodException
-	 *             in case of internal error
-	 * @throws ClassNotFoundException
-	 *             in case of internal error
-	 * @throws IllegalAccessException
-	 *             in case of internal error
-	 * @throws InstantiationException
-	 *             in case of internal error
-	 * @throws InvocationTargetException
-	 *             in case of internal error
-	 * @throws IllegalArgumentException
-	 *             in case of internal error
-	 * @throws IOException
-	 *             in case of IO error
-	 */
-	@SuppressWarnings("unchecked")
-	static private Card syncCard(String input) throws ClassNotFoundException,
-			NoSuchMethodException, SecurityException, InstantiationException,
-			IllegalAccessException, IllegalArgumentException,
-			InvocationTargetException, IOException {
-		@SuppressWarnings("rawtypes")
-		Class syncClass = Class.forName("be.nikiroo.jvcard.remote.Sync");
-		Method sync = syncClass.getDeclaredMethod("sync",
-				new Class[] { boolean.class });
-
-		Object o = syncClass.getConstructor(String.class).newInstance(input);
-		Card card = (Card) sync.invoke(o, false);
-
-		return card;
-	}
-
 	/**
 	 * Open the given path and add all its files if it is a directory or just
 	 * this one if not to the returned list.