X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Fremote%2FServer.java;h=6cba0c33cbb09047ed09f4004f88266e9ee4193d;hb=d5260eeb873fcf2ef9855dedcd9e2a3a3a990582;hp=ac29e972a562fe94685358c909221a9ffd38d119;hpb=59597d59aa262e31c2e1b7f66b4cb299f88ebd1b;p=jvcard.git diff --git a/src/be/nikiroo/jvcard/remote/Server.java b/src/be/nikiroo/jvcard/remote/Server.java index ac29e97..6cba0c3 100644 --- a/src/be/nikiroo/jvcard/remote/Server.java +++ b/src/be/nikiroo/jvcard/remote/Server.java @@ -18,9 +18,9 @@ import be.nikiroo.jvcard.Data; import be.nikiroo.jvcard.parsers.Format; import be.nikiroo.jvcard.parsers.Vcard21Parser; import be.nikiroo.jvcard.remote.SimpleSocket.BlockAppendable; -import be.nikiroo.jvcard.resources.StringUtils; -import be.nikiroo.jvcard.resources.bundles.RemoteBundle; -import be.nikiroo.jvcard.resources.enums.RemotingOption; +import be.nikiroo.jvcard.resources.RemoteBundle; +import be.nikiroo.jvcard.resources.RemotingOption; +import be.nikiroo.utils.StringUtils; /** * This class implements a small server that can listen for requests to @@ -34,7 +34,7 @@ import be.nikiroo.jvcard.resources.enums.RemotingOption; *

* * @author niki - * + * */ public class Server implements Runnable { private ServerSocket ss; @@ -131,8 +131,9 @@ public class Server implements Runnable { try { ss.open(false); - while (processCmd(ss)) - ; + while (processCmd(ss)) { + // nothing to do: process the command + } } catch (IOException e) { e.printStackTrace(); @@ -237,8 +238,9 @@ public class Server implements Runnable { try { s.sendLine(StringUtils.fromTime(file.lastModified())); - while (processLockedCmd(s, name)) - ; + while (processLockedCmd(s, name)) { + // nothing to do: process the command + } } catch (InvalidParameterException e) { System.err .println("Unsupported command received from a client connection, closing it: " @@ -341,8 +343,9 @@ public class Server implements Runnable { } else { Card card = new Card(vcf, Format.VCard21); try { - while (processContactCmd(s, card)) - ; + while (processContactCmd(s, card)) { + // nothing to do: process the command + } card.save(); s.sendLine(StringUtils.fromTime(card.getLastModified())); } catch (InvalidParameterException e) { @@ -435,8 +438,9 @@ public class Server implements Runnable { throw new InvalidParameterException( "Cannot find contact to modify for UID: " + uid); } - while (processDataCmd(s, contact)) - ; + while (processDataCmd(s, contact)) { + // nothing to do: process the command + } break; } case DELETE_CONTACT: {