Commit daaceb2d authored by Hélène Ortiz's avatar Hélène Ortiz

--no commit message

--no commit message
parent f9f25fdd
......@@ -7,5 +7,6 @@
<classpathentry kind="lib" path="lib64/logkit-2.0.jar"/>
<classpathentry kind="lib" path="lib64/protobuf-2.5.0.jar"/>
<classpathentry kind="lib" path="lib64/nappli-java-api.jar"/>
<classpathentry kind="lib" path="lib64/jeromq-0.3.5.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
......@@ -17,7 +17,7 @@
*/
package fr.ill.ics.bridge;
import fr.ill.ics.nappli.remote.Application.Future;
import fr.ill.ics.nappli.remote.Application.Instance;
import fr.ill.ics.nappli.remote.ConnectionTimeout;
import fr.ill.ics.nappli.remote.Server;
......@@ -31,7 +31,7 @@ public class LogViewerManager {
private final static String LOGVIEWER_APPLICATION_NAME = "nlv";
private static LogViewerManager instance = null;
private Server server;
private Future nomadLogViewer;
private Instance nomadLogViewer;
/**
* The constructor must not be instantiated directly.
......@@ -56,7 +56,7 @@ public class LogViewerManager {
public void start(String authentication, String cycleId, long instrumentId, long proposalId) {
String[] headers = new String[] {cycleId, instrumentId+"", proposalId+"", authentication};
System.out.println("starting log viewer with nappli [" + cycleId + ", " + instrumentId + ", " + proposalId + ", " + authentication + "]");
System.out.println("headers length " + headers.length);
// Connect to the server
......@@ -66,7 +66,7 @@ public class LogViewerManager {
// Start nomad log viewer
try {
nomadLogViewer = server.start(LOGVIEWER_APPLICATION_NAME, headers);
if (nomadLogViewer.exists()) {
System.out.println("started " + nomadLogViewer);
}
......@@ -80,13 +80,13 @@ public class LogViewerManager {
public void stop() {
if (nomadLogViewer != null) {
System.out.println("stopping application " + nomadLogViewer.getNameId());
nomadLogViewer.stop();
nomadLogViewer = null;
// A déplacer sur la fermeture de NomadGUI !!!!!!
server.terminate();
System.out.println("stopping application " + nomadLogViewer.getNameId());
nomadLogViewer.stop();
nomadLogViewer = null;
// A déplacer sur la fermeture de NomadGUI !!!!!!
server.terminate();
}
}
}
......@@ -95,7 +95,7 @@ public class ServerDisconnected extends ServerConnectionState {
// start nomad server
try {
Application.Future nomad = server.start("ns");
Application.Instance nomad = server.start("ns");
if (nomad.exists()) {
System.out.println("started " + nomad);
}
......
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