| Chunk |
|---|
| Conflicting content |
|---|
private URI modelUri;
private URI diagramUri;
<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/wizards/Bpmn2DiagramEditorInput.java
Bpmn2DiagramEditorInput(URI modelUri, URI diagramUri, TransactionalEditingDomain domain, String providerId) {
super(diagramUri.appendFragment("/0"), domain, providerId);
this.domain = domain;
=======
public Bpmn2DiagramEditorInput(URI modelUri, URI diagramUri, String providerId) {
super(diagramUri, providerId);
>>>>>>> ae4ec028e1b1fcdf3e4eca8d6932036baecaa428:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/Bpmn2DiagramEditorInput.java
this.modelUri = modelUri;
this.diagramUri = diagramUri;
} |
| Solution content |
|---|
private URI modelUri;
private URI diagramUri;
Bpmn2DiagramEditorInput(URI modelUri, URI diagramUri, TransactionalEditingDomain domain, String providerId) {
super(diagramUri.appendFragment("/0"), domain, providerId);
this.domain = domain;
this.modelUri = modelUri;
this.diagramUri = diagramUri;
} |
| File |
|---|
| Bpmn2DiagramEditorInput.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
public void setBpmnDiagram(BPMNDiagram bpmnDiagram) {
this.bpmnDiagram = bpmnDiagram;
}
<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/wizards/Bpmn2DiagramEditorInput.java
}
=======
@Override
public String getFactoryId() {
return Bpmn2DiagramEditorInputFactory.class.getName();
}
public void saveState(IMemento memento) {
super.saveState(memento);
// Do not store anything for deleted objects
boolean exists = exists();
if (!exists) {
return;
}
// Store object name, URI and diagram type provider ID
memento.putString(KEY_MODEL_URI, this.modelUri.toString());
}
}
>>>>>>> ae4ec028e1b1fcdf3e4eca8d6932036baecaa428:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/Bpmn2DiagramEditorInput.java |
| Solution content |
|---|
public void setBpmnDiagram(BPMNDiagram bpmnDiagram) {
this.bpmnDiagram = bpmnDiagram;
}
@Override
public String getFactoryId() {
return Bpmn2DiagramEditorInputFactory.class.getName();
}
public void saveState(IMemento memento) {
super.saveState(memento);
// Do not store anything for deleted objects
boolean exists = exists();
if (!exists) {
return;
}
// Store object name, URI and diagram type provider ID
memento.putString(KEY_MODEL_URI, this.modelUri.toString());
}
} |
| File |
|---|
| Bpmn2DiagramEditorInput.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
import org.eclipse.bpmn2.modeler.core.validation.BPMN2ProjectValidator; import org.eclipse.bpmn2.modeler.core.validation.BPMN2ValidationStatusLoader; import org.eclipse.bpmn2.modeler.ui.Activator; <<<<<<< HEAD import org.eclipse.bpmn2.modeler.ui.IFileChangeListener; ======= import org.eclipse.bpmn2.modeler.ui.Bpmn2DiagramEditorInput; >>>>>>> ae4ec028e1b1fcdf3e4eca8d6932036baecaa428 import org.eclipse.bpmn2.modeler.ui.property.artifact.CategoryDetailComposite; import org.eclipse.bpmn2.modeler.ui.property.artifact.TextAnnotationDetailComposite; import org.eclipse.bpmn2.modeler.ui.property.connectors.MessageFlowDetailComposite; |
| Solution content |
|---|
import org.eclipse.bpmn2.modeler.core.validation.BPMN2ProjectValidator; import org.eclipse.bpmn2.modeler.core.validation.BPMN2ValidationStatusLoader; import org.eclipse.bpmn2.modeler.ui.Activator; import org.eclipse.bpmn2.modeler.ui.IFileChangeListener; import org.eclipse.bpmn2.modeler.ui.property.artifact.CategoryDetailComposite; import org.eclipse.bpmn2.modeler.ui.property.artifact.TextAnnotationDetailComposite; import org.eclipse.bpmn2.modeler.ui.property.connectors.MessageFlowDetailComposite; |
| File |
|---|
| BPMN2Editor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |