| Chunk |
|---|
| Conflicting content |
|---|
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
<<<<<<< HEAD
import org.apache.commons.lang.StringUtils;
import javax.swing.*;
=======
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.uiDesigner.core.GridConstraints;
import com.intellij.uiDesigner.core.GridLayoutManager;
import org.apache.commons.lang.StringUtils;
import javax.swing.*;
import java.awt.*;
>>>>>>> 0b4341b2eeb8ba62d3f19c8785001d6159992b71
public class HgGlobalStatusDialog extends DialogWrapper {
private JPanel contentPanel; |
| Solution content |
|---|
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import org.apache.commons.lang.StringUtils;
import javax.swing.*;
public class HgGlobalStatusDialog extends DialogWrapper {
private JPanel contentPanel; |
| File |
|---|
| HgGlobalStatusDialog.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
return contentPanel;
}
<<<<<<< HEAD
=======
{
// GUI initializer generated by IntelliJ IDEA GUI Designer
// >>> IMPORTANT!! <<<
// DO NOT EDIT OR ADD ANY CODE HERE!
$$$setupUI$$$();
}
/**
* Method generated by IntelliJ IDEA GUI Designer
private void $$$setupUI$$$() {
contentPanel = new JPanel();
* >>> IMPORTANT!! <<<
* DO NOT edit this method OR call it in your code!
*
* @noinspection ALL
*/
contentPanel.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
final JScrollPane scrollPane1 = ScrollPaneFactory.createScrollPane();
contentPanel.add(scrollPane1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, new Dimension(300, 350), null, null, 0, false));
outputTextArea = new JTextArea();
outputTextArea.setEditable(false);
scrollPane1.setViewportView(outputTextArea);
}
/**
* @noinspection ALL
*/
public JComponent $$$getRootComponent$$$() {
return contentPanel;
}
>>>>>>> 0b4341b2eeb8ba62d3f19c8785001d6159992b71
} |
| Solution content |
|---|
return contentPanel; } } |
| File |
|---|
| HgGlobalStatusDialog.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method declaration |
| Static initializer |