Commit 5e36a0a8 authored by SAPONE Alann's avatar SAPONE Alann

Auto connect to JMMC launcher

parent 0d5ed633
......@@ -8,4 +8,5 @@ ExternalLibraries
myKeystore
star_lam_fr.csr
star_lam_fr.jks
centre_national_de_la_recherche_scientifique.p7b
\ No newline at end of file
centre_national_de_la_recherche_scientifique.p7b
sign_jar.sh
\ No newline at end of file
......@@ -69,6 +69,7 @@ import org.cnrs.lam.dis.etc.ui.SiteListener;
import org.cnrs.lam.dis.etc.ui.SourceListener;
import org.cnrs.lam.dis.etc.ui.UIFactory;
import org.cnrs.lam.dis.etc.ui.UIManager;
import org.cnrs.lam.dis.etc.ui.generic.SampListenerHolder;
import org.cnrs.lam.dis.etc.ui.swing.SplashScreen;
import org.cnrs.lam.dis.etc.ui.swing.importer.FileImportWorker;
......@@ -246,6 +247,9 @@ public class ETC42 {
if (Installer.isNewDatabase() && System.getProperty("etc.fixtures") == null) {
uiManager.handleFirstInstallation();
}
// Connects to the SAMP hub for the VO Launcher
SampListenerHolder.getSampListener().connectToLauncher();
}
/**
......
......@@ -58,6 +58,15 @@ public class SampUiListener implements SampListener {
this.sampController = sampController;
this.messenger = messenger;
}
@Override
public void connectToLauncher() {
try {
sampController.connect();
} catch (SampException ex) {
logger.error("Failed to connect to Launcher SAMP hub", ex);
}
}
@Override
public void connect() {
......
......@@ -47,4 +47,6 @@ public interface SampListener {
public void sendAsVoTable(String description, Map<? extends Number, ? extends Number> data, String xUnit, String yUnit);
void connectToLauncher();
}
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