Commit bc8c2ca7 authored by legoc's avatar legoc
Browse files

Moved classes

parent 314b7de6
......@@ -5,7 +5,6 @@ import java.util.Set;
import org.json.simple.JSONObject;
import org.json.simple.parser.ParseException;
import fr.ill.ics.cameo.base.impl.Response;
import fr.ill.ics.cameo.messages.Messages;
import fr.ill.ics.cameo.strings.Endpoint;
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
package fr.ill.ics.cameo.base.impl;
package fr.ill.ics.cameo.base;
public class Response {
......
......@@ -29,7 +29,6 @@ import org.json.simple.JSONObject;
import org.json.simple.parser.ParseException;
import fr.ill.ics.cameo.base.Application.State;
import fr.ill.ics.cameo.base.impl.Response;
import fr.ill.ics.cameo.base.impl.zmq.ContextZmq;
import fr.ill.ics.cameo.messages.JSON;
import fr.ill.ics.cameo.messages.Messages;
......@@ -296,7 +295,7 @@ public class Server {
* @return null, if reply is null, else Response
* @throws ConnectionTimeout
*/
private fr.ill.ics.cameo.base.impl.Response startApplication(String name, String[] args) throws ConnectionTimeout {
private Response startApplication(String name, String[] args) throws ConnectionTimeout {
JSONObject request;
......@@ -309,7 +308,7 @@ public class Server {
JSONObject response = requestSocket.requestJSON(request);
return new fr.ill.ics.cameo.base.impl.Response(JSON.getInt(response, Messages.RequestResponse.VALUE), JSON.getString(response, Messages.RequestResponse.MESSAGE));
return new Response(JSON.getInt(response, Messages.RequestResponse.VALUE), JSON.getString(response, Messages.RequestResponse.MESSAGE));
}
public int getStreamPort(String name) throws ConnectionTimeout {
......@@ -391,8 +390,7 @@ public class Server {
* @return null, if reply is null, else Response
* @throws ConnectionTimeout
*/
//TODO remove public
public fr.ill.ics.cameo.base.impl.Response stopApplicationAsynchronously(int id, boolean immediately) throws ConnectionTimeout {
Response stopApplicationAsynchronously(int id, boolean immediately) throws ConnectionTimeout {
JSONObject request;
......@@ -405,7 +403,7 @@ public class Server {
JSONObject response = requestSocket.requestJSON(request);
return new fr.ill.ics.cameo.base.impl.Response(id, JSON.getString(response, Messages.RequestResponse.MESSAGE));
return new Response(id, JSON.getString(response, Messages.RequestResponse.MESSAGE));
}
public void killAllAndWaitFor(String name) {
......@@ -847,13 +845,6 @@ public class Server {
return ports;
}
@Override
public String toString() {
return "server@" + serverEndpoint;
}
/**
* Creates a connection checker.
* @param handler
......@@ -880,5 +871,10 @@ public class Server {
return connectionChecker;
}
@Override
public String toString() {
return "server@" + serverEndpoint;
}
}
\ No newline at end of file
......@@ -21,6 +21,7 @@ import org.json.simple.JSONObject;
import org.json.simple.parser.ParseException;
import fr.ill.ics.cameo.Zmq;
import fr.ill.ics.cameo.base.CancelIdGenerator;
import fr.ill.ics.cameo.base.Event;
import fr.ill.ics.cameo.base.KeyEvent;
import fr.ill.ics.cameo.base.PortEvent;
......@@ -29,7 +30,6 @@ import fr.ill.ics.cameo.base.ResultEvent;
import fr.ill.ics.cameo.base.Server;
import fr.ill.ics.cameo.base.StatusEvent;
import fr.ill.ics.cameo.base.UnexpectedException;
import fr.ill.ics.cameo.base.impl.CancelIdGenerator;
import fr.ill.ics.cameo.base.impl.EventStreamSocketImpl;
import fr.ill.ics.cameo.messages.JSON;
import fr.ill.ics.cameo.messages.Messages;
......
......@@ -22,9 +22,9 @@ import org.json.simple.parser.ParseException;
import fr.ill.ics.cameo.Zmq;
import fr.ill.ics.cameo.base.Application;
import fr.ill.ics.cameo.base.CancelIdGenerator;
import fr.ill.ics.cameo.base.Server;
import fr.ill.ics.cameo.base.UnexpectedException;
import fr.ill.ics.cameo.base.impl.CancelIdGenerator;
import fr.ill.ics.cameo.base.impl.OutputStreamSocketImpl;
import fr.ill.ics.cameo.messages.JSON;
import fr.ill.ics.cameo.messages.Messages;
......
......@@ -20,11 +20,11 @@ import org.json.simple.JSONObject;
import fr.ill.ics.cameo.Zmq;
import fr.ill.ics.cameo.base.Application;
import fr.ill.ics.cameo.base.CancelIdGenerator;
import fr.ill.ics.cameo.base.ConnectionTimeout;
import fr.ill.ics.cameo.base.Instance;
import fr.ill.ics.cameo.base.RequestSocket;
import fr.ill.ics.cameo.base.This;
import fr.ill.ics.cameo.base.impl.CancelIdGenerator;
import fr.ill.ics.cameo.base.impl.zmq.ContextZmq;
import fr.ill.ics.cameo.messages.JSON;
import fr.ill.ics.cameo.messages.Messages;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment