removed corba Servant reference in CorbaServant classes

new_start/src/fr/ill/ics/nscclient/servant/CorbaController.java

@@ -23,8 +23,8 @@ import fr.ill.ics.nomadserver.core.Controller;
 
 public class CorbaController extends CorbaServant {
 
-	public CorbaController(int databaseId, int servantId, Controller controller, ClientServantDescriptor descriptor) {
-		super(databaseId, servantId, controller, descriptor);
+	public CorbaController(int databaseId, int servantId, ClientServantDescriptor descriptor) {
+		super(databaseId, servantId, descriptor);
 	}
 
 }
\ No newline at end of file

new_start/src/fr/ill/ics/nscclient/servant/CorbaDriver.java

@@ -28,8 +28,8 @@ public class CorbaDriver extends CorbaServant {
 	private Mode mode = Mode.REAL;
 	private Long channel;
 	
-	public CorbaDriver(int databaseId, int servantId, Driver driver, ClientServantDescriptor descriptor) {
-		super(databaseId, servantId, driver, descriptor);
+	public CorbaDriver(int databaseId, int servantId, ClientServantDescriptor descriptor) {
+		super(databaseId, servantId, descriptor);
 	}
 	
 	public void setChannel(long channel) {

new_start/src/fr/ill/ics/nscclient/servant/CorbaServant.java

@@ -53,15 +53,14 @@ public class CorbaServant implements Controller {
 	public class UnknownCommandException extends Exception {};
 	//public class WrongPropertyException extends Exception {};
 
-	private Servant servant;
+	//private Servant servant;
 	private ClientServantDescriptor servantDescriptor;
 	private int databaseId;
 	
 	private int servantId;
 	
-	public CorbaServant(int databaseId, int servantId, Servant servant, ClientServantDescriptor descriptor) {
+	public CorbaServant(int databaseId, int servantId, ClientServantDescriptor descriptor) {
 		this.databaseId = databaseId;
-		this.servant = servant;
 		this.servantDescriptor = descriptor;
 		this.servantId = servantId;
 	}

new_start/src/fr/ill/ics/nscclient/servant/CorbaServantManager.java

@@ -99,9 +99,9 @@ public class CorbaServantManager {
 		CorbaController controller = null;
 		
 		if (descriptor.getType().equals(PARAMETERIZABLE_SCAN_1D)) {
-			controller = new CorbaIcsParameterizableScan1D(DATABASE_ID, descriptor.getId(), null, descriptor);
+			controller = new CorbaIcsParameterizableScan1D(DATABASE_ID, descriptor.getId(), descriptor);
 		} else {
-			controller = new CorbaController(DATABASE_ID, descriptor.getId(), null, descriptor);
+			controller = new CorbaController(DATABASE_ID, descriptor.getId(), descriptor);
 		}
 		// no initialisation here
 		servants.put(descriptor.getId(), controller);
@@ -136,7 +136,7 @@ public class CorbaServantManager {
 	
 	private CorbaDriver createCorbaDriver(ClientServantDescriptor descriptor, int channel, Mode mode) {
 
-		CorbaDriver driver = new CorbaDriver(DATABASE_ID, descriptor.getId(), null, descriptor);
+		CorbaDriver driver = new CorbaDriver(DATABASE_ID, descriptor.getId(), descriptor);
 		driver.setChannel(channel);
 		driver.setMode(mode);
 		// no init here

new_start/src/fr/ill/ics/nscclient/servant/scan/CorbaIcsParameterizableScan1D.java

@@ -113,8 +113,8 @@ public class CorbaIcsParameterizableScan1D extends CorbaController implements IP
 		momentClientValues.put("max_peak_width_moment0_yz", "max peak width moment0 YZ");
 	}
 	
-	public CorbaIcsParameterizableScan1D(int databaseId, int servantId, Controller controller, ClientServantDescriptor descriptor) {
-		super(databaseId, servantId, controller, descriptor);
+	public CorbaIcsParameterizableScan1D(int databaseId, int servantId, ClientServantDescriptor descriptor) {
+		super(databaseId, servantId, descriptor);
 	}
 
 public ActualProperties getServerVariables(Map<String, Property> properties, Map<String, Property> realDynamicProperties, List<Variable> variables, OptimizationParameters optimizationParameters, boolean format) {