| Chunk |
|---|
| Conflicting content |
|---|
private static NumberFormat numberFormat = new DecimalFormat("0.#");
<<<<<<< HEAD
private static ObjectMapper objectMapper = new ObjectMapper();
=======
>>>>>>> 5fa6e8ec13877beca93bbec7f158d18bed618f1e
private static final String OP_ADDITION = "+";
private static final String OP_SUBTRACTION = "-"; |
| Solution content |
|---|
private static NumberFormat numberFormat = new DecimalFormat("0.#");
private static ObjectMapper objectMapper = new ObjectMapper();
private static final String OP_ADDITION = "+";
private static final String OP_SUBTRACTION = "-"; |
| File |
|---|
| FormatUtils.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
PageType pageType = null;
SelectBox sb = null;
if (form.isNew()) {
<<<<<<< HEAD
ContentPage parentPage = null;
Object parent = ScreenContextHolder.get().getParent();
if (parent instanceof ContentPage) {
parentPage = (ContentPage) parent;
Site site = parentPage.getSite();
form.setAttribute("pageId", parentPage.getId());
form.setAttribute("siteId", site.getId());
addPathComponentField(form);
}
else if (parent instanceof Site) {
Site site = (Site) parent;
form.setAttribute("siteId", site.getId());
}
=======
Object parent = FormScreen.getScreenContext(form).getParent();
ContentPage parentPage = (ContentPage) parent;
form.setAttribute("pageId", parentPage.getId());
form.setAttribute("siteId", parentPage.getSite().getId());
addPathComponentField(form);
>>>>>>> 5fa6e8ec13877beca93bbec7f158d18bed618f1e
List pageTypes = parentPage.getPageType().getChildTypes();
Assert.notEmpty(pageTypes, "Sitemap schema does not allow the creation of pages here");
sb = createPageTypeBox(form, pageTypes); |
| Solution content |
|---|
PageType pageType = null;
SelectBox sb = null;
if (form.isNew()) {
ContentPage parentPage = (ContentPage) ScreenContextHolder.get().getParent();
form.setAttribute("pageId", parentPage.getId());
form.setAttribute("siteId", parentPage.getSite().getId());
addPathComponentField(form);
List pageTypes = parentPage.getPageType().getChildTypes();
Assert.notEmpty(pageTypes, "Sitemap schema does not allow the creation of pages here");
sb = createPageTypeBox(form, pageTypes); |
| File |
|---|
| PageFormInitializer.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Cast expression |
| If statement |
| Method invocation |
| Variable |