Projects >> XCoLab >>e2b1787187b378d811f76c70ce60f36159b1c7ad

Chunk
Conflicting content 
        return getProposalTemplateSelectionItems();
    }

<<<<<<< HEAD
    @ModelAttribute("contestLevelSelectionItems")
    public List populateContestLevelSelectionItems() {
        return getContestLevelSelectionItems();
    }

    @ModelAttribute("contestTypeSelectionItems")
    public List populateContestTypeSelectionItems() {
        return getContestTypeSelectionItems();
    }

=======
>>>>>>> 5403aef0629ad3a6fe0d69ef594077cb58066025
    @ModelAttribute("scheduleTemplateSelectionItems")
    public List populateScheduleSelectionItems(PortletRequest request) {
        return getContestScheduleSelectionItems(request);
Solution content 
        return getProposalTemplateSelectionItems();
    }

    @ModelAttribute("scheduleTemplateSelectionItems")
    public List populateScheduleSelectionItems(PortletRequest request) {
        return getContestScheduleSelectionItems(request);
File
ContestDetailsDescriptionTabController.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
        return getContestScheduleSelectionItems(request);
    }

<<<<<<< HEAD
    @ModelAttribute("modelIdsSelectionItems")
    public List populateModelIdsSelectionItems() {
        return ContestModelSettingsBean.getAllModelIds();
    }

    @ModelAttribute("modelRegionsSelectionItems")
    public List populateModelRegionsSelectionItems() {
        return ContestModelSettingsBean.getAllModelRegions();
    }

=======
>>>>>>> 5403aef0629ad3a6fe0d69ef594077cb58066025
    @ModelAttribute("currentTabWrapped")
    @Override
    public TabWrapper populateCurrentTabWrapped(PortletRequest request) throws PortalException, SystemException {
Solution content 
        return getContestScheduleSelectionItems(request);
    }

    @ModelAttribute("currentTabWrapped")
    @Override
    public TabWrapper populateCurrentTabWrapped(PortletRequest request) throws PortalException, SystemException {
File
ContestDetailsDescriptionTabController.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
        return selectItems;
    }

<<<<<<< HEAD
    private List getContestLevelSelectionItems() {
        List selectItems = new ArrayList<>();
        for (ContestTier contestLevel : ContestTier.values()) {
            selectItems.add(new LabelValue(contestLevel.getTierType(), contestLevel.getTierName()));
        }
        return selectItems;
    }

    private List getContestTypeSelectionItems() {
        List selectItems = new ArrayList<>();
        try {
            for (ContestType contestType : ContestTypeLocalServiceUtil
                    .getContestTypes(QueryUtil.ALL_POS, QueryUtil.ALL_POS)) {
                selectItems.add(new LabelValue(contestType.getId(),
                        String.format("%d - %s with %s", contestType.getId(),
                                contestType.getContestName(), contestType.getProposalNamePlural())));
            }
        } catch (SystemException e) {
            _log.warn("Could not get contest type selection items: " + e);
        }
        return selectItems;
    }

    private List getContestScheduleSelectionItems(PortletRequest request) {
=======
    private List getContestScheduleSelectionItems(PortletRequest request){
>>>>>>> 5403aef0629ad3a6fe0d69ef594077cb58066025
        List scheduleTemplateSelectionItems = new ArrayList<>();
        try {
            Contest contest = getContest(request);
Solution content 
        return selectItems;
    }

    private List getContestScheduleSelectionItems(PortletRequest request){
        List scheduleTemplateSelectionItems = new ArrayList<>();
        try {
            Contest contest = getContest(request);
File
ContestDetailsDescriptionTabController.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Method signature