| Chunk |
|---|
| Conflicting content |
|---|
if (o instanceof ComponentSerializationListener)
((ComponentSerializationListener)o).didDeserialize(this);
}
<<<<<<< HEAD
=======
private static boolean isVariableSerializable(String name, Object value) {
return !"spaceScope".equals(name) && !"spaceOwner".equals(name)
/*Removed in 3.6.4: && !(value instanceof Component)*/;
}
>>>>>>> 0f8b960c92957e2c3c592be0a17ee7232732b389
/** Used to forward events (for the forward conditions).
*/ |
| Solution content |
|---|
if (o instanceof ComponentSerializationListener) ((ComponentSerializationListener)o).didDeserialize(this); } /** Used to forward events (for the forward conditions). */ |
| File |
|---|
| AbstractComponent.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
//do nothing } <<<<<<< HEAD /** @deprecated As of release 5.0.0, it is meaningless for * GenericComposer to implement ComponentActivationListener. * * |
| Solution content |
|---|
//do nothing } /** @deprecated As of release 5.0.0, it is meaningless for * GenericComposer to implement ComponentActivationListener. * * |
| File |
|---|
| GenericComposer.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method declaration |
| Method invocation |
| Method signature |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import java.util.List; import java.util.Map; <<<<<<< HEAD import org.zkoss.util.logging.Log; ======= import org.zkoss.zk.scripting.Namespace; >>>>>>> 0f8b960c92957e2c3c592be0a17ee7232732b389 import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.ComponentNotFoundException; import org.zkoss.zk.ui.Desktop; |
| Solution content |
|---|
import java.util.List; import java.util.Map; import org.zkoss.util.logging.Log; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.ComponentNotFoundException; |
| File |
|---|
| MainLayoutComposer.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
*/
public class MainLayoutComposer extends GenericForwardComposer implements
MainLayoutAPI {
<<<<<<< HEAD
private static final Log log = Log.lookup(MainLayoutComposer.class);
=======
>>>>>>> 0f8b960c92957e2c3c592be0a17ee7232732b389
Textbox searchBox;
|
| Solution content |
|---|
*/
public class MainLayoutComposer extends GenericForwardComposer implements
MainLayoutAPI {
private static final Log log = Log.lookup(MainLayoutComposer.class);
Textbox searchBox;
|
| File |
|---|
| MainLayoutComposer.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
Div header; <<<<<<< HEAD Button _selected; ======= Div _selected; >>>>>>> 0f8b960c92957e2c3c592be0a17ee7232732b389 private String _applied; |
| Solution content |
|---|
Div header; Button _selected; |
| File |
|---|
| MainLayoutComposer.java |
| Developer's decision |
|---|
| None |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
final DemoItem[] items = getItems();
for (int i = 0; i < items.length; i++) {
if (items[i].getId().equals(id)) {
<<<<<<< HEAD
_selected = (Button)self.getFellow(items[i].getCateId());
=======
_selected = (Div)self.getFellow(items[i].getCateId());
>>>>>>> 0f8b960c92957e2c3c592be0a17ee7232732b389
itemList.setModel(getSelectedModel());
itemList.renderAll();
Listitem item = ((Listitem)itemList.getFellow(id)); |
| Solution content |
|---|
final DemoItem[] items = getItems();
for (int i = 0; i < items.length; i++) {
if (items[i].getId().equals(id)) {
_selected = (Button)self.getFellow(items[i].getCateId());
itemList.setModel(getSelectedModel());
itemList.renderAll();
Listitem item = ((Listitem)itemList.getFellow(id)); |
| File |
|---|
| MainLayoutComposer.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Cast expression |
| Chunk |
|---|
| Conflicting content |
|---|
}
private void setSelectedCategory(Listitem item) {
DemoItem di = (DemoItem) item.getValue();
<<<<<<< HEAD
_selected = (Button) self.getFellow(di.getCateId());
String deselect = _selected != null ? "jq('#"+ _selected.getUuid() +
"').addClass('demo-seld').siblings().removeClass('demo-seld');" : "";
Clients.evalJavaScript(deselect);
=======
_selected = (Div) self.getFellow(di.getCateId());
String deselect = _selected != null ? "onSelect($e('"+ _selected.getUuid() + "'));" : "";
if (Executions.getCurrent().isBrowser("ie6-")) {
Clients.evalJavaScript(deselect + "fixImage4IE6();");
} else {
Clients.evalJavaScript(deselect);
}
>>>>>>> 0f8b960c92957e2c3c592be0a17ee7232732b389
item.getDesktop().setBookmark(item.getId());
}
public void onCtrlKey$searchBox(KeyEvent event) { |
| Solution content |
|---|
}
private void setSelectedCategory(Listitem item) {
DemoItem di = (DemoItem) item.getValue();
_selected = (Button) self.getFellow(di.getCateId());
String deselect = _selected != null ? "jq('#"+ _selected.getUuid() +
"').addClass('demo-seld').siblings().removeClass('demo-seld');" : "";
Clients.evalJavaScript(deselect);
item.getDesktop().setBookmark(item.getId());
}
public void onCtrlKey$searchBox(KeyEvent event) { |
| File |
|---|
| MainLayoutComposer.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Cast expression |
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
_applied = comp.getUuid();
Events.postEvent("onMainCreate", comp, null);
}
<<<<<<< HEAD
=======
protected Component getAppliedComponent(Namespace ns) {
final Component owner = ns.getOwner();
Desktop dt = null;
Page page;
if (owner != null)
dt = owner.getDesktop();
else {
page = ns.getOwnerPage();
if (page != null)
dt = page.getDesktop();
}
if (dt != null) {
return dt.getComponentByUuidIfAny(_applied);
}
return null;
}
>>>>>>> 0f8b960c92957e2c3c592be0a17ee7232732b389
} |
| Solution content |
|---|
Events.postEvent("onMainCreate", comp, null);
}
} |
| File |
|---|
| MainLayoutComposer.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Method declaration |