Projects >> bpmn2-modeler >>2034fc3f6a556ea530b81e04fcbd4b919920021e

Chunk
Conflicting content 
import org.eclipse.bpmn2.modeler.core.features.event.AbstractBoundaryEventOperation;
import org.eclipse.bpmn2.modeler.core.utils.BusinessObjectUtil;
import org.eclipse.bpmn2.modeler.ui.features.AbstractDefaultDeleteFeature;
<<<<<<< HEAD
import org.eclipse.bpmn2.modeler.ui.features.activity.subprocess.CollapseSubProcessFeature;
import org.eclipse.bpmn2.modeler.ui.features.activity.subprocess.ExpandSubProcessFeature;
=======
import org.eclipse.bpmn2.modeler.ui.features.activity.subprocess.CollapseFlowNodeFeature;
import org.eclipse.bpmn2.modeler.ui.features.activity.subprocess.ExpandFlowNodeFeature;
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0
import org.eclipse.bpmn2.modeler.ui.features.event.AppendEventFeature;
import org.eclipse.bpmn2.modeler.ui.features.gateway.AppendGatewayFeature;
import org.eclipse.graphiti.features.IDeleteFeature;
Solution content 
import org.eclipse.bpmn2.modeler.core.features.event.AbstractBoundaryEventOperation;
import org.eclipse.bpmn2.modeler.core.utils.BusinessObjectUtil;
import org.eclipse.bpmn2.modeler.ui.features.AbstractDefaultDeleteFeature;
import org.eclipse.bpmn2.modeler.ui.features.activity.subprocess.CollapseFlowNodeFeature;
import org.eclipse.bpmn2.modeler.ui.features.activity.subprocess.ExpandFlowNodeFeature;
import org.eclipse.bpmn2.modeler.ui.features.event.AppendEventFeature;
import org.eclipse.bpmn2.modeler.ui.features.gateway.AppendGatewayFeature;
import org.eclipse.graphiti.features.IDeleteFeature;
File
AbstractActivityFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
package org.eclipse.bpmn2.modeler.ui.features.activity.subprocess;

import org.eclipse.bpmn2.BaseElement;
<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/AbstractSubProcessFeatureContainer.java
=======
import org.eclipse.bpmn2.CallActivity;
import org.eclipse.bpmn2.CallChoreography;
import org.eclipse.bpmn2.SubChoreography;
import org.eclipse.bpmn2.SubProcess;
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/AbstractExpandableActivityFeatureContainer.java
import org.eclipse.bpmn2.modeler.core.features.AbstractUpdateBaseElementFeature;
import org.eclipse.bpmn2.modeler.core.features.MultiUpdateFeature;
import org.eclipse.bpmn2.modeler.ui.features.activity.AbstractActivityFeatureContainer;
Solution content 
package org.eclipse.bpmn2.modeler.ui.features.activity.subprocess;

import org.eclipse.bpmn2.BaseElement;
import org.eclipse.bpmn2.CallActivity;
import org.eclipse.bpmn2.CallChoreography;
import org.eclipse.bpmn2.SubChoreography;
import org.eclipse.bpmn2.SubProcess;
import org.eclipse.bpmn2.modeler.core.features.AbstractUpdateBaseElementFeature;
import org.eclipse.bpmn2.modeler.core.features.MultiUpdateFeature;
import org.eclipse.bpmn2.modeler.ui.features.activity.AbstractActivityFeatureContainer;
File
AbstractExpandableActivityFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.eclipse.graphiti.features.ILayoutFeature;
import org.eclipse.graphiti.features.IResizeShapeFeature;
import org.eclipse.graphiti.features.context.IUpdateContext;
<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/AbstractSubProcessFeatureContainer.java

public abstract class AbstractSubProcessFeatureContainer extends AbstractActivityFeatureContainer {
=======
import org.eclipse.graphiti.features.custom.ICustomFeature;

public abstract class AbstractExpandableActivityFeatureContainer extends AbstractActivityFeatureContainer {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/AbstractExpandableActivityFeatureContainer.java

