Revert "DRAFT - Intermediate Proxies Resolution"
[EMFCompare2.git] / plugins / org.eclipse.emf.compare.ide.ui / src / org / eclipse / emf / compare / ide / ui / internal / contentmergeviewer / table / TableContentMergeViewerCreator.java
blob474cfbe78ffe7325617adbfdb291946fa2ef87d1
1 /*******************************************************************************
2 * Copyright (c) 2012, 2013 Obeo.
3 * All rights reserved. This program and the accompanying materials
4 * are made available under the terms of the Eclipse Public License v1.0
5 * which accompanies this distribution, and is available at
6 * http://www.eclipse.org/legal/epl-v10.html
7 *
8 * Contributors:
9 * Obeo - initial API and implementation
10 *******************************************************************************/
11 package org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.table;
13 import org.eclipse.compare.CompareConfiguration;
14 import org.eclipse.compare.IViewerCreator;
15 import org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration;
16 import org.eclipse.jface.viewers.Viewer;
17 import org.eclipse.swt.widgets.Composite;
19 /**
20 * A {@link IViewerCreator} that creates {@link TableContentMergeViewer}.
22 * @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
24 public class TableContentMergeViewerCreator implements IViewerCreator {
26 /**
27 * ID of the contribution to the org.eclipse.compare.contentMergeViewers extension point.
29 public static final String EOBJECT_CONTENT_MERGE_VIEWER_ID = "org.eclipse.emf.compare.ide.ui.internal.EObjectContentListMergeViewer"; //$NON-NLS-1$
31 /**
32 * {@inheritDoc}
34 * @see org.eclipse.compare.IViewerCreator#createViewer(org.eclipse.swt.widgets.Composite,
35 * org.eclipse.compare.CompareConfiguration)
37 public Viewer createViewer(Composite parent, CompareConfiguration config) {
38 return new TableContentMergeViewer(parent, new EMFCompareConfiguration(config));