diff options
Diffstat (limited to 'sandbox/PapyrusEMFCompareV1/deprecated/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/merge/viewer/UMLModelContentMergeDiffTab.java')
-rw-r--r-- | sandbox/PapyrusEMFCompareV1/deprecated/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/merge/viewer/UMLModelContentMergeDiffTab.java | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/sandbox/PapyrusEMFCompareV1/deprecated/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/merge/viewer/UMLModelContentMergeDiffTab.java b/sandbox/PapyrusEMFCompareV1/deprecated/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/merge/viewer/UMLModelContentMergeDiffTab.java deleted file mode 100644 index 0e86910da87..00000000000 --- a/sandbox/PapyrusEMFCompareV1/deprecated/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/merge/viewer/UMLModelContentMergeDiffTab.java +++ /dev/null @@ -1,82 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2010 CEA LIST. - * - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Tatiana Fesenko (CEA LIST) - Initial API and implementation - * - *****************************************************************************/ -package org.eclipse.papyrus.uml.compare.ui.merge.viewer; - -import org.eclipse.emf.compare.ui.viewer.content.part.ModelContentMergeTabFolder; -import org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelContentMergeDiffTab; -import org.eclipse.swt.widgets.Composite; - - -/** - * The Structure Tab in the Merge Viewer. - */ -//duplicate code from tatiana -//TODO : verify the super class -public class UMLModelContentMergeDiffTab extends ModelContentMergeDiffTab { - - - /** - * Instantiates a new uML model content merge diff tab. - * - * @param parentComposite - * the parent composite - * @param side - * the side - * @param parentFolder - * the parent folder - */ - public UMLModelContentMergeDiffTab(Composite parentComposite, int side, ModelContentMergeTabFolder parentFolder) { - super(parentComposite, side, parentFolder); - } - -// /* -// * (non-Javadoc) -// * -// * @see org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelContentMergeDiffTab#setSelectionToWidget(java.util.List, boolean) -// */ -// @Override -// protected void setSelectionToWidget(List l, boolean reveal) { -// // tfesenko filter stereotype applications -// List result = new ArrayList(); -// for(Object next : l) { -// if(next instanceof EObject && UMLCompareUtils.isStereotypeApplication((EObject)next)) { -// EObject stereotypeApplication = (EObject)next; -// result.add(UMLUtil.getBaseElement(stereotypeApplication)); -// } else { -// result.add(next); -// } -// } -// super.setSelectionToWidget(result, reveal); -// } -// -// /* -// * (non-Javadoc) -// * -// * @see org.eclipse.emf.compare.ui.viewer.content.part.diff.ModelContentMergeDiffTab#setReflectiveInput(java.lang.Object) -// */ -// @Override -// public void setReflectiveInput(Object object) { -// // tfesenko 336361 - [UML Compare] Compare two elements: show right element as root -// if(object instanceof EObject) { -// clearCaches(); -// // tfesenko default implementation sets object.eResource here -// setInput(object); -// setupCaches(); -// needsRedraw = true; -// } -// super.setReflectiveInput(object); -// } - - -} |