Java imports

cameo-api/src/main/java/fr/ill/ics/cameo/base/ConnectionChecker.java

@@ -16,7 +16,6 @@
 
 package fr.ill.ics.cameo.base;
 
-import fr.ill.ics.cameo.base.impl.ServerImpl;
 import fr.ill.ics.cameo.base.impl.TimeCondition;
 
 public class ConnectionChecker {

cameo-api/src/main/java/fr/ill/ics/cameo/base/EventStreamSocket.java

@@ -21,7 +21,6 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.ParseException;
 
 import fr.ill.ics.cameo.Zmq;
-import fr.ill.ics.cameo.base.impl.ServerImpl;
 import fr.ill.ics.cameo.messages.JSON;
 import fr.ill.ics.cameo.messages.Messages;
 

cameo-api/src/main/java/fr/ill/ics/cameo/base/EventThread.java

@@ -18,8 +18,6 @@ package fr.ill.ics.cameo.base;
 
 import java.util.concurrent.ConcurrentLinkedDeque;
 
-import fr.ill.ics.cameo.base.impl.ServerImpl;
-
 /**
  * The EventThread class forwards the events from the EventStreamSocket socket to the registered listeners.
  */

cameo-api/src/main/java/fr/ill/ics/cameo/base/Instance.java

@@ -7,7 +7,6 @@ import org.json.simple.parser.ParseException;
 
 import fr.ill.ics.cameo.base.impl.InstanceWaitingImpl;
 import fr.ill.ics.cameo.base.impl.Response;
-import fr.ill.ics.cameo.base.impl.ServerImpl;
 import fr.ill.ics.cameo.messages.Messages;
 import fr.ill.ics.cameo.strings.Endpoint;
 

cameo-api/src/main/java/fr/ill/ics/cameo/base/OutputStreamSocket.java

@@ -21,7 +21,6 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.ParseException;
 
 import fr.ill.ics.cameo.Zmq;
-import fr.ill.ics.cameo.base.impl.ServerImpl;
 import fr.ill.ics.cameo.messages.JSON;
 import fr.ill.ics.cameo.messages.Messages;
 

cameo-api/src/main/java/fr/ill/ics/cameo/base/impl/ServerImpl.java

-/*
- * Copyright 2015 Institut Laue-Langevin
- *
- * Licensed under the EUPL, Version 1.1 only (the "License");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- *
- * http://joinup.ec.europa.eu/software/page/eupl
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- */
-
-package fr.ill.ics.cameo.base.impl;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedDeque;
-
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.ParseException;
-
-import fr.ill.ics.cameo.Zmq;
-import fr.ill.ics.cameo.Zmq.Socket;
-import fr.ill.ics.cameo.base.Application;
-import fr.ill.ics.cameo.base.Application.State;
-import fr.ill.ics.cameo.base.Application.This;
-import fr.ill.ics.cameo.base.ConnectionTimeout;
-import fr.ill.ics.cameo.base.Context;
-import fr.ill.ics.cameo.base.EventListener;
-import fr.ill.ics.cameo.base.EventStreamSocket;
-import fr.ill.ics.cameo.base.Instance;
-import fr.ill.ics.cameo.base.InvalidArgumentException;
-import fr.ill.ics.cameo.base.Option;
-import fr.ill.ics.cameo.base.OutputStreamSocket;
-import fr.ill.ics.cameo.base.RequestSocket;
-import fr.ill.ics.cameo.base.SocketException;
-import fr.ill.ics.cameo.base.UndefinedApplicationException;
-import fr.ill.ics.cameo.base.UndefinedKeyException;
-import fr.ill.ics.cameo.base.WriteException;
-import fr.ill.ics.cameo.base.impl.zmq.ContextZmq;
-import fr.ill.ics.cameo.messages.JSON;
-import fr.ill.ics.cameo.messages.Messages;
-import fr.ill.ics.cameo.strings.Endpoint;
-
-/**
- * The server class is thread-safe except for the connect and terminate methods that must be called respectively 
- * before and after any concurrent calls.
- * @author legoc
- *
- */
-public class ServerImpl {
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-}
\ No newline at end of file

cameo-api/src/main/java/fr/ill/ics/cameo/coms/impl/PublisherImpl.java

@@ -20,8 +20,8 @@ import org.json.simple.JSONObject;
 
 import fr.ill.ics.cameo.Zmq;
 import fr.ill.ics.cameo.base.Application.This;
-import fr.ill.ics.cameo.base.impl.zmq.ContextZmq;
 import fr.ill.ics.cameo.base.RequestSocket;
+import fr.ill.ics.cameo.base.impl.zmq.ContextZmq;
 import fr.ill.ics.cameo.messages.JSON;
 import fr.ill.ics.cameo.messages.Messages;
 import fr.ill.ics.cameo.strings.Endpoint;

cameo-api/src/main/java/fr/ill/ics/cameo/coms/impl/RequesterImpl.java

@@ -22,8 +22,8 @@ import org.json.simple.JSONObject;
 
 import fr.ill.ics.cameo.Zmq;
 import fr.ill.ics.cameo.base.Application.This;
-import fr.ill.ics.cameo.base.impl.zmq.ContextZmq;
 import fr.ill.ics.cameo.base.RequestSocket;
+import fr.ill.ics.cameo.base.impl.zmq.ContextZmq;
 import fr.ill.ics.cameo.messages.JSON;
 import fr.ill.ics.cameo.messages.Messages;
 import fr.ill.ics.cameo.strings.Endpoint;

cameo-api/src/main/java/fr/ill/ics/cameo/coms/impl/ResponderImpl.java

@@ -20,8 +20,8 @@ import org.json.simple.JSONObject;
 
 import fr.ill.ics.cameo.Zmq;
 import fr.ill.ics.cameo.base.Application.This;
-import fr.ill.ics.cameo.base.impl.zmq.ContextZmq;
 import fr.ill.ics.cameo.base.RequestSocket;
+import fr.ill.ics.cameo.base.impl.zmq.ContextZmq;
 import fr.ill.ics.cameo.messages.JSON;
 import fr.ill.ics.cameo.messages.Messages;
 import fr.ill.ics.cameo.strings.Endpoint;