Projects >> Henshin-Editor >>81edc55402e2628fd8ed89883e5dac49670aa7d6

Chunk
Conflicting content 
	public static final String GRAPH_VIEW_ID = "tggeditor.views.graphview.GraphicalView";
	public static final String RULE_VIEW_ID = "tggeditor.views.ruleview.RuleGraphicalView";
	public static final String CONDITION_VIEW_ID = "tggeditor.views.ruleview.NACGraphicalView";
<<<<<<< HEAD
	public static final String CRITIVAL_PAIR_VIEW_ID = "tggeditor.views.graphview.CriticalPairView";
														
=======
	public static final String CRITICAL_PAIR_VIEW_ID = "tggeditor.views.graphview.CriticalPairView";
	
>>>>>>> fd5a3e6c81bd5f6fd7c3ea7053ff2daa58ad91b3
	private TGG layout;

	private final String layoutExtension = "tgg";
Solution content 
	public static final String GRAPH_VIEW_ID = "tggeditor.views.graphview.GraphicalView";
	public static final String RULE_VIEW_ID = "tggeditor.views.ruleview.RuleGraphicalView";
	public static final String CONDITION_VIEW_ID = "tggeditor.views.ruleview.NACGraphicalView";
	public static final String CRITIVAL_PAIR_VIEW_ID = "tggeditor.views.graphview.CriticalPairView";
														
	private TGG layout;

	private final String layoutExtension = "tgg";
File
TreeEditor.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
			repairTGGModel();
			
		}
<<<<<<< HEAD
=======
		
>>>>>>> fd5a3e6c81bd5f6fd7c3ea7053ff2daa58ad91b3
		this.getModelRoots().add(layout);
	}
Solution content 
			repairTGGModel();
			
		}
		this.getModelRoots().add(layout);
	}
File
TreeEditor.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
		if (model instanceof GraphLayout && context instanceof GraphEditPart) {
			return new DividerEditPart((GraphLayout) model, (GraphEditPart) context);
		}
<<<<<<< HEAD
		if (model instanceof Rule){
=======
		if (model instanceof Rule) {
>>>>>>> fd5a3e6c81bd5f6fd7c3ea7053ff2daa58ad91b3
			return new RuleGraphicalEditPart((Rule) model);
		}
		Assert.isTrue( model == null,"CriticalPairEditPartFactory could not create an EditPart for the model"+ model);
Solution content 
		if (model instanceof GraphLayout && context instanceof GraphEditPart) {
			return new DividerEditPart((GraphLayout) model, (GraphEditPart) context);
		}
		if (model instanceof Rule){
			return new RuleGraphicalEditPart((Rule) model);
		}
		Assert.isTrue( model == null,"CriticalPairEditPartFactory could not create an EditPart for the model"+ model);
File
CriticalPairEditPartFactory.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
	@Override
	protected List getModelChildren() {
		List list = new ArrayList();
<<<<<<< HEAD
		if (getCastedModel().getOverlapping() != null)
			list.add(getCastedModel().getOverlapping());
=======
		if (getCastedModel().getOverlapping() != null) {
			list.add(getCastedModel().getOverlapping());
		}
>>>>>>> fd5a3e6c81bd5f6fd7c3ea7053ff2daa58ad91b3
		list.add(getCastedModel().getRule1());
		list.add(getCastedModel().getRule2());
		return list;
Solution content 
	@Override
	protected List getModelChildren() {
		List list = new ArrayList();
		if (getCastedModel().getOverlapping() != null)
			list.add(getCastedModel().getOverlapping());
		list.add(getCastedModel().getRule1());
		list.add(getCastedModel().getRule2());
		return list;
File
CritPairTreeEditPart.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
	
	@Override
	protected void notifyChanged(Notification notification) {
<<<<<<< HEAD
		if (!this.isActive())
			return;
=======
		if (!this.isActive())  return;
		
>>>>>>> fd5a3e6c81bd5f6fd7c3ea7053ff2daa58ad91b3
		final int featureId = notification.getFeatureID(HenshinPackage.class);
		switch (featureId) {
			case TGGPackage.TGG__CRIT_PAIRS:
Solution content 
	
	@Override
	protected void notifyChanged(Notification notification) {
		if (!this.isActive())
			return;
		final int featureId = notification.getFeatureID(HenshinPackage.class);
		switch (featureId) {
			case TGGPackage.TGG__CRIT_PAIRS:
File
CritPairTreeEditPart.java
Developer's decision
Version 1
Kind of conflict
If statement