	@Override
	public IDirectEditingFeature getDirectEditingFeature(IFeatureProvider fp) {
Solution content 
import org.eclipse.graphiti.features.ILayoutFeature;
import org.eclipse.graphiti.features.IResizeShapeFeature;
import org.eclipse.graphiti.features.context.IUpdateContext;
import org.eclipse.graphiti.features.custom.ICustomFeature;

public abstract class AbstractExpandableActivityFeatureContainer extends AbstractActivityFeatureContainer {

	@Override
	public IDirectEditingFeature getDirectEditingFeature(IFeatureProvider fp) {
File
AbstractExpandableActivityFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
	@Override
	public ILayoutFeature getLayoutFeature(IFeatureProvider fp) {
<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/AbstractSubProcessFeatureContainer.java
		return new LayoutSubProcessFeature(fp);
=======
		return new LayoutExpandableActivityFeature(fp);
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/AbstractExpandableActivityFeatureContainer.java
	}

	@Override
Solution content 
	@Override
	public ILayoutFeature getLayoutFeature(IFeatureProvider fp) {
		return new LayoutExpandableActivityFeature(fp);
	}

	@Override
File
AbstractExpandableActivityFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
	@Override
	public IResizeShapeFeature getResizeFeature(IFeatureProvider fp) {
<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/AbstractSubProcessFeatureContainer.java
		return new ResizeSubProcessFeature(fp);
=======
		return new ResizeExpandableActivityFeature(fp);
	}
	
	@Override
	public ICustomFeature[] getCustomFeatures(IFeatureProvider fp) {
		ICustomFeature[] superFeatures = super.getCustomFeatures(fp);
		ICustomFeature[] thisFeatures = new ICustomFeature[2 + superFeatures.length];
		thisFeatures[0] = new ExpandFlowNodeFeature(fp);
		thisFeatures[1] = new CollapseFlowNodeFeature(fp);
		for (int i=0; i>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/AbstractExpandableActivityFeatureContainer.java
	}
}
Solution content 
	@Override
	public IResizeShapeFeature getResizeFeature(IFeatureProvider fp) {
		return new ResizeExpandableActivityFeature(fp);
	}
	
	@Override
	public ICustomFeature[] getCustomFeatures(IFeatureProvider fp) {
		ICustomFeature[] superFeatures = super.getCustomFeatures(fp);
		ICustomFeature[] thisFeatures = new ICustomFeature[2 + superFeatures.length];
		thisFeatures[0] = new ExpandFlowNodeFeature(fp);
		thisFeatures[1] = new CollapseFlowNodeFeature(fp);
		for (int i=0; i
File
AbstractExpandableActivityFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
import org.eclipse.bpmn2.Activity;
import org.eclipse.bpmn2.AdHocSubProcess;
import org.eclipse.bpmn2.Bpmn2Package;
<<<<<<< HEAD
=======
import org.eclipse.bpmn2.modeler.core.features.MultiUpdateFeature;
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0
import org.eclipse.bpmn2.modeler.core.features.activity.AbstractCreateExpandableFlowNodeFeature;
import org.eclipse.bpmn2.modeler.core.model.Bpmn2ModelerFactory;
import org.eclipse.bpmn2.modeler.core.utils.GraphicsUtil;
Solution content 
import org.eclipse.bpmn2.Activity;
import org.eclipse.bpmn2.AdHocSubProcess;
import org.eclipse.bpmn2.Bpmn2Package;
import org.eclipse.bpmn2.modeler.core.features.MultiUpdateFeature;
import org.eclipse.bpmn2.modeler.core.features.activity.AbstractCreateExpandableFlowNodeFeature;
import org.eclipse.bpmn2.modeler.core.model.Bpmn2ModelerFactory;
import org.eclipse.bpmn2.modeler.core.utils.GraphicsUtil;
File
AdHocSubProcessFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.eclipse.graphiti.services.Graphiti;
import org.eclipse.graphiti.services.IPeService;

<<<<<<< HEAD
public class AdHocSubProcessFeatureContainer extends AbstractSubProcessFeatureContainer {
=======
public class AdHocSubProcessFeatureContainer extends AbstractExpandableActivityFeatureContainer {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0

	@Override
	public boolean canApplyTo(Object o) {
Solution content 
import org.eclipse.graphiti.services.Graphiti;
import org.eclipse.graphiti.services.IPeService;

public class AdHocSubProcessFeatureContainer extends AbstractExpandableActivityFeatureContainer {

	@Override
	public boolean canApplyTo(Object o) {
File
AdHocSubProcessFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
	@Override
	public IAddFeature getAddFeature(IFeatureProvider fp) {
<<<<<<< HEAD
		return new AddExpandedActivityFeature(fp) {
=======
		return new AddExpandableActivityFeature(fp) {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0
			@Override
			protected void hook(AdHocSubProcess activity, ContainerShape container, IAddContext context, int width, int height) {
				super.hook(activity, container, context, width, height);
Solution content 
	@Override
	public IAddFeature getAddFeature(IFeatureProvider fp) {
		return new AddExpandableActivityFeature(fp) {
			@Override
			protected void hook(AdHocSubProcess activity, ContainerShape container, IAddContext context, int width, int height) {
				super.hook(activity, container, context, width, height);
File
AdHocSubProcessFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
		};
	}

<<<<<<< HEAD
=======
	@Override
	public MultiUpdateFeature getUpdateFeature(IFeatureProvider fp) {
		MultiUpdateFeature multiUpdate = super.getUpdateFeature(fp);
		UpdateExpandableActivityFeature updateFeature = new UpdateExpandableActivityFeature(fp);
		multiUpdate.addUpdateFeature(updateFeature);
		return multiUpdate;
	}

>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0
	public static class CreateAdHocSubProcessFeature extends AbstractCreateExpandableFlowNodeFeature {

		public CreateAdHocSubProcessFeature(IFeatureProvider fp) {
Solution content 
		};
	}

	@Override
	public MultiUpdateFeature getUpdateFeature(IFeatureProvider fp) {
		MultiUpdateFeature multiUpdate = super.getUpdateFeature(fp);
		UpdateExpandableActivityFeature updateFeature = new UpdateExpandableActivityFeature(fp);
		multiUpdate.addUpdateFeature(updateFeature);
		return multiUpdate;
	}

	public static class CreateAdHocSubProcessFeature extends AbstractCreateExpandableFlowNodeFeature {

		public CreateAdHocSubProcessFeature(IFeatureProvider fp) {
File
AdHocSubProcessFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
		public CreateAdHocSubProcessFeature(IFeatureProvider fp) {
			super(fp, "Ad-Hoc Sub-Process",
<<<<<<< HEAD
					"A specialized description of Sub-Process that is a group of Activities that have no REQUIRED sequence relationships");
=======
					"A specialized sub-process in which the Activities have no required sequence relationships");
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0
		}

		@Override
Solution content 
		public CreateAdHocSubProcessFeature(IFeatureProvider fp) {
			super(fp, "Ad-Hoc Sub-Process",
					"A specialized sub-process in which the Activities have no required sequence relationships");
		}

		@Override
File
AdHocSubProcessFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
import org.eclipse.graphiti.services.IGaService;
import org.eclipse.graphiti.services.IPeService;

<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/AddExpandedActivityFeature.java
public class AddExpandedActivityFeature
	extends AbstractAddActivityFeature {

	public AddExpandedActivityFeature(IFeatureProvider fp) {
=======
public class AddExpandableActivityFeature
	extends AbstractAddActivityFeature {

	public AddExpandableActivityFeature(IFeatureProvider fp) {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/AddExpandableActivityFeature.java
		super(fp);
	}
Solution content 
import org.eclipse.graphiti.services.IGaService;
import org.eclipse.graphiti.services.IPeService;

public class AddExpandableActivityFeature
	extends AbstractAddActivityFeature {
	public AddExpandableActivityFeature(IFeatureProvider fp) {
		super(fp);
	}
File
AddExpandableActivityFeature.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
import org.eclipse.graphiti.services.IGaService;
import org.eclipse.graphiti.services.IPeService;

<<<<<<< HEAD
public class CallActivityFeatureContainer extends AbstractSubProcessFeatureContainer {
=======
public class CallActivityFeatureContainer extends AbstractExpandableActivityFeatureContainer {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0

	private static final int MARKER_OFFSET = 4;
	private static final String CALL_ACTIVITY_REF_PROPERTY = "call.activity.ref";
Solution content 
import org.eclipse.graphiti.services.IGaService;
import org.eclipse.graphiti.services.IPeService;

public class CallActivityFeatureContainer extends AbstractExpandableActivityFeatureContainer {

	private static final int MARKER_OFFSET = 4;
	private static final String CALL_ACTIVITY_REF_PROPERTY = "call.activity.ref";
File
CallActivityFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
	@Override
	public IAddFeature getAddFeature(IFeatureProvider fp) {
<<<<<<< HEAD
		return new AddExpandedActivityFeature(fp) {
=======
		return new AddExpandableActivityFeature(fp) {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0
			@Override
			protected void hook(CallActivity activity, ContainerShape container, IAddContext context, int width, int height) {
				super.hook(activity, container, context, width, height);
Solution content 
	@Override
	public IAddFeature getAddFeature(IFeatureProvider fp) {
		return new AddExpandableActivityFeature(fp) {
			@Override
			protected void hook(CallActivity activity, ContainerShape container, IAddContext context, int width, int height) {
				super.hook(activity, container, context, width, height);
File
CallActivityFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
=======

	@Override
	public ILayoutFeature getLayoutFeature(IFeatureProvider fp) {
<<<<<<< HEAD
		return new LayoutActivityFeature(fp) {
		return new LayoutExpandableActivityFeature(fp) {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0
			protected int getMarkerContainerOffset() {
				return MARKER_OFFSET;
			}
Solution content 
	@Override
	public ILayoutFeature getLayoutFeature(IFeatureProvider fp) {
		return new LayoutExpandableActivityFeature(fp) {
			protected int getMarkerContainerOffset() {
				return MARKER_OFFSET;
			}
File
CallActivityFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
		public CreateCallActivityFeature(IFeatureProvider fp) {
		
			super(fp, "Call Activity",
<<<<<<< HEAD
					"Identifies a point in the Process where a global Process or a Global Task is used");
=======
					"Identifies a point in the Process where a global Process or a Global Task is called");
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0
		}

		@Override
Solution content 
		
		public CreateCallActivityFeature(IFeatureProvider fp) {
			super(fp, "Call Activity",
					"Identifies a point in the Process where a global Process or a Global Task is called");
		}

		@Override
File
CallActivityFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
 ******************************************************************************/
package org.eclipse.bpmn2.modeler.ui.features.activity.subprocess;

<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/CollapseSubProcessFeature.java
import org.eclipse.bpmn2.SubProcess;
=======
import org.eclipse.bpmn2.FlowNode;
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/CollapseFlowNodeFeature.java
import org.eclipse.bpmn2.di.BPMNShape;
import org.eclipse.bpmn2.modeler.core.ModelHandlerLocator;
import org.eclipse.bpmn2.modeler.core.utils.GraphicsUtil;
Solution content 
 ******************************************************************************/
package org.eclipse.bpmn2.modeler.ui.features.activity.subprocess;

import org.eclipse.bpmn2.FlowNode;
import org.eclipse.bpmn2.di.BPMNShape;
import org.eclipse.bpmn2.modeler.core.ModelHandlerLocator;
import org.eclipse.bpmn2.modeler.core.utils.GraphicsUtil;
File
CollapseFlowNodeFeature.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.eclipse.graphiti.mm.pictograms.ContainerShape;
import org.eclipse.graphiti.mm.pictograms.PictogramElement;

<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/CollapseSubProcessFeature.java
public class CollapseSubProcessFeature extends AbstractCustomFeature {

	public CollapseSubProcessFeature(IFeatureProvider fp) {
=======
public class CollapseFlowNodeFeature extends AbstractCustomFeature {

	public CollapseFlowNodeFeature(IFeatureProvider fp) {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/CollapseFlowNodeFeature.java
		super(fp);
		// TODO Auto-generated constructor stub
	}
Solution content 
import org.eclipse.graphiti.mm.pictograms.ContainerShape;
import org.eclipse.graphiti.mm.pictograms.PictogramElement;

public class CollapseFlowNodeFeature extends AbstractCustomFeature {

	public CollapseFlowNodeFeature(IFeatureProvider fp) {
		super(fp);
		// TODO Auto-generated constructor stub
	}
File
CollapseFlowNodeFeature.java
Developer's decision
Version 2
Kind of conflict
Class signature
Method signature
Chunk
Conflicting content 
	@Override
	public String getDescription() {

<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/CollapseSubProcessFeature.java
		return "Collapse the Sub-Process and hide contents"; //$NON-NLS-1$
=======
		return "Collapse the Activity and hide contents"; //$NON-NLS-1$
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/CollapseFlowNodeFeature.java
	}

	@Override
Solution content 
	@Override
	public String getDescription() {

		return "Collapse the Activity and hide contents"; //$NON-NLS-1$
	}

	@Override
File
CollapseFlowNodeFeature.java
Developer's decision
Version 2
Kind of conflict
Comment
Return statement
Chunk
Conflicting content 
		PictogramElement[] pes = context.getPictogramElements();
		if (pes != null && pes.length == 1) {
			Object bo = getBusinessObjectForPictogramElement(pes[0]);
<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/CollapseSubProcessFeature.java
			if (bo instanceof SubProcess) {
				try {
					BPMNShape bpmnShape = (BPMNShape) ModelHandlerLocator.getModelHandler(getDiagram().eResource()).findDIElement((SubProcess)bo);
=======
			if (AbstractExpandableActivityFeatureContainer.isExpandableElement(bo)) {
				try {
					BPMNShape bpmnShape = (BPMNShape) ModelHandlerLocator.getModelHandler(getDiagram().eResource()).findDIElement((FlowNode)bo);
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/CollapseFlowNodeFeature.java
					if (bpmnShape.isIsExpanded())
						ret = true;
				} catch (Exception e) {
Solution content 
		PictogramElement[] pes = context.getPictogramElements();
		if (pes != null && pes.length == 1) {
			Object bo = getBusinessObjectForPictogramElement(pes[0]);
			if (AbstractExpandableActivityFeatureContainer.isExpandableElement(bo)) {
				try {
					BPMNShape bpmnShape = (BPMNShape) ModelHandlerLocator.getModelHandler(getDiagram().eResource()).findDIElement((FlowNode)bo);
					if (bpmnShape.isIsExpanded())
						ret = true;
				} catch (Exception e) {
File
CollapseFlowNodeFeature.java
Developer's decision
Version 2
Kind of conflict
Cast expression
If statement
Try statement
Variable
Chunk
Conflicting content 
			if (pe0 instanceof ContainerShape && bo instanceof FlowNode) {
		if (pes != null && pes.length == 1) {
			PictogramElement pe0 = pes[0];
			Object bo = getBusinessObjectForPictogramElement(pe0);
<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/CollapseSubProcessFeature.java
			if (pe0 instanceof ContainerShape && bo instanceof SubProcess) {
				ContainerShape containerShape = (ContainerShape)pe0;
				SubProcess subProcess = (SubProcess)bo;
				try {
					BPMNShape bpmnShape = (BPMNShape) ModelHandlerLocator.getModelHandler(getDiagram().eResource()).findDIElement(subProcess);
					if (bpmnShape.isIsExpanded()) {
						
						// SubProcess is collapsed - resize to standard modelObject size
						// NOTE: children tasks will be set not-visible in LayoutSubProcessFeature
=======
				ContainerShape containerShape = (ContainerShape)pe0;
				FlowNode flowNode = (FlowNode)bo;
				try {
					BPMNShape bpmnShape = (BPMNShape) ModelHandlerLocator.getModelHandler(getDiagram().eResource()).findDIElement(flowNode);
					if (bpmnShape.isIsExpanded()) {
						
						// SubProcess is collapsed - resize to standard modelObject size
						// NOTE: children tasks will be set not-visible in LayoutExpandableActivityFeature
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/CollapseFlowNodeFeature.java
						
						bpmnShape.setIsExpanded(false);
Solution content 
		if (pes != null && pes.length == 1) {
			PictogramElement pe0 = pes[0];
			Object bo = getBusinessObjectForPictogramElement(pe0);
			if (pe0 instanceof ContainerShape && bo instanceof FlowNode) {
				ContainerShape containerShape = (ContainerShape)pe0;
				FlowNode flowNode = (FlowNode)bo;
				try {
					BPMNShape bpmnShape = (BPMNShape) ModelHandlerLocator.getModelHandler(getDiagram().eResource()).findDIElement(flowNode);
					if (bpmnShape.isIsExpanded()) {
						
						// SubProcess is collapsed - resize to standard modelObject size
						// NOTE: children tasks will be set not-visible in LayoutExpandableActivityFeature
						
						bpmnShape.setIsExpanded(false);
File
CollapseFlowNodeFeature.java
Developer's decision
Version 2
Kind of conflict
Cast expression
Comment
If statement
Try statement
Variable
Chunk
Conflicting content 
 ******************************************************************************/
package org.eclipse.bpmn2.modeler.ui.features.activity.subprocess;

<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/ExpandSubProcessFeature.java
import org.eclipse.bpmn2.SubProcess;
=======
import org.eclipse.bpmn2.FlowNode;
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/ExpandFlowNodeFeature.java
import org.eclipse.bpmn2.di.BPMNShape;
import org.eclipse.bpmn2.modeler.core.ModelHandlerLocator;
import org.eclipse.bpmn2.modeler.ui.ImageProvider;
Solution content 
 ******************************************************************************/
package org.eclipse.bpmn2.modeler.ui.features.activity.subprocess;

import org.eclipse.bpmn2.FlowNode;
import org.eclipse.bpmn2.di.BPMNShape;
import org.eclipse.bpmn2.modeler.core.ModelHandlerLocator;
import org.eclipse.bpmn2.modeler.ui.ImageProvider;
File
ExpandFlowNodeFeature.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.eclipse.graphiti.mm.pictograms.PictogramElement;

// NOT USED YET
<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/ExpandSubProcessFeature.java
public class ExpandSubProcessFeature extends AbstractCustomFeature {

	public ExpandSubProcessFeature(IFeatureProvider fp) {
=======
public class ExpandFlowNodeFeature extends AbstractCustomFeature {

	public ExpandFlowNodeFeature(IFeatureProvider fp) {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/ExpandFlowNodeFeature.java
	    super(fp);
    }
Solution content 
import org.eclipse.graphiti.mm.pictograms.PictogramElement;

// NOT USED YET
public class ExpandFlowNodeFeature extends AbstractCustomFeature {

	public ExpandFlowNodeFeature(IFeatureProvider fp) {
	    super(fp);
    }
File
ExpandFlowNodeFeature.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
	
	@Override
	public String getDescription() {
<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/ExpandSubProcessFeature.java
	    return "Expand the Sub-Process and show contents";
=======
	    return "Expand the Activity and show contents";
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/ExpandFlowNodeFeature.java
	}

	@Override
Solution content 
	
	@Override
	public String getDescription() {
	    return "Expand the Activity and show contents";
	}

	@Override
File
ExpandFlowNodeFeature.java
Developer's decision
Version 2
Kind of conflict
Return statement
Chunk
Conflicting content 
		PictogramElement[] pes = context.getPictogramElements();
		if (pes != null && pes.length == 1) {
			Object bo = getBusinessObjectForPictogramElement(pes[0]);
<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/ExpandSubProcessFeature.java
			if (bo instanceof SubProcess) {
				try {
					BPMNShape bpmnShape = (BPMNShape) ModelHandlerLocator.getModelHandler(getDiagram().eResource()).findDIElement((SubProcess)bo);
=======
			if (AbstractExpandableActivityFeatureContainer.isExpandableElement(bo)) {
				try {
					BPMNShape bpmnShape = (BPMNShape) ModelHandlerLocator.getModelHandler(getDiagram().eResource()).findDIElement((FlowNode)bo);
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/ExpandFlowNodeFeature.java
					if (!bpmnShape.isIsExpanded())
						ret = true;
				} catch (Exception e) {
Solution content 
		PictogramElement[] pes = context.getPictogramElements();
		if (pes != null && pes.length == 1) {
			Object bo = getBusinessObjectForPictogramElement(pes[0]);
			if (AbstractExpandableActivityFeatureContainer.isExpandableElement(bo)) {
				try {
					BPMNShape bpmnShape = (BPMNShape) ModelHandlerLocator.getModelHandler(getDiagram().eResource()).findDIElement((FlowNode)bo);
					if (!bpmnShape.isIsExpanded())
						ret = true;
				} catch (Exception e) {
File
ExpandFlowNodeFeature.java
Developer's decision
Version 2
Kind of conflict
Cast expression
If statement
Try statement
Variable
Chunk
Conflicting content 
		if (pes != null && pes.length == 1) {
			PictogramElement pe0 = pes[0];
			Object bo = getBusinessObjectForPictogramElement(pe0);
<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/ExpandSubProcessFeature.java
			if (pe0 instanceof ContainerShape && bo instanceof SubProcess) {
				ContainerShape containerShape = (ContainerShape)pe0;
				SubProcess subProcess = (SubProcess)bo;
				try {
					BPMNShape bpmnShape = (BPMNShape) ModelHandlerLocator.getModelHandler(getDiagram().eResource()).findDIElement(subProcess);
					if (!bpmnShape.isIsExpanded()) {
						
						// SubProcess is collapsed - resize to minimum size such that all children are visible
						// NOTE: children tasks will be set visible in LayoutSubProcessFeature
=======
			if (pe0 instanceof ContainerShape && bo instanceof FlowNode) {
				ContainerShape containerShape = (ContainerShape)pe0;
				FlowNode flowNode = (FlowNode)bo;
				try {
					BPMNShape bpmnShape = (BPMNShape) ModelHandlerLocator.getModelHandler(getDiagram().eResource()).findDIElement(flowNode);
					if (!bpmnShape.isIsExpanded()) {
						
						// SubProcess is collapsed - resize to minimum size such that all children are visible
						// NOTE: children tasks will be set visible in LayoutExpandableActivityFeature
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/ExpandFlowNodeFeature.java

						bpmnShape.setIsExpanded(true);
Solution content 
		if (pes != null && pes.length == 1) {
			PictogramElement pe0 = pes[0];
			Object bo = getBusinessObjectForPictogramElement(pe0);
			if (pe0 instanceof ContainerShape && bo instanceof FlowNode) {
				ContainerShape containerShape = (ContainerShape)pe0;
				FlowNode flowNode = (FlowNode)bo;
				try {
					BPMNShape bpmnShape = (BPMNShape) ModelHandlerLocator.getModelHandler(getDiagram().eResource()).findDIElement(flowNode);
					if (!bpmnShape.isIsExpanded()) {
						
						// SubProcess is collapsed - resize to minimum size such that all children are visible
						// NOTE: children tasks will be set visible in LayoutExpandableActivityFeature

						bpmnShape.setIsExpanded(true);
File
ExpandFlowNodeFeature.java
Developer's decision
Version 2
Kind of conflict
Cast expression
Comment
If statement
Try statement
Variable
Chunk
Conflicting content 
						IResizeShapeFeature resizeFeature = getFeatureProvider().getResizeShapeFeature(resizeContext);
						int oldWidth = ga.getWidth();
						int oldHeight = ga.getHeight();
<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/ExpandSubProcessFeature.java
						ResizeSubProcessFeature.SizeCalculator newSize = new ResizeSubProcessFeature.SizeCalculator(containerShape);
=======
						ResizeExpandableActivityFeature.SizeCalculator newSize = new ResizeExpandableActivityFeature.SizeCalculator(containerShape);
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/ExpandFlowNodeFeature.java
						int newWidth = newSize.getWidth();
						int newHeight = newSize.getHeight();
						resizeContext.setX(ga.getX() + oldWidth/2 - newWidth/2);
Solution content 
						IResizeShapeFeature resizeFeature = getFeatureProvider().getResizeShapeFeature(resizeContext);
						int oldWidth = ga.getWidth();
						int oldHeight = ga.getHeight();
						ResizeExpandableActivityFeature.SizeCalculator newSize = new ResizeExpandableActivityFeature.SizeCalculator(containerShape);
						int newWidth = newSize.getWidth();
						int newHeight = newSize.getHeight();
						resizeContext.setX(ga.getX() + oldWidth/2 - newWidth/2);
File
ExpandFlowNodeFeature.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
import org.eclipse.graphiti.mm.pictograms.PictogramElement;
import org.eclipse.graphiti.mm.pictograms.Shape;

<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/LayoutSubProcessFeature.java
public class LayoutSubProcessFeature extends LayoutActivityFeature {

	public LayoutSubProcessFeature(IFeatureProvider fp) {
=======
public class LayoutExpandableActivityFeature extends LayoutActivityFeature {

	public LayoutExpandableActivityFeature(IFeatureProvider fp) {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/LayoutExpandableActivityFeature.java
		super(fp);
	}
Solution content 
import org.eclipse.graphiti.mm.pictograms.PictogramElement;
import org.eclipse.graphiti.mm.pictograms.Shape;

public class LayoutExpandableActivityFeature extends LayoutActivityFeature {

	public LayoutExpandableActivityFeature(IFeatureProvider fp) {
		super(fp);
	}
File
LayoutExpandableActivityFeature.java
Developer's decision
Version 2
Kind of conflict
Class signature
Method signature
Chunk
Conflicting content 
import org.eclipse.graphiti.mm.pictograms.PictogramElement;
import org.eclipse.graphiti.services.Graphiti;

<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/ResizeSubProcessFeature.java
public class ResizeSubProcessFeature extends DefaultResizeBPMNShapeFeature {
	public final static int MARGIN = 20;
	
	public ResizeSubProcessFeature(IFeatureProvider fp) {
=======
public class ResizeExpandableActivityFeature extends DefaultResizeBPMNShapeFeature {
	public final static int MARGIN = 20;
	
	public ResizeExpandableActivityFeature(IFeatureProvider fp) {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/ResizeExpandableActivityFeature.java
		super(fp);
	}
Solution content 
import org.eclipse.graphiti.mm.pictograms.PictogramElement;
import org.eclipse.graphiti.services.Graphiti;

public class ResizeExpandableActivityFeature extends DefaultResizeBPMNShapeFeature {
	public final static int MARGIN = 20;
	
	public ResizeExpandableActivityFeature(IFeatureProvider fp) {
		super(fp);
	}
File
ResizeExpandableActivityFeature.java
Developer's decision
Version 2
Kind of conflict
Attribute
Class signature
Method signature
Chunk
Conflicting content 
import org.eclipse.graphiti.features.context.ICreateContext;
import org.eclipse.graphiti.features.custom.ICustomFeature;

<<<<<<< HEAD
public class SubProcessFeatureContainer extends AbstractSubProcessFeatureContainer {
=======
public class SubProcessFeatureContainer extends AbstractExpandableActivityFeatureContainer {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0

	public static final String TRIGGERED_BY_EVENT = "triggered-by-event-key";
	public static final String IS_EXPANDED = "is-expanded-key";
Solution content 
import org.eclipse.graphiti.features.context.ICreateContext;
import org.eclipse.graphiti.features.custom.ICustomFeature;

public class SubProcessFeatureContainer extends AbstractExpandableActivityFeatureContainer {

	public static final String TRIGGERED_BY_EVENT = "triggered-by-event-key";
	public static final String IS_EXPANDED = "is-expanded-key";
File
SubProcessFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
	@Override
	public IAddFeature getAddFeature(IFeatureProvider fp) {
<<<<<<< HEAD
		return new AddExpandedActivityFeature(fp);
=======
		return new AddExpandableActivityFeature(fp);
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0
	}

	@Override
Solution content 
	@Override
	public IAddFeature getAddFeature(IFeatureProvider fp) {
		return new AddExpandableActivityFeature(fp);
	}

	@Override
File
SubProcessFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
		return multiUpdate;
	@Override
	public MultiUpdateFeature getUpdateFeature(IFeatureProvider fp) {
		MultiUpdateFeature multiUpdate = super.getUpdateFeature(fp);
<<<<<<< HEAD
		UpdateSubProcessFeature updateSubProcessFeature = new UpdateSubProcessFeature(fp);
		multiUpdate.addUpdateFeature(updateSubProcessFeature);
	}
	
	@Override
	public ICustomFeature[] getCustomFeatures(IFeatureProvider fp) {
		ICustomFeature[] superFeatures = super.getCustomFeatures(fp);
		ICustomFeature[] thisFeatures = new ICustomFeature[2 + superFeatures.length];
		thisFeatures[0] = new ExpandSubProcessFeature(fp);
		thisFeatures[1] = new CollapseSubProcessFeature(fp);
		for (int i=0; i>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0

	public static class CreateSubProcessFeature extends AbstractCreateExpandableFlowNodeFeature {
Solution content 
	@Override
	public MultiUpdateFeature getUpdateFeature(IFeatureProvider fp) {
		MultiUpdateFeature multiUpdate = super.getUpdateFeature(fp);
		UpdateExpandableActivityFeature updateFeature = new UpdateExpandableActivityFeature(fp);
		multiUpdate.addUpdateFeature(updateFeature);
		return multiUpdate;
	}

	public static class CreateSubProcessFeature extends AbstractCreateExpandableFlowNodeFeature {
File
SubProcessFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Method invocation
Return statement
Variable
Chunk
Conflicting content 
import org.eclipse.bpmn2.Bpmn2Package;
import org.eclipse.bpmn2.Transaction;
<<<<<<< HEAD
=======
import org.eclipse.bpmn2.modeler.core.features.MultiUpdateFeature;
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0
import org.eclipse.bpmn2.modeler.core.features.activity.AbstractCreateExpandableFlowNodeFeature;
import org.eclipse.bpmn2.modeler.core.model.Bpmn2ModelerFactory;
import org.eclipse.bpmn2.modeler.core.utils.StyleUtil;
Solution content 
import org.eclipse.bpmn2.Bpmn2Package;
import org.eclipse.bpmn2.Transaction;
import org.eclipse.bpmn2.modeler.core.features.MultiUpdateFeature;
import org.eclipse.bpmn2.modeler.core.features.activity.AbstractCreateExpandableFlowNodeFeature;
import org.eclipse.bpmn2.modeler.core.model.Bpmn2ModelerFactory;
import org.eclipse.bpmn2.modeler.core.utils.StyleUtil;
File
TransactionFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.eclipse.graphiti.services.Graphiti;
import org.eclipse.graphiti.services.IGaService;

<<<<<<< HEAD
public class TransactionFeatureContainer extends AbstractSubProcessFeatureContainer {
=======
public class TransactionFeatureContainer extends AbstractExpandableActivityFeatureContainer {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0

	private static final int offset = 3;
Solution content 
import org.eclipse.graphiti.services.Graphiti;
import org.eclipse.graphiti.services.IGaService;

public class TransactionFeatureContainer extends AbstractExpandableActivityFeatureContainer {

	private static final int offset = 3;
File
TransactionFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
	@Override
	public IAddFeature getAddFeature(IFeatureProvider fp) {
<<<<<<< HEAD
		return new AddExpandedActivityFeature(fp) {
=======
		return new AddExpandableActivityFeature(fp) {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0

			@Override
			protected void decorateActivityRectangle(RoundedRectangle rect) {
Solution content 
	@Override
	public IAddFeature getAddFeature(IFeatureProvider fp) {
		return new AddExpandableActivityFeature(fp) {

			@Override
			protected void decorateActivityRectangle(RoundedRectangle rect) {
File
TransactionFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
	}

	@Override
<<<<<<< HEAD
	public ILayoutFeature getLayoutFeature(IFeatureProvider fp) {
		return new LayoutSubProcessFeature(fp) {
=======
	public MultiUpdateFeature getUpdateFeature(IFeatureProvider fp) {
		MultiUpdateFeature multiUpdate = super.getUpdateFeature(fp);
		UpdateExpandableActivityFeature updateFeature = new UpdateExpandableActivityFeature(fp);
		multiUpdate.addUpdateFeature(updateFeature);
		return multiUpdate;
	}

	@Override
	public ILayoutFeature getLayoutFeature(IFeatureProvider fp) {
		return new LayoutExpandableActivityFeature(fp) {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0
			@Override
			protected void layoutInRectangle(RoundedRectangle rect) {
				IGaService gaService = Graphiti.getGaService();
Solution content 
	}

	@Override
	public MultiUpdateFeature getUpdateFeature(IFeatureProvider fp) {
		MultiUpdateFeature multiUpdate = super.getUpdateFeature(fp);
		UpdateExpandableActivityFeature updateFeature = new UpdateExpandableActivityFeature(fp);
		multiUpdate.addUpdateFeature(updateFeature);
		return multiUpdate;
	}

	@Override
	public ILayoutFeature getLayoutFeature(IFeatureProvider fp) {
		return new LayoutExpandableActivityFeature(fp) {
			@Override
			protected void layoutInRectangle(RoundedRectangle rect) {
				IGaService gaService = Graphiti.getGaService();
File
TransactionFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
		public CreateTransactionFeature(IFeatureProvider fp) {
			super(fp, "Transaction",
<<<<<<< HEAD
					"Specialized description of sub-process that will have behavior controlled by transaction protocol");
=======
					"Specialized sub-process that will have behavior controlled by transaction protocol");
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0
		}

		@Override
Solution content 
		public CreateTransactionFeature(IFeatureProvider fp) {
			super(fp, "Transaction",
					"Specialized sub-process that will have behavior controlled by transaction protocol");
		}

		@Override
File
TransactionFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
import org.eclipse.graphiti.mm.pictograms.ContainerShape;
import org.eclipse.graphiti.services.Graphiti;

<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/UpdateSubProcessFeature.java
public class UpdateSubProcessFeature extends AbstractUpdateFeature {

	public UpdateSubProcessFeature(IFeatureProvider fp) {
=======
public class UpdateExpandableActivityFeature extends AbstractUpdateFeature {

	public UpdateExpandableActivityFeature(IFeatureProvider fp) {
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/UpdateExpandableActivityFeature.java
		super(fp);
	}
Solution content 
import org.eclipse.graphiti.mm.pictograms.ContainerShape;
import org.eclipse.graphiti.services.Graphiti;

public class UpdateExpandableActivityFeature extends AbstractUpdateFeature {

	public UpdateExpandableActivityFeature(IFeatureProvider fp) {
		super(fp);
	}
File
UpdateExpandableActivityFeature.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
	@Override
	public boolean canUpdate(IUpdateContext context) {
		Object bo = getBusinessObjectForPictogramElement(context.getPictogramElement());
<<<<<<< HEAD:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/UpdateSubProcessFeature.java
		return bo != null && bo instanceof SubProcess;
=======
		return AbstractExpandableActivityFeatureContainer.isExpandableElement(bo);
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0:org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/UpdateExpandableActivityFeature.java
	}

	@Override
Solution content 
	@Override
	public boolean canUpdate(IUpdateContext context) {
		Object bo = getBusinessObjectForPictogramElement(context.getPictogramElement());
		return AbstractExpandableActivityFeatureContainer.isExpandableElement(bo);
	}

	@Override
File
UpdateExpandableActivityFeature.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Variable
Chunk
Conflicting content 
import org.eclipse.bpmn2.modeler.ui.ImageProvider;
import org.eclipse.bpmn2.modeler.ui.features.AbstractDefaultDeleteFeature;
import org.eclipse.bpmn2.modeler.ui.features.activity.AppendActivityFeature;
<<<<<<< HEAD
import org.eclipse.bpmn2.modeler.ui.features.activity.subprocess.CollapseSubProcessFeature;
import org.eclipse.bpmn2.modeler.ui.features.activity.subprocess.ExpandSubProcessFeature;
=======
import org.eclipse.bpmn2.modeler.ui.features.activity.subprocess.CollapseFlowNodeFeature;
import org.eclipse.bpmn2.modeler.ui.features.activity.subprocess.ExpandFlowNodeFeature;
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0
import org.eclipse.bpmn2.modeler.ui.features.event.AppendEventFeature;
import org.eclipse.bpmn2.modeler.ui.features.gateway.AppendGatewayFeature;
import org.eclipse.emf.common.util.EList;
Solution content 
import org.eclipse.bpmn2.modeler.ui.ImageProvider;
import org.eclipse.bpmn2.modeler.ui.features.AbstractDefaultDeleteFeature;
import org.eclipse.bpmn2.modeler.ui.features.activity.AppendActivityFeature;
import org.eclipse.bpmn2.modeler.ui.features.activity.subprocess.CollapseFlowNodeFeature;
import org.eclipse.bpmn2.modeler.ui.features.activity.subprocess.ExpandFlowNodeFeature;
import org.eclipse.bpmn2.modeler.ui.features.event.AppendEventFeature;
import org.eclipse.bpmn2.modeler.ui.features.gateway.AppendGatewayFeature;
import org.eclipse.emf.common.util.EList;
File
ChoreographyTaskFeatureContainer.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
		if (propertiesProvider==null) {
			propertiesProvider = new AbstractPropertiesProvider(object) {
				String[] properties = new String[] {
<<<<<<< HEAD
						"triggeredByEvent",
						"loopCharacteristics",
=======
						"anyAttribute",
						"calledElementRef", // only used in CallActivity
						"startQuantity",
						"completionQuantity",
						"completionCondition",
						"isForCompensation",
						"triggeredByEvent",
						"cancelRemainingInstances",
						"loopCharacteristics",
						"boundaryEventDefs",
						"method",
						"ordering",
						"protocol",
>>>>>>> 8af87a195a3d52862616019aca4c7c80800a39a0
						"properties",
				};
Solution content 
		if (propertiesProvider==null) {
			propertiesProvider = new AbstractPropertiesProvider(object) {
				String[] properties = new String[] {
						"anyAttribute",
						"calledElementRef", // only used in CallActivity
						"startQuantity",
						"completionQuantity",
						"completionCondition",
						"isForCompensation",
						"triggeredByEvent",
						"cancelRemainingInstances",
						"loopCharacteristics",
						"boundaryEventDefs",
						"method",
						"ordering",
						"protocol",
						"properties",
				};
File
SubProcessDetailComposite.java
Developer's decision
Version 2
Kind of conflict
Comment