| Chunk |
|---|
| Conflicting content |
|---|
themeSelectListbox.setVisible(false);
return;
}
<<<<<<< HEAD
for (Listitem item : themeSelectListbox.getItems()) {
=======
List chd = themeSelectListbox.getItems();
for (int i = 0; i < chd.size(); i++) {
Listitem item = (Listitem)chd.get(i);
>>>>>>> 8c72cf3f294645d07c53e467c64d93607792afdc
if (name.equals(item.getValue())) {
themeSelectListbox.setSelectedItem(item);
break; |
| Solution content |
|---|
themeSelectListbox.setVisible(false);
return;
}
for (Listitem item : themeSelectListbox.getItems()) {
if (name.equals(item.getValue())) {
themeSelectListbox.setSelectedItem(item);
break; |
| File |
|---|
| ThemeSelectionCtrl.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Cast expression |
| For statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
return path.toLowerCase().startsWith("file://") ?
Servlets.getResource(_ctx, path): _ctx.getResource(path);
//we don't accept http:// since we cannot detect if it exists
<<<<<<< HEAD
=======
if (url == null && _path != null && locale == null)
log.error("File not found: " + path);
return url;
>>>>>>> 8c72cf3f294645d07c53e467c64d93607792afdc
}
//-- Object --// |
| Solution content |
|---|
return path.toLowerCase().startsWith("file://") ?
Servlets.getResource(_ctx, path): _ctx.getResource(path);
//we don't accept http:// since we cannot detect if it exists
}
//-- Object --// |
| File |
|---|
| ServletLabelLocator.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Return statement |
| Variable |