diff options
author | tfesenko | 2011-03-08 15:48:41 +0000 |
---|---|---|
committer | tfesenko | 2011-03-08 15:48:41 +0000 |
commit | 7797242bd4051c4102e164f2cc819640041fe19a (patch) | |
tree | e686e45af9b892f5efa6e6692427403d6d9b5b89 /extraplugins/compare | |
parent | 40165d2f07262d292d4bc6a9aa9c774eaee98d9b (diff) | |
download | org.eclipse.papyrus-7797242bd4051c4102e164f2cc819640041fe19a.tar.gz org.eclipse.papyrus-7797242bd4051c4102e164f2cc819640041fe19a.tar.xz org.eclipse.papyrus-7797242bd4051c4102e164f2cc819640041fe19a.zip |
Extract UI to the dedicated plugin
Diffstat (limited to 'extraplugins/compare')
2 files changed, 12 insertions, 24 deletions
diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/CompareTwoElementsDiffModelImpl.java b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/CompareTwoElementsDiffModelImpl.java index f8aeb7f1e21..76a84a301e5 100644 --- a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/CompareTwoElementsDiffModelImpl.java +++ b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/CompareTwoElementsDiffModelImpl.java @@ -14,30 +14,18 @@ package org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.compare.diff.metamodel.DiffElement; -import org.eclipse.emf.compare.diff.metamodel.DiffGroup; import org.eclipse.emf.compare.diff.metamodel.DiffModel; import org.eclipse.emf.compare.diff.metamodel.DiffPackage; -import org.eclipse.emf.compare.util.AdapterUtils; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.EObjectResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jface.viewers.IBaseLabelProvider; -import org.eclipse.jface.viewers.ILabelProvider; - -import org.eclipse.papyrus.compare.UMLCompareUtils; import org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.CompareTwoElementsDiffModel; import org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.UMLDiffPackage; -import org.eclipse.papyrus.compare.ui.PapyrusLabelProvider; -import org.eclipse.papyrus.compare.ui.viewer.structure.StyledDiffLabelSwitch; /** * <!-- begin-user-doc --> diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/UMLDiffExtensionImpl.java b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/UMLDiffExtensionImpl.java index a5047108118..dfda2a3dc21 100644 --- a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/UMLDiffExtensionImpl.java +++ b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/UMLDiffExtensionImpl.java @@ -16,10 +16,9 @@ import org.eclipse.emf.compare.diff.metamodel.impl.AbstractDiffExtensionImpl; import org.eclipse.emf.ecore.EClass; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.StyledString; +import org.eclipse.papyrus.compare.diff.extension.UMLStyledStructureLabelProvider; import org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.UMLDiffExtension; import org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.UMLDiffPackage; -import org.eclipse.papyrus.compare.ui.PapyrusLabelProvider; -import org.eclipse.papyrus.compare.ui.viewer.structure.UMLStyledStructureLabelProvider; /** * <!-- begin-user-doc --> @@ -35,15 +34,15 @@ public abstract class UMLDiffExtensionImpl extends AbstractDiffExtensionImpl imp /** * @NOT-generated */ - private static ILabelProvider labelProvider= new UMLStyledStructureLabelProvider(new PapyrusLabelProvider()) { - public String getText(Object element) { - String result = super.getText(element); - if (result == null) { - return "<LABEL NOT FOUND>"; - } - return result; - }; - }; +// private static ILabelProvider labelProvider= new UMLStyledStructureLabelProvider(new PapyrusLabelProvider()) { +// public String getText(Object element) { +// String result = super.getText(element); +// if (result == null) { +// return "<LABEL NOT FOUND>"; +// } +// return result; +// }; +// }; /** * <!-- begin-user-doc --> @@ -72,7 +71,8 @@ public abstract class UMLDiffExtensionImpl extends AbstractDiffExtensionImpl imp */ @Override public String getText() { - return labelProvider.getText(this); + return ""; +// return labelProvider.getText(this); } /** |