Commit e54c731e authored by legoc's avatar legoc

Started with command zone event sync messages

parent e098ba6e
......@@ -25,6 +25,7 @@ import java.util.Map.Entry;
import fr.ill.ics.nscclient.log.LogSubscriber;
import fr.ill.ics.nscclient.notification.DataNotificationClient;
import fr.ill.ics.nscclient.notification.commandzone.CommandZoneEventClient;
import fr.ill.ics.nscclient.notification.commandzone.sync.CommandZoneSyncEventClient;
import fr.ill.ics.nscclient.survey.SurveySubscriberImpl;
......@@ -44,10 +45,13 @@ public class ChangeManager {
}
public void readAndDispatch() {
// Start the event dispatchers.
DataNotificationClient.getInstance().readAndDispatch();
CommandZoneEventClient.getInstance().readAndDispatch();
CommandZoneSyncEventClient.getInstance().readAndDispatch();
// Iterating the map of log subscribers
// Iterate the map of log subscribers.
Map<String, LogSubscriber> logSubscriberMap = LogSubscriber.getInstances();
Iterator<Entry<String, LogSubscriber>> it = logSubscriberMap.entrySet().iterator();
while (it.hasNext()) {
......@@ -55,7 +59,7 @@ public class ChangeManager {
logSubscriber.readAndDispatch();
}
// Iterating the map of survey subscribers
// Iterate the map of survey subscribers.
Map<String, SurveySubscriberImpl> surveySubscriberMap = SurveySubscriberImpl.getInstances();
Iterator<Entry<String, SurveySubscriberImpl>> it2 = surveySubscriberMap.entrySet().iterator();
while (it2.hasNext()) {
......
......@@ -124,4 +124,5 @@ public class AtomicCommandWrapper extends CommandWrapper implements Controller {
@Override
public void updateDynamicProperties() {
}
}
\ No newline at end of file
......@@ -21,6 +21,7 @@ package fr.ill.ics.bridge.command;
import fr.ill.ics.bridge.events.ServerCommandStateChangeEvent;
import fr.ill.ics.bridge.events.ServerCommandStateChangeEvent.CommandState;
import fr.ill.ics.bridge.events.ServerResetCommandEvent;
import fr.ill.ics.bridge.listeners.ServerCommandBoxSyncListener;
import fr.ill.ics.bridge.listeners.ServerCommandStateChangeListener;
import fr.ill.ics.bridge.listeners.ServerExpressionChangeListener;
import fr.ill.ics.bridge.listeners.ServerProgressChangeListener;
......@@ -28,8 +29,9 @@ import fr.ill.ics.bridge.listeners.ServerPropertyChangeListener;
import fr.ill.ics.bridge.listeners.ServerResetCommandListener;
import fr.ill.ics.nscclient.command.ServerCommandBox;
import fr.ill.ics.nscclient.notification.commandzone.CommandZoneEventClient;
import fr.ill.ics.nscclient.notification.commandzone.sync.CommandZoneSyncEventClient;
public abstract class CommandWrapper implements IServerCommand, ICommandBoxEventListener {
public abstract class CommandWrapper implements IServerCommand, ICommandBoxEventListener, ICommandBoxSyncEventListener {
private ServerCommandBox serverCommandBox;
......@@ -38,6 +40,7 @@ public abstract class CommandWrapper implements IServerCommand, ICommandBoxEvent
private ServerPropertyChangeListener propertyListener;
private ServerResetCommandListener resetCommandListener;
private ServerExpressionChangeListener expressionChangeCommandListener;
private ServerCommandBoxSyncListener commandBoxSyncListener;
public CommandWrapper(ServerCommandBox serverCommandBox) {
this.serverCommandBox = serverCommandBox;
......@@ -59,7 +62,12 @@ public abstract class CommandWrapper implements IServerCommand, ICommandBoxEvent
public void addServerResetCommandListener(ServerResetCommandListener listener) {
this.resetCommandListener = listener;
}
public void addServerCommandBoxSyncListener(ServerCommandBoxSyncListener listener) {
this.commandBoxSyncListener = listener;
CommandZoneSyncEventClient.getInstance().addCommandBoxListener(this);
}
public void removeServerCommandStateChangeListener(ServerCommandStateChangeListener listener) {
this.commandStateListener = null;
CommandZoneEventClient.getInstance().removeCommandBoxListener(this);
......@@ -73,6 +81,9 @@ public abstract class CommandWrapper implements IServerCommand, ICommandBoxEvent
this.resetCommandListener = null;
}
public void removeServerCommandBoxSyncListener() {
this.commandBoxSyncListener = null;
}
public void addServerExpressionChangeListener(ServerExpressionChangeListener listener) {
this.expressionChangeCommandListener = listener;
......@@ -186,5 +197,10 @@ public abstract class CommandWrapper implements IServerCommand, ICommandBoxEvent
public int getProgression() {
return serverCommandBox.getProgression();
}
@Override
public void onToggleParallel() {
commandBoxSyncListener.onToggleParallel();
}
}
\ No newline at end of file
/*
* Nomad Instrument Control Software
*
* Copyright 2011 Institut Laue-Langevin
*
* Licensed under the EUPL, Version 1.1 only (the "License");
* You may not use this work except in compliance with the Licence.
* You may obtain a copy of the Licence at:
*
* http://joinup.ec.europa.eu/software/page/eupl
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*/
package fr.ill.ics.bridge.command;
public interface ICommandBoxSyncEventListener {
int getCommandBoxID();
void onToggleParallel();
}
\ No newline at end of file
/*
* Nomad Instrument Control Software
*
* Copyright 2011 Institut Laue-Langevin
*
* Licensed under the EUPL, Version 1.1 only (the "License");
* You may not use this work except in compliance with the Licence.
* You may obtain a copy of the Licence at:
*
* http://joinup.ec.europa.eu/software/page/eupl
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*/
package fr.ill.ics.bridge.listeners;
public interface ServerCommandBoxSyncListener {
void onToggleParallel();
}
\ No newline at end of file
......@@ -42,7 +42,7 @@ public class CommandZoneAccessor {
private static final Logger LOGGER = Logger.getLogger(CommandZoneAccessor.class.getName());
private String serverId;
private int clientId;
private Integer clientId;
private Application.Requester commandBoxRequester;
private Map<Integer, Boolean> commandConflicts = new HashMap<Integer, Boolean>();
......@@ -133,9 +133,6 @@ public class CommandZoneAccessor {
public void init() {
// Get the client id.
clientId = SessionManager.getInstance(serverId).getClientId();
// Connect nomad server.
Application.Instance nomad = ServerInstance.getInstance().getApplicationInstance(serverId);
......@@ -202,6 +199,16 @@ public class CommandZoneAccessor {
}
}
private int getClientID() {
if (clientId == null) {
// Get the client id from the session manager.
clientId = SessionManager.getInstance(serverId).getClientId();
}
return clientId;
}
public void toggleBackground(int commandBoxID) {
// Create the message type.
......@@ -211,7 +218,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.CommandBoxRequest request = CommandZoneRequests.CommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -239,7 +246,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.CommandBoxRequest request = CommandZoneRequests.CommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -267,7 +274,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.CommandBoxRequest request = CommandZoneRequests.CommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -300,7 +307,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.CommandBoxRequest request = CommandZoneRequests.CommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -333,7 +340,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.CommandBoxRequest request = CommandZoneRequests.CommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -377,7 +384,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.CommandBoxSetModifiableRequest request = CommandZoneRequests.CommandBoxSetModifiableRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setModifiable(isModifiable)
.build();
......@@ -406,7 +413,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.CommandBoxRequest request = CommandZoneRequests.CommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -439,7 +446,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.CommandBoxRequest request = CommandZoneRequests.CommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -467,7 +474,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.CommandBoxRequest request = CommandZoneRequests.CommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -500,7 +507,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AtomicCommandBoxRequest request = CommandZoneRequests.AtomicCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -533,7 +540,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AtomicCommandBoxRequest request = CommandZoneRequests.AtomicCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -566,7 +573,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AtomicCommandBoxRequest request = CommandZoneRequests.AtomicCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -600,7 +607,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.SetInt32ValueRequest request = CommandZoneRequests.SetInt32ValueRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setPropertyID(propertyID)
.setValue(value)
......@@ -635,7 +642,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AtomicCommandBoxPropertyRequest request = CommandZoneRequests.AtomicCommandBoxPropertyRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setPropertyID(propertyID)
.build();
......@@ -669,7 +676,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.SetFloat64ValueRequest request = CommandZoneRequests.SetFloat64ValueRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setPropertyID(propertyID)
.setValue(value)
......@@ -704,7 +711,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AtomicCommandBoxPropertyRequest request = CommandZoneRequests.AtomicCommandBoxPropertyRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setPropertyID(propertyID)
.build();
......@@ -738,7 +745,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.SetStringValueRequest request = CommandZoneRequests.SetStringValueRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setPropertyID(propertyID)
.setValue(value)
......@@ -773,7 +780,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AtomicCommandBoxPropertyRequest request = CommandZoneRequests.AtomicCommandBoxPropertyRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setPropertyID(propertyID)
.build();
......@@ -807,7 +814,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.SetBooleanValueRequest request = CommandZoneRequests.SetBooleanValueRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setPropertyID(propertyID)
.setValue(value)
......@@ -842,7 +849,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AtomicCommandBoxPropertyRequest request = CommandZoneRequests.AtomicCommandBoxPropertyRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setPropertyID(propertyID)
.build();
......@@ -894,7 +901,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.PropertyExpressionRequest request = CommandZoneRequests.PropertyExpressionRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setPropertyID(propertyID)
.setExpression(expression)
......@@ -935,7 +942,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.StaticPropertyExpressionRequest request = CommandZoneRequests.StaticPropertyExpressionRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setPropertyID(propertyID)
.setExpression(expression)
.build();
......@@ -975,7 +982,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.PropertyExpressionRequest request = CommandZoneRequests.PropertyExpressionRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setPropertyID(propertyID)
.setExpression(expression)
......@@ -1021,7 +1028,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AtomicCommandBoxPropertyRequest request = CommandZoneRequests.AtomicCommandBoxPropertyRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setPropertyID(propertyID)
.build();
......@@ -1061,7 +1068,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.SetSettingsFileNameRequest request = CommandZoneRequests.SetSettingsFileNameRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setFilename(filename)
.build();
......@@ -1090,7 +1097,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AtomicCommandBoxRequest request = CommandZoneRequests.AtomicCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -1124,7 +1131,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.SetStringRequest request = CommandZoneRequests.SetStringRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setValue(controllerName)
.build();
......@@ -1153,7 +1160,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AtomicCommandBoxRequest request = CommandZoneRequests.AtomicCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -1186,7 +1193,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.SetStringRequest request = CommandZoneRequests.SetStringRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setValue(propertyName)
.build();
......@@ -1215,7 +1222,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AtomicCommandBoxRequest request = CommandZoneRequests.AtomicCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -1248,7 +1255,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AtomicCommandBoxRequest request = CommandZoneRequests.AtomicCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -1281,7 +1288,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.SetStringRequest request = CommandZoneRequests.SetStringRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setValue(value)
.build();
......@@ -1310,7 +1317,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AtomicCommandBoxRequest request = CommandZoneRequests.AtomicCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -1343,7 +1350,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.ExpressionRequest request = CommandZoneRequests.ExpressionRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setExpression(expression)
.build();
......@@ -1383,7 +1390,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.StaticExpressionRequest request = CommandZoneRequests.StaticExpressionRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setExpression(expression)
.build();
......@@ -1422,7 +1429,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.ExpressionRequest request = CommandZoneRequests.ExpressionRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setExpression(expression)
.build();
......@@ -1467,7 +1474,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.CommandBoxRequest request = CommandZoneRequests.CommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -1523,7 +1530,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.GetCommandListRequest request = CommandZoneRequests.GetCommandListRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setType(convertContainerType(containerType))
.setContainerID(commandBoxID)
.build();
......@@ -1582,7 +1589,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AddNewAtomicCommandBoxAtEndRequest request = CommandZoneRequests.AddNewAtomicCommandBoxAtEndRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setType(convertContainerType(containerType))
.setContainerID(commandBoxID)
.setCommandID(commandID)
......@@ -1618,7 +1625,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AddNewAtomicCommandBoxRequest request = CommandZoneRequests.AddNewAtomicCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setType(convertContainerType(containerType))
.setContainerID(commandBoxID)
.setCommandID(commandID)
......@@ -1656,7 +1663,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AddNewScanCommandBoxAtEndRequest request = CommandZoneRequests.AddNewScanCommandBoxAtEndRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setType(convertContainerType(containerType))
.setContainerID(commandBoxID)
.setScanName(scanName)
......@@ -1691,7 +1698,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AddNewScanCommandBoxRequest request = CommandZoneRequests.AddNewScanCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setType(convertContainerType(containerType))
.setContainerID(commandBoxID)
.setScanName(scanName)
......@@ -1728,7 +1735,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AddNewForLoopCommandBoxAtEndRequest request = CommandZoneRequests.AddNewForLoopCommandBoxAtEndRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setType(convertContainerType(containerType))
.setContainerID(commandBoxID)
.setVariableName(variableName)
......@@ -1763,7 +1770,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AddNewForLoopCommandBoxRequest request = CommandZoneRequests.AddNewForLoopCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setType(convertContainerType(containerType))
.setContainerID(commandBoxID)
.setVariableName(variableName)
......@@ -1801,7 +1808,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AddNewGenericCommandBoxAtEndRequest request = CommandZoneRequests.AddNewGenericCommandBoxAtEndRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setType(convertContainerType(containerType))
.setContainerID(commandBoxID)
.setBoxType(boxType)
......@@ -1836,7 +1843,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AddNewGenericCommandBoxRequest request = CommandZoneRequests.AddNewGenericCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setType(convertContainerType(containerType))
.setContainerID(commandBoxID)
.setBoxType(boxType)
......@@ -1873,7 +1880,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AddNewControlCommandBoxAtEndRequest request = CommandZoneRequests.AddNewControlCommandBoxAtEndRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setType(convertContainerType(containerType))
.setContainerID(commandBoxID)
.setBoxType(boxType)
......@@ -1909,7 +1916,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.AddNewControlCommandBoxRequest request = CommandZoneRequests.AddNewControlCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setType(convertContainerType(containerType))
.setContainerID(commandBoxID)
.setBoxType(boxType)
......@@ -1946,7 +1953,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.MoveCommandBoxRequest request = CommandZoneRequests.MoveCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setType(convertContainerType(containerType))
.setContainerID(commandBoxID)
.setCommandBoxIDToMove(commandBoxIDToMove)
......@@ -1983,7 +1990,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.MoveCommandBoxToEndRequest request = CommandZoneRequests.MoveCommandBoxToEndRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setType(convertContainerType(containerType))
.setContainerID(commandBoxID)
.setCommandBoxIDToMove(commandBoxIDToMove)
......@@ -2018,7 +2025,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.DeleteCommandBoxRequest request = CommandZoneRequests.DeleteCommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setType(convertContainerType(containerType))
.setContainerID(commandBoxID)
.setCommandBoxIDToDelete(commandBoxIDToDelete)
......@@ -2053,7 +2060,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.CommandBoxRequest request = CommandZoneRequests.CommandBoxRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.build();
......@@ -2087,7 +2094,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.SetForLoopStringValueRequest request = CommandZoneRequests.SetForLoopStringValueRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setLineIndex(lineIndex)
.setValue(variableName)
......@@ -2117,7 +2124,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.GetForLoopValueRequest request = CommandZoneRequests.GetForLoopValueRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setLineIndex(lineIndex)
.build();
......@@ -2151,7 +2158,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.SetForLoopValueRequest request = CommandZoneRequests.SetForLoopValueRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setLineIndex(lineIndex)
.setValue(startValue)
......@@ -2181,7 +2188,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.SetForLoopValueRequest request = CommandZoneRequests.SetForLoopValueRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setLineIndex(lineIndex)
.setValue(endValue)
......@@ -2211,7 +2218,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.SetForLoopValueRequest request = CommandZoneRequests.SetForLoopValueRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setLineIndex(lineIndex)
.setValue(stepSize)
......@@ -2241,7 +2248,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.GetForLoopValueRequest request = CommandZoneRequests.GetForLoopValueRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setLineIndex(lineIndex)
.build();
......@@ -2275,7 +2282,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.GetForLoopValueRequest request = CommandZoneRequests.GetForLoopValueRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setLineIndex(lineIndex)
.build();
......@@ -2309,7 +2316,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.GetForLoopValueRequest request = CommandZoneRequests.GetForLoopValueRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setLineIndex(lineIndex)
.build();
......@@ -2343,7 +2350,7 @@ public class CommandZoneAccessor {
// Create the request.
CommandZoneRequests.GetForLoopValueRequest request = CommandZoneRequests.GetForLoopValueRequest.newBuilder()
.setClientID(clientId)
.setClientID(getClientID())
.setCommandBoxID(commandBoxID)
.setLineIndex(lineIndex)
.build();
......@@ -2377,7 +2384,7 @@ public class CommandZoneAccessor {