Commit e8f8a3c1 authored by yannick legoc's avatar yannick legoc
Browse files

Changed some proto types.

parent 28a87ac3
......@@ -29,7 +29,6 @@ import fr.ill.ics.bridge.listeners.ServerConditionChangeListener.ClientCondition
import fr.ill.ics.cameo.Application;
import fr.ill.ics.cameo.RequesterCreationException;
import fr.ill.ics.nomadserver.common.Common;
import fr.ill.ics.nomadserver.common.Common.ConditionStateResponse.ConditionState;
import fr.ill.ics.nomadserver.common.Common.Error.Type;
import fr.ill.ics.nomadserver.condition.ConditionManagerRequest;
import fr.ill.ics.nscclient.serverconnection.ServerInstance;
......@@ -454,15 +453,15 @@ public class ConditionManagerAccessor {
// Test the error.
//processError(response);
ConditionState responseState = response.getValue();
Common.ConditionStateType.Type responseState = response.getValue();
if (responseState == ConditionState.CONDITION_ACTIVE) {
if (responseState == Common.ConditionStateType.Type.CONDITION_ACTIVE) {
return ClientConditionState.ACTIVE;
}
else if (responseState == ConditionState.CONDITION_INACTIVE) {
else if (responseState == Common.ConditionStateType.Type.CONDITION_INACTIVE) {
return ClientConditionState.INACTIVE;
}
else if (responseState == ConditionState.CONDITION_ON_ACTIVATION_DELAY) {
else if (responseState == Common.ConditionStateType.Type.CONDITION_ON_ACTIVATION_DELAY) {
return ClientConditionState.ON_ACTIVATION_DELAY;
}
}
......
......@@ -707,33 +707,33 @@ public class DataAccessor {
else {
System.out.println("GetCommandState " + databaseID + " " + commandID + " -> " + response.getValue());
Common.CommandStateResponse.CommandState commandState = response.getValue();
Common.CommandStateType.Type commandState = response.getValue();
if (commandState == Common.CommandStateResponse.CommandState.INACTIVE) {
if (commandState == Common.CommandStateType.Type.INACTIVE) {
return ClientCommandState.INACTIVE;
} else if (commandState == Common.CommandStateResponse.CommandState.ACTIVE) {
} else if (commandState == Common.CommandStateType.Type.ACTIVE) {
return ClientCommandState.ACTIVE;
} else if (commandState == Common.CommandStateResponse.CommandState.ACTIVE) {
} else if (commandState == Common.CommandStateType.Type.ACTIVE) {
return ClientCommandState.ACTIVE;
} else if (commandState == Common.CommandStateResponse.CommandState.PAUSED) {
} else if (commandState == Common.CommandStateType.Type.PAUSED) {
return ClientCommandState.PAUSED;
} else if (commandState == Common.CommandStateResponse.CommandState.PAUSING) {
} else if (commandState == Common.CommandStateType.Type.PAUSING) {
return ClientCommandState.PAUSING;
} else if (commandState == Common.CommandStateResponse.CommandState.STOPPING) {
} else if (commandState == Common.CommandStateType.Type.STOPPING) {
return ClientCommandState.STOPPING;
} else if (commandState == Common.CommandStateResponse.CommandState.RESTARTING) {
} else if (commandState == Common.CommandStateType.Type.RESTARTING) {
return ClientCommandState.RESTARTING;
} else if (commandState == Common.CommandStateResponse.CommandState.PENDING) {
} else if (commandState == Common.CommandStateType.Type.PENDING) {
return ClientCommandState.PENDING;
} else if (commandState == Common.CommandStateResponse.CommandState.STARTING) {
} else if (commandState == Common.CommandStateType.Type.STARTING) {
return ClientCommandState.STARTING;
}
}
......
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