diff options
| author | tfesenko | 2011-02-03 14:49:35 +0000 |
|---|---|---|
| committer | tfesenko | 2011-02-03 14:49:35 +0000 |
| commit | 69fb0b001bfc30072144296614b327f7cac730c2 (patch) | |
| tree | a5d7ae58f923d73c6e28a520c3949793547a33c6 | |
| parent | 5492670e562497dd275cce781c1579d4fa30ac47 (diff) | |
| download | org.eclipse.papyrus-69fb0b001bfc30072144296614b327f7cac730c2.tar.gz org.eclipse.papyrus-69fb0b001bfc30072144296614b327f7cac730c2.tar.xz org.eclipse.papyrus-69fb0b001bfc30072144296614b327f7cac730c2.zip | |
Bug 324071 - [Compare] support UML Stereotypes in models compared with EMF Compare - TaggedValueElementBuilder -> DiffElementExtensionBuilder
| -rw-r--r-- | extraplugins/compare/org.eclipse.papyrus.compare/src/org/eclipse/papyrus/compare/diff/PapyrusDiffEngine.java | 4 | ||||
| -rw-r--r-- | extraplugins/compare/org.eclipse.papyrus.compare/src/org/eclipse/papyrus/compare/diff/extension/DiffElementExtensionBuilder.java (renamed from extraplugins/compare/org.eclipse.papyrus.compare/src/org/eclipse/papyrus/compare/diff/extension/TaggedValueElementBuilder.java) | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src/org/eclipse/papyrus/compare/diff/PapyrusDiffEngine.java b/extraplugins/compare/org.eclipse.papyrus.compare/src/org/eclipse/papyrus/compare/diff/PapyrusDiffEngine.java index a455de8c0ac..9f13d8666f3 100644 --- a/extraplugins/compare/org.eclipse.papyrus.compare/src/org/eclipse/papyrus/compare/diff/PapyrusDiffEngine.java +++ b/extraplugins/compare/org.eclipse.papyrus.compare/src/org/eclipse/papyrus/compare/diff/PapyrusDiffEngine.java @@ -33,7 +33,7 @@ import org.eclipse.emf.compare.diff.metamodel.util.DiffSwitch; import org.eclipse.emf.compare.match.metamodel.MatchModel;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.compare.UMLCompareUtils;
-import org.eclipse.papyrus.compare.diff.extension.TaggedValueElementBuilder;
+import org.eclipse.papyrus.compare.diff.extension.DiffElementExtensionBuilder;
import org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.UMLDiffExtension;
import org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.UMLDiffFactory;
import org.eclipse.uml2.uml.Element;
@@ -42,7 +42,7 @@ import org.eclipse.uml2.uml.util.UMLUtil; public class PapyrusDiffEngine extends GenericDiffEngine {
- private DiffSwitch<DiffElement> myDiffElementBuilder = new TaggedValueElementBuilder();
+ private DiffSwitch<DiffElement> myDiffElementBuilder = new DiffElementExtensionBuilder();
@Override
protected ReferencesCheck getReferencesChecker() {
diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src/org/eclipse/papyrus/compare/diff/extension/TaggedValueElementBuilder.java b/extraplugins/compare/org.eclipse.papyrus.compare/src/org/eclipse/papyrus/compare/diff/extension/DiffElementExtensionBuilder.java index f6175cc6749..870c6d5ee2c 100644 --- a/extraplugins/compare/org.eclipse.papyrus.compare/src/org/eclipse/papyrus/compare/diff/extension/TaggedValueElementBuilder.java +++ b/extraplugins/compare/org.eclipse.papyrus.compare/src/org/eclipse/papyrus/compare/diff/extension/DiffElementExtensionBuilder.java @@ -32,7 +32,7 @@ import org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.UMLDiffFact import org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.UpdateTaggedValue; -public class TaggedValueElementBuilder extends DiffSwitch<DiffElement> { +public class DiffElementExtensionBuilder extends DiffSwitch<DiffElement> { @Override public DiffElement caseDiffElement(DiffElement object) { |