| Chunk |
|---|
| Conflicting content |
|---|
for (Element el: root.getElements("client-config")) {
if (config != null) {
parseClientConfig(config, el);
<<<<<<< HEAD
=======
} else {
Integer v = parseInteger(el, "resend-delay", ANY_VALUE);
if (v != null)
Library.setProperty(Attributes.RESEND_DELAY, v.toString());
>>>>>>> 16d6c5705ae9e6e9f2af3ad0837f2b020d953188
}
}
} |
| Solution content |
|---|
for (Element el: root.getElements("client-config")) {
if (config != null) {
parseClientConfig(config, el);
}
}
} |
| File |
|---|
| ConfigParser.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
v = parseInteger(conf, "tooltip-delay", POSITIVE_ONLY);
if (v != null) config.setTooltipDelay(v.intValue());
<<<<<<< HEAD
=======
v = parseInteger(conf, "resend-delay", ANY_VALUE);
if (v != null) config.setResendDelay(v.intValue());
>>>>>>> 16d6c5705ae9e6e9f2af3ad0837f2b020d953188
String s = conf.getElementValue("keep-across-visits", true);
if (s != null)
config.setKeepDesktopAcrossVisits(!"false".equals(s)); |
| Solution content |
|---|
v = parseInteger(conf, "tooltip-delay", POSITIVE_ONLY);
if (v != null) config.setTooltipDelay(v.intValue());
String s = conf.getElementValue("keep-across-visits", true);
if (s != null)
config.setKeepDesktopAcrossVisits(!"false".equals(s)); |
| File |
|---|
| ConfigParser.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
}
protected String coerceToString(Object value) {
return value != null && getFormat() == null ?
<<<<<<< HEAD
value instanceof BigDecimal ? ((BigDecimal)value).toPlainString():
=======
value instanceof BigDecimal ?
BigDecimals.toLocaleString((BigDecimal)value, getDefaultLocale()):
>>>>>>> 16d6c5705ae9e6e9f2af3ad0837f2b020d953188
value.toString()/*just in case*/: formatNumber(value, null);
}
protected void renderProperties(org.zkoss.zk.ui.sys.ContentRenderer renderer) |
| Solution content |
|---|
}
protected String coerceToString(Object value) {
return value != null && getFormat() == null ?
value instanceof BigDecimal ?
BigDecimals.toLocaleString((BigDecimal)value, getDefaultLocale()):
value.toString()/*just in case*/: formatNumber(value, null);
}
protected void renderProperties(org.zkoss.zk.ui.sys.ContentRenderer renderer) |
| File |
|---|
| Decimalbox.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
if (!Objects.equals(_auxinf != null ? _auxinf.constr: null, constr)) {
initAuxInfo().constr = constr;
_valided = false;
<<<<<<< HEAD
=======
>>>>>>> 16d6c5705ae9e6e9f2af3ad0837f2b020d953188
if (_auxinf.constr instanceof CustomConstraint) { //client ignored if custom
smartUpdate("constraint", "[c"); //implies validated at server
return; |
| Solution content |
|---|
if (!Objects.equals(_auxinf != null ? _auxinf.constr: null, constr)) {
initAuxInfo().constr = constr;
_valided = false;
if (_auxinf.constr instanceof CustomConstraint) { //client ignored if custom
smartUpdate("constraint", "[c"); //implies validated at server
return; |
| File |
|---|
| InputElement.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |