retropedalage

pom.xml

@@ -140,7 +140,7 @@
 		<dependency>
 			<groupId>fr.ill.ics</groupId>
 			<artifactId>nomadcommandsystem</artifactId>
-			<version>4.0.16</version>
+			<version>4.0.17</version>
 		</dependency>
 		
 		<!-- **************************************************************** JFACE	**************************************************************** 

src/main/java/fr/ill/ics/client/control/command/ServerCommandZone.java

@@ -30,7 +30,6 @@ import fr.ill.ics.bridge.command.CommandZoneWrapper;
 import fr.ill.ics.bridge.command.ControlCommandWrapper;
 import fr.ill.ics.bridge.command.ForLoopCommandWrapper;
 import fr.ill.ics.bridge.command.GenericCommandWrapper;
-import fr.ill.ics.bridge.command.ICommandLineSyncEventListener;
 import fr.ill.ics.bridge.command.IServerCommand;
 import fr.ill.ics.bridge.command.ScanCommandWrapper;
 import fr.ill.ics.bridge.events.ServerCommandStateChangeEvent;
@@ -69,7 +68,6 @@ import fr.ill.ics.client.view.command.content.CommandBoxPeer;
 import fr.ill.ics.client.view.util.dialog.DialogManager;
 import fr.ill.ics.common.Nomad;
 import fr.ill.ics.nscclient.command.CommandZoneAccessor.ContainerType;
-import fr.ill.ics.nscclient.notification.commandline.sync.CommandLineSyncEventClient;
 import fr.ill.ics.util.ConfigManager;
 
 /**
@@ -77,7 +75,7 @@ import fr.ill.ics.util.ConfigManager;
  * deleted change the content of the server so that it is the same as represented in the client.
  * @author ortizh
  */
-public class ServerCommandZone extends CommandZone implements ServerCommandStateChangeListener, ServerProgressChangeListener, ServerResetCommandListener, ServerCommandZoneErrorListener, ServerCommandZoneSyncListener, ICommandLineSyncEventListener {
+public class ServerCommandZone extends CommandZone implements ServerCommandStateChangeListener, ServerProgressChangeListener, ServerResetCommandListener, ServerCommandZoneErrorListener, ServerCommandZoneSyncListener/*, ICommandLineSyncEventListener*/ {
 
 	private ServerCommandZoneExecutionState serverCommandZoneExecutionState;
 	private List<CommandBoxResetInformation> resetCommands;
@@ -107,7 +105,7 @@ public class ServerCommandZone extends CommandZone implements ServerCommandState
 		CommandZoneWrapper.getInstance(serverId).addServerResetCommandListener(this);
 		CommandZoneWrapper.getInstance(serverId).addServerCommandZoneErrorListener(this);
 
-		CommandLineSyncEventClient.getInstance().addCommandLineListener(this);
+		//CommandLineSyncEventClient.getInstance().addCommandLineListener(this);
 		
 		// The command zone sync listener is only registered for real server.
 		if (serverId.equals(CommandZoneWrapper.SERVER_ID)) {
@@ -940,7 +938,7 @@ public class ServerCommandZone extends CommandZone implements ServerCommandState
 		CommandZoneWrapper.getInstance(serverId).removeServerResetCommandListener(this);
 		CommandZoneWrapper.getInstance(serverId).removeServerCommandZoneErrorListener(this);
 		CommandZoneWrapper.getInstance(serverId).removeServerCommandZoneSyncListener(this);
-		CommandLineSyncEventClient.getInstance().removeCommandLineListener(this);
+		//CommandLineSyncEventClient.getInstance().removeCommandLineListener(this);
 	}
 
 	public void print() {
@@ -1054,8 +1052,17 @@ public class ServerCommandZone extends CommandZone implements ServerCommandState
 
 	}
 
+	/*
 	@Override
 	public void onStateChange() {
-		System.out.println("onstatechange");
+		System.out.println("========================================================= STATE CHANGE !!!");
+		// Avoid InvalidThreadAccess, thrown because onStateChange called from outside the SWT Display thread
+		MainWindowPeer.getInstance().addAsyncRunnable(new Runnable() {
+			@Override
+			public void run() {
+				commandWorkspace.switchView();
+			}
+		}); 
 	}
+	*/
 }
\ No newline at end of file

src/main/java/fr/ill/ics/client/view/widget/plot/launcher/PlotLauncherExternImageButton.java

@@ -32,7 +32,6 @@ import fr.ill.ics.core.property.Property;
 import fr.ill.ics.nscclient.ploty.PlotyInstance;
 import fr.ill.ics.nscclient.ploty.SpyPlotChangeListener;
 import fr.ill.ics.nscclient.sessionmanagement.SessionManager;
-import fr.ill.ics.util.ConfigManager;
 
 public abstract class PlotLauncherExternImageButton extends PlotLauncher implements SpyPlotChangeListener {