The code.ill.fr has been recreated and upgraded with the latest version this weekend, If you encounter any problem please inform the Helpdesk.

Commit 073d5391 authored by legoc's avatar legoc
Browse files

Adapted to NomadCommandSystem

parent d82df947
...@@ -40,6 +40,12 @@ ...@@ -40,6 +40,12 @@
<dependencies> <dependencies>
<dependency>
<groupId>com.interactivemesh</groupId>
<artifactId>stlmeshimporter</artifactId>
<version>0.7.0</version>
</dependency>
<dependency> <dependency>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-base</artifactId> <artifactId>javafx-base</artifactId>
...@@ -58,8 +64,12 @@ ...@@ -58,8 +64,12 @@
<version>14.0.1</version> <version>14.0.1</version>
</dependency> </dependency>
<!-- <dependency> <groupId>fr.ill.ics</groupId> <artifactId>nomadcommandsystem</artifactId> <dependency>
<version>4.0.19</version> </dependency> --> <groupId>fr.ill.ics</groupId>
<artifactId>nomadcommandsystem</artifactId>
<version>4.0.36</version>
</dependency>
<dependency> <dependency>
<groupId>org.zeroturnaround</groupId> <groupId>org.zeroturnaround</groupId>
<artifactId>zt-zip</artifactId> <artifactId>zt-zip</artifactId>
......
...@@ -10,6 +10,8 @@ import fr.ill.ics.bridge.LoginManager; ...@@ -10,6 +10,8 @@ import fr.ill.ics.bridge.LoginManager;
import fr.ill.ics.bridge.LoginManager.ClientAlreadyLaunchedException; import fr.ill.ics.bridge.LoginManager.ClientAlreadyLaunchedException;
import fr.ill.ics.bridge.LoginManager.ConnectionFailure; import fr.ill.ics.bridge.LoginManager.ConnectionFailure;
import fr.ill.ics.bridge.LoginManager.LoginIncorrectException; import fr.ill.ics.bridge.LoginManager.LoginIncorrectException;
import fr.ill.ics.bridge.LoginManager.MultipleClientsPerEndpointNotAllowedException;
import fr.ill.ics.bridge.LoginManager.MultipleConnectionsPerUserNotAllowedException;
import fr.ill.ics.bridge.command.CommandZoneWrapper; import fr.ill.ics.bridge.command.CommandZoneWrapper;
import fr.ill.ics.cameo.Application; import fr.ill.ics.cameo.Application;
import fr.ill.ics.core.property.PropertyManager; import fr.ill.ics.core.property.PropertyManager;
...@@ -156,7 +158,7 @@ public class NomadLinker { ...@@ -156,7 +158,7 @@ public class NomadLinker {
loginState = LOGIN_OK; loginState = LOGIN_OK;
} catch (LoginIncorrectException e) { } catch (LoginIncorrectException e) {
loginState = LOGIN_NOT_OK; loginState = LOGIN_NOT_OK;
} catch (ClientAlreadyLaunchedException e) { } catch (MultipleClientsPerEndpointNotAllowedException | MultipleConnectionsPerUserNotAllowedException e) {
loginState = LOGIN_REFUSED; loginState = LOGIN_REFUSED;
} catch (ConnectionFailure e) { } catch (ConnectionFailure e) {
Platform.exit(); Platform.exit();
......
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