Projects >> TOGAF-Designer >>e6304257c3a924fd972bf1346d1124a7349b5612

Chunk
Conflicting content 
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
<<<<<<< HEAD
=======
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
>>>>>>> f291019eb5940c4e9e7ed19c1e63753541ba9609
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IEditorPart;
Solution content 
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IEditorPart;
File
TogafEditorHelper.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
		return null;
	}

<<<<<<< HEAD
	public static boolean open(String editorID, int index, ResourceSet resourceSet) {
		IWorkbenchPage page = Workbench.getInstance().getActiveWorkbenchWindow().getActivePage();
		Resource resource = getFirstTogafResource(resourceSet);
=======
	private static TransactionalEditingDomain getEditingDomain() {
		Collection sessions = SessionManager.INSTANCE.getSessions();
		Iterator iterator = sessions.iterator();
		if (iterator.hasNext()) {
			return iterator.next().getTransactionalEditingDomain();
		} else {
			throw new IllegalArgumentException(
					"SearchEngineService: no editing domain could be found because there's no session open.");
		}
	}

	public static boolean open(String editorID, int index) {
		IWorkbenchPage page = Workbench.getInstance().getActiveWorkbenchWindow().getActivePage();
		EditingDomain editingDomain = getEditingDomain();
		Resource resource = getFirstTogafResource(editingDomain.getResourceSet());
>>>>>>> f291019eb5940c4e9e7ed19c1e63753541ba9609
		IFile modelFile;
		URI eUri = resource.getURI();
		if (!eUri.isPlatformResource()) {
Solution content 
		return null;
	}

<<<<<<< HEAD
	public static boolean open(String editorID, int index, ResourceSet resourceSet) {
		IWorkbenchPage page = Workbench.getInstance().getActiveWorkbenchWindow().getActivePage();
		Resource resource = getFirstTogafResource(resourceSet);
=======
	private static TransactionalEditingDomain getEditingDomain() {
		Collection sessions = SessionManager.INSTANCE.getSessions();
		Iterator iterator = sessions.iterator();
		if (iterator.hasNext()) {
			return iterator.next().getTransactionalEditingDomain();
		} else {
			throw new IllegalArgumentException(
					"SearchEngineService: no editing domain could be found because there's no session open.");
		}
	}

	public static boolean open(String editorID, int index) {
		IWorkbenchPage page = Workbench.getInstance().getActiveWorkbenchWindow().getActivePage();
		EditingDomain editingDomain = getEditingDomain();
		Resource resource = getFirstTogafResource(editingDomain.getResourceSet());
		IFile modelFile;
		URI eUri = resource.getURI();
		if (!eUri.isPlatformResource()) {
File
TogafEditorHelper.java
Developer's decision
Manual
Kind of conflict
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content 
		modelFile = ResourcesPlugin.getWorkspace().getRoot().getFile(ipath);

		try {
<<<<<<< HEAD
			IEditorPart editorPart = page.openEditor(new FileEditorInput(modelFile), editorID, true, IWorkbenchPage.MATCH_ID);
=======
			IEditorPart editorPart = page.openEditor(new FileEditorInput(modelFile), editorID, true,
					IWorkbenchPage.MATCH_ID);
>>>>>>> f291019eb5940c4e9e7ed19c1e63753541ba9609
			if (editorPart instanceof IContentfwkEditor) {
				IContentfwkEditor catalog = (IContentfwkEditor)editorPart;
				catalog.setSelection(index);
Solution content 
		modelFile = ResourcesPlugin.getWorkspace().getRoot().getFile(ipath);

		try {
			IEditorPart editorPart = page.openEditor(new FileEditorInput(modelFile), editorID, true, IWorkbenchPage.MATCH_ID);
			if (editorPart instanceof IContentfwkEditor) {
				IContentfwkEditor catalog = (IContentfwkEditor)editorPart;
				catalog.setSelection(index);
File
TogafEditorHelper.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		CTabFolder result = null;
		// Attention il y a un premier TabFolder correspondant � la page de
		// l'�diteur. Ce TabFolder ne contient qu'une page.
<<<<<<< HEAD
		if ((o instanceof CTabFolder) && ((CTabFolder) o).getChildren().length > 1) {
			result = (CTabFolder) o;
=======
		if ((o instanceof CTabFolder) && ((CTabFolder)o).getChildren().length > 1) {
			result = (CTabFolder)o;
>>>>>>> f291019eb5940c4e9e7ed19c1e63753541ba9609
		} else if (o instanceof Composite) {
			boolean found = false;
			Object[] it = ((Composite)o).getChildren();
Solution content 
		CTabFolder result = null;
		// Attention il y a un premier TabFolder correspondant � la page de
		// l'�diteur. Ce TabFolder ne contient qu'une page.
		if ((o instanceof CTabFolder) && ((CTabFolder) o).getChildren().length > 1) {
			result = (CTabFolder) o;
		} else if (o instanceof Composite) {
			boolean found = false;
			Object[] it = ((Composite)o).getChildren();
File
TogafEditorHelper.java
Developer's decision
Version 1
Kind of conflict
Cast expression
If statement
Variable
Chunk
Conflicting content 
import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
import org.eclipse.gmf.runtime.notation.View;

<<<<<<< HEAD
import fr.obeo.dsl.viewpoint.ViewpointFactory;
import fr.obeo.dsl.viewpoint.WorkspaceImage;
import fr.obeo.dsl.viewpoint.diagram.edit.api.part.AbstractNotSelectableShapeNodeEditPart;
import fr.obeo.dsl.viewpoint.diagram.edit.api.part.IDiagramBorderNodeEditPart;
import fr.obeo.dsl.viewpoint.diagram.edit.internal.part.DiagramBorderNodeEditPartOperation;
import fr.obeo.dsl.viewpoint.diagram.edit.internal.part.DiagramNodeEditPartOperation;
import fr.obeo.dsl.viewpoint.diagram.ui.tools.api.figure.AirStyleDefaultSizeNodeFigure;
import fr.obeo.dsl.viewpoint.diagram.ui.tools.api.figure.WorkspaceImageFigure;

=======
>>>>>>> f291019eb5940c4e9e7ed19c1e63753541ba9609
/**
 * @author cnotot
<<<<<<< HEAD
Solution content 
import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
import org.eclipse.gmf.runtime.notation.View;

import fr.obeo.dsl.viewpoint.ViewpointFactory;
import fr.obeo.dsl.viewpoint.WorkspaceImage;
import fr.obeo.dsl.viewpoint.diagram.edit.api.part.AbstractNotSelectableShapeNodeEditPart;
import fr.obeo.dsl.viewpoint.diagram.edit.api.part.IDiagramBorderNodeEditPart;
import fr.obeo.dsl.viewpoint.diagram.edit.internal.part.DiagramBorderNodeEditPartOperation;
import fr.obeo.dsl.viewpoint.diagram.edit.internal.part.DiagramNodeEditPartOperation;
import fr.obeo.dsl.viewpoint.diagram.ui.tools.api.figure.AirStyleDefaultSizeNodeFigure;
import fr.obeo.dsl.viewpoint.diagram.ui.tools.api.figure.WorkspaceImageFigure;

/**
 * @author cnotot
File
CustomWorkspaceImageEditPart.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
>>>>>>> f291019eb5940c4e9e7ed19c1e63753541ba9609
/**
 * @author cnotot
<<<<<<< HEAD
 * 
=======
>>>>>>> f291019eb5940c4e9e7ed19c1e63753541ba9609
 */
public abstract class CustomWorkspaceImageEditPart extends AbstractNotSelectableShapeNodeEditPart {
Solution content 
/**
 * @author cnotot
 * 
 */
public abstract class CustomWorkspaceImageEditPart extends AbstractNotSelectableShapeNodeEditPart {
File
CustomWorkspaceImageEditPart.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	public DragTracker getDragTracker(Request request) {
		return getParent().getDragTracker(request);
	}
<<<<<<< HEAD

	public static final int VISUAL_ID = 3005;

	protected IFigure contentPane;

=======

	public static final int VISUAL_ID = 3005;

	protected IFigure contentPane;

>>>>>>> f291019eb5940c4e9e7ed19c1e63753541ba9609
	protected IFigure primaryShape;

	public CustomWorkspaceImageEditPart(View view) {
Solution content 
	public DragTracker getDragTracker(Request request) {
		return getParent().getDragTracker(request);
	}

	public static final int VISUAL_ID = 3005;

	protected IFigure contentPane;

	protected IFigure primaryShape;

	public CustomWorkspaceImageEditPart(View view) {
File
CustomWorkspaceImageEditPart.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
	@Override
	protected void refreshVisuals() {
<<<<<<< HEAD
		super.refreshVisuals();
		WorkspaceImageFigure figure = this.getPrimaryShape();
		EObject element = this.resolveSemanticElement();
		if (element instanceof WorkspaceImage) {
			WorkspaceImage bundledImage = (WorkspaceImage) element;

			setPath(bundledImage);

			figure.refreshFigure(bundledImage);
			DiagramNodeEditPartOperation.refreshNodeLabelAlignment(figure, bundledImage);
			((GraphicalEditPart) this.getParent()).setLayoutConstraint(this, this.getFigure(), new Rectangle(0, 0, figure.getPreferredSize().width, figure.getPreferredSize().height));
		}
=======
		// TODO : implement this method for OD6.
		throw new UnsupportedOperationException("Unimplemented : not ported to OD6 yet -- RG");
		// super.refreshVisuals();
		// WorkspaceImageFigure figure = this.getPrimaryShape();
		// EObject element = this.resolveSemanticElement();
		// if (element instanceof WorkspaceImage) {
		// WorkspaceImage bundledImage = (WorkspaceImage) element;
		//
		// setPath(bundledImage);
		//
		// figure.refreshFigure(bundledImage);
		// DiagramNodeEditPartOperation.refreshNodeLabelAlignment(figure, bundledImage);
		// ((GraphicalEditPart) this.getParent()).setLayoutConstraint(this, this.getFigure(), new Rectangle(0,
		// 0, figure.getPreferredSize().width, figure.getPreferredSize().height));
		// }
>>>>>>> f291019eb5940c4e9e7ed19c1e63753541ba9609
	}

	protected IFigure createNodeShape() {
Solution content 
	@Override
	protected void refreshVisuals() {
		super.refreshVisuals();
		// TODO : implement this method for OD6.
		throw new UnsupportedOperationException("Unimplemented : not ported to OD6 yet -- RG");
		// super.refreshVisuals();
		// WorkspaceImageFigure figure = this.getPrimaryShape();
		// EObject element = this.resolveSemanticElement();
		// if (element instanceof WorkspaceImage) {
		// WorkspaceImage bundledImage = (WorkspaceImage) element;
		//
		// setPath(bundledImage);
		//
		// figure.refreshFigure(bundledImage);
		// DiagramNodeEditPartOperation.refreshNodeLabelAlignment(figure, bundledImage);
		// ((GraphicalEditPart) this.getParent()).setLayoutConstraint(this, this.getFigure(), new Rectangle(0,
		// 0, figure.getPreferredSize().width, figure.getPreferredSize().height));
		// }
	}

	protected IFigure createNodeShape() {
File
CustomWorkspaceImageEditPart.java
Developer's decision
Combination
Kind of conflict
Comment
If statement
Method invocation
Throw statement
Variable
Chunk
Conflicting content 
		setPath(wkImage);

<<<<<<< HEAD
		WorkspaceImageFigure wif = (WorkspaceImageFigure) WorkspaceImageFigure.createImageFigure(wkImage);
		EditPart parent = this.getParent();
		if (parent instanceof IDiagramBorderNodeEditPart) {
			DiagramBorderNodeEditPartOperation.updateTransparencyMode((IDiagramBorderNodeEditPart) parent, wif);
=======
		WorkspaceImageFigure wif = (WorkspaceImageFigure)WorkspaceImageFigure.createImageFigure(wkImage);
		EditPart parent = this.getParent();
		if (parent instanceof IDiagramBorderNodeEditPart) {
			DiagramBorderNodeEditPartOperation
					.updateTransparencyMode((IDiagramBorderNodeEditPart)parent, wif);
>>>>>>> f291019eb5940c4e9e7ed19c1e63753541ba9609
		}
		return primaryShape = wif;
	}
Solution content 
		setPath(wkImage);

		WorkspaceImageFigure wif = (WorkspaceImageFigure)WorkspaceImageFigure.createImageFigure(wkImage);
		EditPart parent = this.getParent();
		if (parent instanceof IDiagramBorderNodeEditPart) {
			DiagramBorderNodeEditPartOperation
					.updateTransparencyMode((IDiagramBorderNodeEditPart)parent, wif);
		}
		return primaryShape = wif;
	}
File
CustomWorkspaceImageEditPart.java
Developer's decision
Version 1
Kind of conflict
Cast expression
If statement
Method invocation
Variable
Chunk
Conflicting content 
	}

	public WorkspaceImageFigure getPrimaryShape() {
<<<<<<< HEAD
		return (WorkspaceImageFigure) primaryShape;
	}

	protected NodeFigure createNodePlate() {
		DefaultSizeNodeFigure result = new AirStyleDefaultSizeNodeFigure(getMapMode().DPtoLP(40), getMapMode().DPtoLP(40));
=======
		return (WorkspaceImageFigure)primaryShape;
	}

	protected NodeFigure createNodePlate() {
		DefaultSizeNodeFigure result = new AirStyleDefaultSizeNodeFigure(getMapMode().DPtoLP(40),
				getMapMode().DPtoLP(40));
>>>>>>> f291019eb5940c4e9e7ed19c1e63753541ba9609
		return result;
	}
Solution content 
	}

	public WorkspaceImageFigure getPrimaryShape() {
		return (WorkspaceImageFigure) primaryShape;
	}


	protected NodeFigure createNodePlate() {
		DefaultSizeNodeFigure result = new AirStyleDefaultSizeNodeFigure(getMapMode().DPtoLP(40),
				getMapMode().DPtoLP(40));
		return result;
	}
File
CustomWorkspaceImageEditPart.java
Developer's decision
Version 1
Kind of conflict
Cast expression
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
	public EditPolicy getPrimaryDragEditPolicy() {
		EditPolicy result = super.getPrimaryDragEditPolicy();
		if (result instanceof ResizableEditPolicy) {
<<<<<<< HEAD
			ResizableEditPolicy ep = (ResizableEditPolicy) result;
=======
			ResizableEditPolicy ep = (ResizableEditPolicy)result;
>>>>>>> f291019eb5940c4e9e7ed19c1e63753541ba9609
			ep.setResizeDirections(PositionConstants.NONE);
		}
		return result;
Solution content 
	public EditPolicy getPrimaryDragEditPolicy() {
		EditPolicy result = super.getPrimaryDragEditPolicy();
		if (result instanceof ResizableEditPolicy) {
			ResizableEditPolicy ep = (ResizableEditPolicy)result;
			ep.setResizeDirections(PositionConstants.NONE);
		}
		return result;
File
CustomWorkspaceImageEditPart.java
Developer's decision
Version 1
Kind of conflict
Cast expression
Variable
Chunk
Conflicting content 
import org.eclipse.ui.IFolderLayout;
import org.eclipse.ui.IPageLayout;
import org.eclipse.ui.IPerspectiveFactory;
<<<<<<< HEAD
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;

import fr.obeo.dsl.viewpoint.ui.tools.api.views.modelexplorerview.IModelExplorerView;
=======
>>>>>>> f291019eb5940c4e9e7ed19c1e63753541ba9609

public class TogafPerspective implements IPerspectiveFactory {
Solution content 
import org.eclipse.ui.IFolderLayout;
import org.eclipse.ui.IPageLayout;
import org.eclipse.ui.IPerspectiveFactory;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;

import fr.obeo.dsl.viewpoint.ui.tools.api.views.modelexplorerview.IModelExplorerView;

public class TogafPerspective implements IPerspectiveFactory {
File
TogafPerspective.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
	}

	private void addViews() {
<<<<<<< HEAD

		IFolderLayout topLeft = factory.createFolder("topLeft", IPageLayout.LEFT, 0.25f, factory.getEditorArea()); // NON-NLS-1
		//topLeft.addView(ModelExplorerView.ID);
		topLeft.addView(IModelExplorerView.ID);
		// topLeft.addView("org.eclipse.ui.navigator.ProjectExplorer");
		// topLeft.addView("fr.obeo.dsl.viewpoint.ui.tools.views.sessionview");

		IFolderLayout bottom = factory.createFolder("bottomRight", IPageLayout.BOTTOM, 0.7f, factory.getEditorArea()); // NON-NLS-1
=======
		IFolderLayout topLeft = factory.createFolder("topLeft", IPageLayout.LEFT, 0.25f, factory
				.getEditorArea()); // NON-NLS-1
		topLeft.addView(IModelExplorerView.ID);

		topLeft.addView("org.eclipse.ui.navigator.ProjectExplorer");
		topLeft.addView("fr.obeo.dsl.viewpoint.ui.tools.views.sessionview");

		IFolderLayout bottom = factory.createFolder("bottomRight", IPageLayout.BOTTOM, 0.7f, factory
				.getEditorArea()); // NON-NLS-1
>>>>>>> f291019eb5940c4e9e7ed19c1e63753541ba9609
		bottom.addView(IPageLayout.ID_PROP_SHEET); // NON-NLS-1

	}
Solution content 
	}

	private void addViews() {
		IFolderLayout topLeft = factory.createFolder("topLeft", IPageLayout.LEFT, 0.25f, factory
				.getEditorArea()); // NON-NLS-1
		topLeft.addView(IModelExplorerView.ID);

		topLeft.addView("org.eclipse.ui.navigator.ProjectExplorer");
		topLeft.addView("fr.obeo.dsl.viewpoint.ui.tools.views.sessionview");

		IFolderLayout bottom = factory.createFolder("bottomRight", IPageLayout.BOTTOM, 0.7f, factory
				.getEditorArea()); // NON-NLS-1
		bottom.addView(IPageLayout.ID_PROP_SHEET); // NON-NLS-1

	}
File
TogafPerspective.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Variable