Projects >> intellij-community >>2ff3ca86ca295acee04f38160ae236ace6d93cd4

Chunk
Conflicting content 
package org.jetbrains.plugins.coursecreator.actions;

<<<<<<< HEAD
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
=======
>>>>>>> a8614d92325c7fb175c06c9f305abdf4ff215de7
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.Presentation;
Solution content 
package org.jetbrains.plugins.coursecreator.actions;

import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.Presentation;
File
CCAddTaskWindow.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    taskFile.addTaskWindow(taskWindow, index);
    taskWindow.drawHighlighter(editor, false);
    taskWindow.createGuardedBlocks(editor);
<<<<<<< HEAD
    DaemonCodeAnalyzer.getInstance(project).restart(file);
=======
>>>>>>> a8614d92325c7fb175c06c9f305abdf4ff215de7
  }

  @Override
Solution content 
    taskFile.addTaskWindow(taskWindow, index);
    taskWindow.drawHighlighter(editor, false);
    taskWindow.createGuardedBlocks(editor);
    DaemonCodeAnalyzerImpl.getInstance(project).restart(file);
  }

  @Override
File
CCAddTaskWindow.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
  }

  private void initializeButtons(@NotNull final JPanel taskActionsPanel, @NotNull final TaskFile taskFile) {
<<<<<<< HEAD
    myCheckButton = addButton(taskActionsPanel, "Check task", StudyIcons.Resolve);
    myPrevTaskButton = addButton(taskActionsPanel, "Previous Task", StudyIcons.Prev);
    myNextTaskButton = addButton(taskActionsPanel, "Next Task", AllIcons.Actions.Forward);
    myRefreshButton = addButton(taskActionsPanel, "Start task again", AllIcons.Actions.Refresh);
=======
    myCheckButton = addButton(taskActionsPanel, "Check task (Ctrl + Alt + Enter)", StudyIcons.Resolve);
    myPrevTaskButton = addButton(taskActionsPanel, "Previous task (Ctrl + <)", StudyIcons.Prev);
    myNextTaskButton = addButton(taskActionsPanel, "Next task (Ctrl + >)", AllIcons.Actions.Forward);
    myRefreshButton = addButton(taskActionsPanel, "Reset task file (Ctrl + Shift + X)", AllIcons.Actions.Refresh);
    JButton myShowHintButton = addButton(taskActionsPanel, "Show hint for task window (Ctrl + 7)", StudyIcons.ShowHint);
>>>>>>> a8614d92325c7fb175c06c9f305abdf4ff215de7
    if (!taskFile.getTask().getUserTests().isEmpty()) {
      JButton runButton = addButton(taskActionsPanel, "Run", AllIcons.General.Run);
      runButton.addActionListener(new ActionListener() {
Solution content 
  }

  private void initializeButtons(@NotNull final JPanel taskActionsPanel, @NotNull final TaskFile taskFile) {
    myCheckButton = addButton(taskActionsPanel, "Check task (Ctrl + Alt + Enter)", StudyIcons.Resolve);
    myPrevTaskButton = addButton(taskActionsPanel, "Previous task (Ctrl + <)", StudyIcons.Prev);
    myNextTaskButton = addButton(taskActionsPanel, "Next task (Ctrl + >)", AllIcons.Actions.Forward);
    myRefreshButton = addButton(taskActionsPanel, "Reset task file (Ctrl + Shift + X)", AllIcons.Actions.Refresh);
    JButton myShowHintButton = addButton(taskActionsPanel, "Show hint for task window (Ctrl + 7)", StudyIcons.ShowHint);
    if (!taskFile.getTask().getUserTests().isEmpty()) {
      JButton runButton = addButton(taskActionsPanel, "Run", AllIcons.General.Run);
      runButton.addActionListener(new ActionListener() {
File
StudyEditor.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Variable