X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Fremote%2FServer.java;h=962f2d00133069eee26205f97e23205373b86e44;hb=e119a1c1a924998b9315e46c96b1c750aab1deb9;hp=08091f6ea352e59cd96e5ec2a59032650eaea65c;hpb=e4444b0bc462544629d9e7e7ab62b96a4d9cab10;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/remote/Server.java b/src/be/nikiroo/jvcard/remote/Server.java
index 08091f6..962f2d0 100644
--- a/src/be/nikiroo/jvcard/remote/Server.java
+++ b/src/be/nikiroo/jvcard/remote/Server.java
@@ -11,15 +11,15 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.ResourceBundle;
 
 import be.nikiroo.jvcard.Card;
 import be.nikiroo.jvcard.Contact;
 import be.nikiroo.jvcard.Data;
 import be.nikiroo.jvcard.parsers.Format;
 import be.nikiroo.jvcard.parsers.Vcard21Parser;
-import be.nikiroo.jvcard.resources.Bundles;
 import be.nikiroo.jvcard.resources.StringUtils;
+import be.nikiroo.jvcard.resources.bundles.RemoteBundle;
+import be.nikiroo.jvcard.resources.enums.RemotingOption;
 
 /**
  * This class implements a small server that can listen for requests to
@@ -58,9 +58,9 @@ public class Server implements Runnable {
 	 */
 	public Server(int port) throws IOException {
 		this.port = port;
-		ResourceBundle bundle = Bundles.getBundle("remote");
+		RemoteBundle bundle = new RemoteBundle();
 		try {
-			String dir = bundle.getString("SERVER_DATA_PATH");
+			String dir = bundle.getString(RemotingOption.SERVER_DATA_PATH);
 			dataDir = new File(dir);
 			dataDir.mkdir();
 
@@ -453,7 +453,7 @@ public class Server implements Runnable {
 			if (contact == null) {
 				s.sendBlock();
 			} else {
-				s.sendLine(contact.getContentState());
+				s.sendLine(contact.getContentState(true));
 			}
 			break;
 		}
@@ -464,7 +464,8 @@ public class Server implements Runnable {
 						|| (contact.getPreferredDataValue("FN") + contact
 								.getPreferredDataValue("N")).toLowerCase()
 								.contains(cmd.getParam().toLowerCase())) {
-					s.send(contact.getContentState() + " " + contact.getId());
+					s.send(contact.getContentState(true) + " "
+							+ contact.getId());
 				}
 			}
 			s.sendBlock();
@@ -527,7 +528,7 @@ public class Server implements Runnable {
 			String cstate = cmd.getParam();
 			Data data = null;
 			for (Data d : contact) {
-				if (cstate.equals(d.getContentState()))
+				if (cstate.equals(d.getContentState(true)))
 					data = d;
 			}
 
@@ -543,7 +544,7 @@ public class Server implements Runnable {
 			String cstate = cmd.getParam();
 			Data data = null;
 			for (Data d : contact) {
-				if (cstate.equals(d.getContentState()))
+				if (cstate.equals(d.getContentState(true)))
 					data = d;
 			}
 
@@ -559,7 +560,7 @@ public class Server implements Runnable {
 		case HASH_DATA: {
 			for (Data data : contact) {
 				if (data.getId().equals(cmd.getParam())) {
-					s.send(data.getContentState());
+					s.send(data.getContentState(true));
 				}
 			}
 			s.sendBlock();
@@ -571,7 +572,7 @@ public class Server implements Runnable {
 						|| cmd.getParam().length() == 0
 						|| data.getName().toLowerCase()
 								.contains(cmd.getParam().toLowerCase())) {
-					s.send(data.getContentState() + " " + data.getName());
+					s.send(data.getContentState(true) + " " + data.getName());
 				}
 			}
 			s.sendBlock();