| Chunk |
|---|
| Conflicting content |
|---|
public boolean checkChosenTechnologyState(final DataDefinition orderDD, final Entity order) {
if (order.isActive()) {
<<<<<<< HEAD
Entity technology = order.getBelongsToField("technology");
if (technology == null) {
return true;
}
TechnologyState technologyState = TechnologyStateUtils.getStateFromField(technology.getStringField("state"));
if (TechnologyState.ACCEPTED != technologyState) {
order.addError(orderDD.getField("technology"), "orders.validate.technology.error.wrongState");
=======
Entity technology = order.getBelongsToField(TECHNOLOGIES_MODEL_TECHNOLOGY);
if (technology == null) {
return true;
}
TechnologyState technologyState = TechnologyStateUtils.getStateFromField(technology.getStringField(FIELD_STATE));
if (TechnologyState.ACCEPTED != technologyState) {
order.addError(orderDD.getField(TECHNOLOGIES_MODEL_TECHNOLOGY), "orders.validate.technology.error.wrongState");
>>>>>>> 98d07b7414d15e73da90a11d17f7ee0de28deacb
return false;
}
} |
| Solution content |
|---|
public boolean checkChosenTechnologyState(final DataDefinition orderDD, final Entity order) {
if (order.isActive()) {
Entity technology = order.getBelongsToField("technology");
if (technology == null) {
return true;
}
TechnologyState technologyState = TechnologyStateUtils.getStateFromField(technology.getStringField("state"));
if (TechnologyState.ACCEPTED != technologyState) {
order.addError(orderDD.getField("technology"), "orders.validate.technology.error.wrongState");
return false;
}
} |
| File |
|---|
| OrderService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |