Projects >> aperte-workflow-core >>1271a18f4456c92f2243acc48112513cbe921d08

Chunk
Conflicting content 
    private QueueTab queueTab;
    private ProcessPermissionTab permissionTab;
    private MessageTab messageTab;
<<<<<<< HEAD
=======
   // private DictionaryTab dictionaryTab;
>>>>>>> ac4c7a4112b504265839ed449d687c3518a9590a
    private ProcessDefinitionTab processDefinitionTab;

    private Label titleLabel;
Solution content 
    private QueueTab queueTab;
    private ProcessPermissionTab permissionTab;
    private MessageTab messageTab;
    private ProcessDefinitionTab processDefinitionTab;

    private Label titleLabel;
File
ProcessEditorPanel.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
        tabSheet.addTab(permissionTab = new ProcessPermissionTab(), messages.getMessage("process.editor.process.permissions"));
        tabSheet.addTab(queueTab = new QueueTab(), messages.getMessage("process.editor.queues"));
        tabSheet.addTab(messageTab = new MessageTab(), messages.getMessage("process.editor.messages"));
<<<<<<< HEAD
=======
       // tabSheet.addTab(dictionaryTab = new DictionaryTab(), messages.getMessage("process.editor.dictionary"));
>>>>>>> ac4c7a4112b504265839ed449d687c3518a9590a
        tabSheet.addTab(otherTab = new OtherTab(), messages.getMessage("process.editor.other"));

        saveButton = VaadinUtility.button(messages.getMessage("process.editor.save"), new Runnable() {
Solution content 
        tabSheet.addTab(permissionTab = new ProcessPermissionTab(), messages.getMessage("process.editor.process.permissions"));
        tabSheet.addTab(queueTab = new QueueTab(), messages.getMessage("process.editor.queues"));
        tabSheet.addTab(messageTab = new MessageTab(), messages.getMessage("process.editor.messages"));
        tabSheet.addTab(otherTab = new OtherTab(), messages.getMessage("process.editor.other"));

        saveButton = VaadinUtility.button(messages.getMessage("process.editor.save"), new Runnable() {
File
ProcessEditorPanel.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
        permissionTab.setProcessConfig(processConfig);
        queueTab.setProcessConfig(processConfig);
        messageTab.setProcessConfig(processConfig);
<<<<<<< HEAD
=======
        //dictionaryTab.setProcessConfig(processConfig);
>>>>>>> ac4c7a4112b504265839ed449d687c3518a9590a
        otherTab.setProcessConfig(processConfig);
        processDefinitionTab.setProcessConfig(processConfig);
    }
Solution content 
        permissionTab.setProcessConfig(processConfig);
        queueTab.setProcessConfig(processConfig);
        messageTab.setProcessConfig(processConfig);
        otherTab.setProcessConfig(processConfig);
        processDefinitionTab.setProcessConfig(processConfig);
    }
File
ProcessEditorPanel.java
Developer's decision
Version 1
Kind of conflict
Comment