Commit 053e7093 authored by Tobias Meuser's avatar Tobias Meuser
Browse files

Fixed bug created by merge

parent 9c61f815
...@@ -192,39 +192,6 @@ public class VehicleMovementModel implements MovementModel, EventHandler { ...@@ -192,39 +192,6 @@ public class VehicleMovementModel implements MovementModel, EventHandler {
} }
// Initial placement // Initial placement
actuator.updateCurrentLocation(DEFAULT_LOCATION); actuator.updateCurrentLocation(DEFAULT_LOCATION);
try {
final SiSComponent sis = actuator.getHost().getComponent(SiSComponent.class);
sis.provide().nodeState(SiSTypes.FUTURE_PHY_LOCATION,
new SiSDataCallback<Location>() {
Set<INodeID> localID = INodeID
.getSingleIDSet(actuator.getHost().getId());
@Override
public Location getValue(INodeID nodeID,
SiSProviderHandle providerHandle)
throws InformationNotAvailableException {
if (nodeID.equals(actuator.getHost().getId())) {
return getFutureLocation(actuator.getHost());
} else {
throw new InformationNotAvailableException();
}
}
@Override
public Set<INodeID> getObservedNodes() {
return localID;
}
@Override
public SiSInfoProperties getInfoProperties() {
return new SiSInfoProperties();
}
});
} catch (ComponentNotAvailableException e) {
// Nothing to do
}
} }
/** /**
......
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