X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Flauncher%2FMain.java;h=c3187a0591abefcd5dcd048e73e8dc3809f118c3;hb=450d662e747604c633e4e851840e6805780f0634;hp=997cdecc4842b0759b183bbdc243c32137c3a0fa;hpb=02b341aa6dcd14dc311f6ea218e199f20e242f36;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/launcher/Main.java b/src/be/nikiroo/jvcard/launcher/Main.java
index 997cdec..c3187a0 100644
--- a/src/be/nikiroo/jvcard/launcher/Main.java
+++ b/src/be/nikiroo/jvcard/launcher/Main.java
@@ -9,6 +9,7 @@ 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;
@@ -27,7 +28,7 @@ import be.nikiroo.jvcard.resources.Trans.StringId;
  */
 public class Main {
 	static public final String APPLICATION_TITLE = "jVcard";
-	static public final String APPLICATION_VERSION = "1.0-beta2-dev";
+	static public final String APPLICATION_VERSION = "1.0-beta3";
 
 	static private final int ERR_NO_FILE = 1;
 	static private final int ERR_SYNTAX = 2;
@@ -159,7 +160,7 @@ public class Main {
 					System.exit(ERR_SYNTAX);
 					return;
 				}
-
+				
 				i18nDir = args[index];
 			} else {
 				filesTried = true;
@@ -243,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;
@@ -265,12 +271,13 @@ public class Main {
 			remote = true;
 		}
 
-		Card card = null;
+		CardResult card = null;
 		try {
 			if (remote) {
-				card = Optional.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;