Projects >> openengsb >>71a126a32d687901cdb66c026da1fbbec2e46f47

Chunk
Conflicting content 
    private void initList() {
        if (list == null) {
<<<<<<< HEAD
            SortParam sp = this.getSort();
            list = getSortedandFilteredList(sp);   
=======
            list = getSortedandFilteredList();
>>>>>>> 297bd3f856ed65b75292f9c1e23da93333e592c6
        }
    }
Solution content 
    private void initList() {
        if (list == null) {
            list = getSortedandFilteredList();
        }
    }
File
TaskDataProvider.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
        super(id);
        ArrayList> columns = new ArrayList>();

<<<<<<< HEAD
        IColumn actionsColumn = new FilteredAbstractColumn(Model.of("Actions")) {
        
=======
        IColumn actionsColumn = new FilteredAbstractColumn(Model.of("Actions")) {

>>>>>>> 297bd3f856ed65b75292f9c1e23da93333e592c6
            @Override
            public Component getFilter(String componentId, FilterForm form) {
                return new GoAndClearFilter(componentId, form);
Solution content 
        super(id);
        ArrayList> columns = new ArrayList>();

        IColumn actionsColumn = new FilteredAbstractColumn(Model.of("Actions")) {
            @Override
            public Component getFilter(String componentId, FilterForm form) {
                return new GoAndClearFilter(componentId, form);
File
TaskOverviewPanel.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        };
        columns.add(actionsColumn);

<<<<<<< HEAD
        columns.add(new TextFilteredPropertyColumn(
                Model.of("TaskId"), "taskId", "taskId"));
        columns.add(new TextFilteredPropertyColumn(
                Model.of("TaskType"), "taskType", "taskType"));
        columns.add(new TextFilteredPropertyColumn(
                Model.of("Description"), "description", "description"));
        columns.add(new PropertyColumn(
                Model.of("TaskCreationTimestamp"), "taskCreationTimestamp", "taskCreationTimestamp"));
=======
        columns.add(new TextFilteredPropertyColumn(Model.of("TaskId"), "taskId", "taskId"));
        columns.add(new TextFilteredPropertyColumn(Model.of("TaskType"), "taskType", "taskType"));
        columns
            .add(new TextFilteredPropertyColumn(Model.of("Description"), "description", "description"));
        columns.add(new PropertyColumn(Model.of("TaskCreationTimestamp"), "taskCreationTimestamp",
            "taskCreationTimestamp"));
>>>>>>> 297bd3f856ed65b75292f9c1e23da93333e592c6
        FilterForm form = new FilterForm("form", dataProvider);

        DefaultDataTable dataTable = new DefaultDataTable("dataTable", columns, dataProvider, 15);
Solution content 
        };
        columns.add(actionsColumn);
        columns.add(new TextFilteredPropertyColumn(Model.of("TaskId"), "taskId", "taskId"));
        columns.add(new TextFilteredPropertyColumn(Model.of("TaskType"), "taskType", "taskType"));
        columns
            .add(new TextFilteredPropertyColumn(Model.of("Description"), "description", "description"));
        columns.add(new PropertyColumn(Model.of("TaskCreationTimestamp"), "taskCreationTimestamp",
            "taskCreationTimestamp"));

        FilterForm form = new FilterForm("form", dataProvider);

        DefaultDataTable dataTable = new DefaultDataTable("dataTable", columns, dataProvider, 15);
File
TaskOverviewPanel.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
package org.openengsb.ui.taskbox;

<<<<<<< HEAD
import java.lang.reflect.Constructor;
import java.util.HashMap;
import java.util.Map;

=======
>>>>>>> 297bd3f856ed65b75292f9c1e23da93333e592c6
import org.apache.wicket.markup.html.panel.Panel;
import org.openengsb.core.common.taskbox.TaskboxException;
import org.openengsb.core.common.taskbox.WebTaskboxService;
Solution content 
package org.openengsb.ui.taskbox;

import java.lang.reflect.Constructor;
import java.util.HashMap;
import java.util.Map;
import org.apache.wicket.markup.html.panel.Panel;
import org.openengsb.core.common.taskbox.TaskboxException;
import org.openengsb.core.common.taskbox.WebTaskboxService;
File
WebTaskboxServiceImpl.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    
    @Override
    public Panel getOverviewPanel() {
<<<<<<< HEAD
        return null;
    }
    
    @Override
    public Panel getTaskPanel(Task task, String wicketPanelId) throws TaskboxException {
        if (panelMap.containsKey(task.getTaskType())) {
            Panel p = null;
            try {
                Class panelClass = panelMap.get(task.getTaskType());
                Constructor panelConstructor = panelClass.getConstructor(String.class, Task.class);
                p = (Panel) panelConstructor.newInstance(wicketPanelId, task);
            } catch (Exception e) {
                throw new TaskboxException(e);
            }
            return p;
        } else {
            registerTaskPanel(task.getTaskType(), TaskPanel.class);
            return getTaskPanel(task, wicketPanelId);
        }
    }

    @Override
    public void registerTaskPanel(String taskType, Class panelClass) {
        panelMap.put(taskType, panelClass);
    }
}
=======
        return new TaskOverviewPanel("OverviewPanel");
    }
}
>>>>>>> 297bd3f856ed65b75292f9c1e23da93333e592c6
Solution content 
    
    @Override
    public Panel getOverviewPanel() {
        return new TaskOverviewPanel("OverviewPanel");
    }
    
    @Override
    public Panel getTaskPanel(Task task, String wicketPanelId) throws TaskboxException {
        if (panelMap.containsKey(task.getTaskType())) {
            Panel p = null;
            try {
                Class panelClass = panelMap.get(task.getTaskType());
                Constructor panelConstructor = panelClass.getConstructor(String.class, Task.class);
                p = (Panel) panelConstructor.newInstance(wicketPanelId, task);
            } catch (Exception e) {
                throw new TaskboxException(e);
            }
            return p;
        } else {
            registerTaskPanel(task.getTaskType(), TaskPanel.class);
            return getTaskPanel(task, wicketPanelId);
        }
    }

    @Override
    public void registerTaskPanel(String taskType, Class panelClass) {
        panelMap.put(taskType, panelClass);        
    }
}
File
WebTaskboxServiceImpl.java
Developer's decision
Combination
Kind of conflict
Annotation
Method declaration
Method invocation
Return statement