| Chunk |
|---|
| Conflicting content |
|---|
import eu.delving.sip.base.CompileState; import eu.delving.sip.base.Exec; import eu.delving.sip.base.FrameBase; <<<<<<< HEAD import eu.delving.sip.base.Swing; import eu.delving.sip.model.MappingModel; ======= import eu.delving.sip.model.MappingCompileModel; >>>>>>> ee7c16c6b5531e61e0be483723d53401cab062a1 import eu.delving.sip.model.SipModel; import javax.swing.*; |
| Solution content |
|---|
import eu.delving.sip.base.CompileState; import eu.delving.sip.base.Exec; import eu.delving.sip.base.FrameBase; import eu.delving.sip.base.Swing; import eu.delving.sip.model.MappingCompileModel; import eu.delving.sip.model.SipModel; import javax.swing.*; |
| File |
|---|
| MappingCodeFrame.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
);
}
<<<<<<< HEAD
void refresh() {
Exec.run(new CodeUpdater());
}
=======
>>>>>>> ee7c16c6b5531e61e0be483723d53401cab062a1
@Override
protected void buildContent(Container content) {
JTabbedPane tabs = new JTabbedPane(); |
| Solution content |
|---|
);
}
@Override
protected void buildContent(Container content) {
JTabbedPane tabs = new JTabbedPane(); |
| File |
|---|
| MappingCodeFrame.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
}
}
<<<<<<< HEAD
private class CodeUpdater implements Swing {
=======
private static class CodeUpdater implements Runnable {
private String code;
private JTextArea textArea;
private CodeUpdater(String code, JTextArea textArea) {
this.code = code;
this.textArea = textArea;
}
>>>>>>> ee7c16c6b5531e61e0be483723d53401cab062a1
@Override
public void run() { |
| Solution content |
|---|
}
}
private static class CodeUpdater implements Swing {
private String code;
private JTextArea textArea;
private CodeUpdater(String code, JTextArea textArea) {
this.code = code;
this.textArea = textArea;
}
@Override
public void run() { |
| File |
|---|
| MappingCodeFrame.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Class signature |
| Method declaration |