blob: 81d387be4208a3cbf9cfe70014fdd6b3ccaa6bc8 [file] [log] [blame]
/*******************************************************************************
* Copyright 2011 Chair for Applied Software Engineering,
* Technische Universitaet Muenchen.
* All rights reserved. This program and the accompanying materials
* are made available under the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.ui.dialogs.merge;
import java.util.concurrent.Callable;
import org.eclipse.emf.emfstore.client.model.WorkspaceManager;
import org.eclipse.emf.emfstore.client.model.changeTracking.merging.AbstractConflictResolver;
import org.eclipse.emf.emfstore.client.model.changeTracking.merging.ConflictResolver;
import org.eclipse.emf.emfstore.client.model.changeTracking.merging.DecisionManager;
import org.eclipse.emf.emfstore.client.model.changeTracking.merging.util.MergeLabelProvider;
import org.eclipse.emf.emfstore.client.model.exceptions.ChangeConflictException;
import org.eclipse.emf.emfstore.client.ui.common.RunInUI;
import org.eclipse.emf.emfstore.client.ui.dialogs.merge.util.DefaultMergeLabelProvider;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Display;
/**
* This is an alternative merge handler, using the new merge wizard.
*
* @author wesendon
*/
public class MergeProjectHandler extends AbstractConflictResolver implements ConflictResolver {
private DefaultMergeLabelProvider labelProvider;
/**
* Default constructor.
*
* @param isBranchMerge
* specifies whether two branches are merged, rather then changes
* from the same branches.
* @param conflictException an conflict exception with preliminary conflict results
*/
public MergeProjectHandler(boolean isBranchMerge, ChangeConflictException conflictException) {
super(isBranchMerge, conflictException);
}
/**
* Default constructor.
*
* @param conflictException an conflict exception with preliminary conflict results
*/
public MergeProjectHandler(ChangeConflictException conflictException) {
this(false, conflictException);
}
@SuppressWarnings("unchecked")
@Override
protected void preDecisionManagerHook() {
labelProvider = new DefaultMergeLabelProvider();
WorkspaceManager.getObserverBus().register(labelProvider, MergeLabelProvider.class);
}
@Override
protected boolean controlDecisionManager(final DecisionManager decisionManager) {
return RunInUI.runWithResult(new Callable<Boolean>() {
public Boolean call() {
MergeWizard wizard = new MergeWizard(decisionManager);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
dialog.setPageSize(1000, 500);
dialog.setBlockOnOpen(true);
dialog.create();
int open = dialog.open();
labelProvider.dispose();
return (open == Dialog.OK);
}
});
}
}