Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2012-05-03 05:13:06 -0400
committervlorenzo2012-05-03 05:13:06 -0400
commit3c5a4e50b2097204a1c6109357ff044297dbef55 (patch)
tree1e658de4abc8ccb51f2ebfb898865b2caf6ad289
parent0f6f240f9d936741a8c641c6f86b7927f2e55305 (diff)
downloadorg.eclipse.papyrus-3c5a4e50b2097204a1c6109357ff044297dbef55.tar.gz
org.eclipse.papyrus-3c5a4e50b2097204a1c6109357ff044297dbef55.tar.xz
org.eclipse.papyrus-3c5a4e50b2097204a1c6109357ff044297dbef55.zip
342163: [Usability] Papyrus merge should use the service edit of Papyrus
https://bugs.eclipse.org/bugs/show_bug.cgi?id=342163 A save of my work
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/AttributeChangeLeftTargetTransactionalMerger.java (renamed from sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CAttributeChangeLeftTargetMerger.java)6
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/AttributeChangeRightTargetTransactionalMerger.java (renamed from sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CAttributeChangeRightTargetMerger.java)6
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/AttributeOrderChangeTransactionalMerger.java (renamed from sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CAttributeOrderChangeMerger.java)6
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/DefaultExtensionTransactionalMerger.java (renamed from sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CDefaultExtensionMerger.java)2
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/DiffExtensionTransactionalMerger.java (renamed from sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CDiffExtensionMerger.java)2
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/DiffGroupTransactionalMerger.java (renamed from sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CDiffGroupMerger.java)6
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ModelElementChangeLeftTargetTransactionalMerger.java (renamed from sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CModelElementChangeLeftTargetMerger.java)6
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ModelElementChangeRightTargetTransactionalMerger.java (renamed from sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CModelElementChangeRightTargetMerger.java)6
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/MoveModelElementTransactionalMerger.java (renamed from sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CMoveModelElementMerger.java)6
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ReferenceChangeLeftTargetTransactionalMerger.java (renamed from sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CReferenceChangeLeftTargetMerger.java)6
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ReferenceChangeRightTargetTransactionalMerger.java (renamed from sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CReferenceChangeRightTargetMerger.java)6
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ReferenceOrderChangeTransactionalMerger.java (renamed from sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CReferenceOrderChangeMerger.java)6
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/UpdateAttributeTransactionalMerger.java (renamed from sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CUpdateAttributeMerger.java)6
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/UpdateReferenceTransactionalMerger.java (renamed from sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CUpdateReferenceMerger.java)6
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/internal/provider/PapyrusUMLMergeProvider.java48
15 files changed, 62 insertions, 62 deletions
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CAttributeChangeLeftTargetMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/AttributeChangeLeftTargetTransactionalMerger.java
index 5e1ad0f971e..a9e1bbebab4 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CAttributeChangeLeftTargetMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/AttributeChangeLeftTargetTransactionalMerger.java
@@ -36,7 +36,7 @@ import org.eclipse.papyrus.uml.compare.merger.internal.utils.PapyrusEFactory;
import org.eclipse.papyrus.uml.compare.merger.utils.ITransactionalMerger;
-public class CAttributeChangeLeftTargetMerger extends AttributeChangeLeftTargetMerger implements ITransactionalMerger {
+public class AttributeChangeLeftTargetTransactionalMerger extends AttributeChangeLeftTargetMerger implements ITransactionalMerger {
/**
* {@inheritDoc}
@@ -138,7 +138,7 @@ public class CAttributeChangeLeftTargetMerger extends AttributeChangeLeftTargetM
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CAttributeChangeLeftTargetMerger.this.mergeRequiredDifferences(applyInOrigin);
+ AttributeChangeLeftTargetTransactionalMerger.this.mergeRequiredDifferences(applyInOrigin);
return null;
}
});
@@ -149,7 +149,7 @@ public class CAttributeChangeLeftTargetMerger extends AttributeChangeLeftTargetM
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CAttributeChangeLeftTargetMerger.this.postProcess();
+ AttributeChangeLeftTargetTransactionalMerger.this.postProcess();
return null;
}
});
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CAttributeChangeRightTargetMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/AttributeChangeRightTargetTransactionalMerger.java
index 31ad88c9084..be7376dd735 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CAttributeChangeRightTargetMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/AttributeChangeRightTargetTransactionalMerger.java
@@ -35,7 +35,7 @@ import org.eclipse.papyrus.uml.compare.merger.internal.utils.PapyrusEFactory;
import org.eclipse.papyrus.uml.compare.merger.utils.ITransactionalMerger;
-public class CAttributeChangeRightTargetMerger extends AttributeChangeRightTargetMerger implements ITransactionalMerger {
+public class AttributeChangeRightTargetTransactionalMerger extends AttributeChangeRightTargetMerger implements ITransactionalMerger {
/**
* {@inheritDoc}
@@ -139,7 +139,7 @@ public class CAttributeChangeRightTargetMerger extends AttributeChangeRightTarge
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CAttributeChangeRightTargetMerger.this.mergeRequiredDifferences(applyInOrigin);
+ AttributeChangeRightTargetTransactionalMerger.this.mergeRequiredDifferences(applyInOrigin);
return null;
}
});
@@ -150,7 +150,7 @@ public class CAttributeChangeRightTargetMerger extends AttributeChangeRightTarge
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CAttributeChangeRightTargetMerger.this.postProcess();
+ AttributeChangeRightTargetTransactionalMerger.this.postProcess();
return null;
}
});
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CAttributeOrderChangeMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/AttributeOrderChangeTransactionalMerger.java
index 10c81924340..aad4c8a4b35 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CAttributeOrderChangeMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/AttributeOrderChangeTransactionalMerger.java
@@ -38,7 +38,7 @@ import org.eclipse.papyrus.uml.compare.merger.utils.ITransactionalMerger;
import org.eclipse.papyrus.uml.merger.internal.provider.PapyrusMergeCommandProvider;
-public class CAttributeOrderChangeMerger extends AttributeOrderChangeMerger implements ITransactionalMerger {
+public class AttributeOrderChangeTransactionalMerger extends AttributeOrderChangeMerger implements ITransactionalMerger {
/**
* {@inheritDoc}
@@ -209,7 +209,7 @@ public class CAttributeOrderChangeMerger extends AttributeOrderChangeMerger impl
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CAttributeOrderChangeMerger.this.mergeRequiredDifferences(applyInOrigin);
+ AttributeOrderChangeTransactionalMerger.this.mergeRequiredDifferences(applyInOrigin);
return null;
}
});
@@ -220,7 +220,7 @@ public class CAttributeOrderChangeMerger extends AttributeOrderChangeMerger impl
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CAttributeOrderChangeMerger.this.postProcess();
+ AttributeOrderChangeTransactionalMerger.this.postProcess();
return null;
}
});
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CDefaultExtensionMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/DefaultExtensionTransactionalMerger.java
index b2044bab3dc..b75ac6aa5f8 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CDefaultExtensionMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/DefaultExtensionTransactionalMerger.java
@@ -16,6 +16,6 @@ package org.eclipse.papyrus.uml.compare.merger.internal.merger;
import org.eclipse.emf.compare.diff.merge.DefaultExtensionMerger;
-public class CDefaultExtensionMerger extends DefaultExtensionMerger {
+public class DefaultExtensionTransactionalMerger extends DefaultExtensionMerger {
//TODO
}
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CDiffExtensionMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/DiffExtensionTransactionalMerger.java
index d320bb4ae01..938ab66019d 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CDiffExtensionMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/DiffExtensionTransactionalMerger.java
@@ -16,6 +16,6 @@ package org.eclipse.papyrus.uml.compare.merger.internal.merger;
import org.eclipse.emf.compare.diff.internal.merge.impl.DiffExtensionMerger;
-public class CDiffExtensionMerger extends DiffExtensionMerger {
+public class DiffExtensionTransactionalMerger extends DiffExtensionMerger {
//TODO ?
}
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CDiffGroupMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/DiffGroupTransactionalMerger.java
index bf0b3c89490..c45903e3c4e 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CDiffGroupMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/DiffGroupTransactionalMerger.java
@@ -27,7 +27,7 @@ import org.eclipse.papyrus.uml.compare.merger.internal.utils.MergerUtils;
import org.eclipse.papyrus.uml.compare.merger.utils.ITransactionalMerger;
-public class CDiffGroupMerger extends DiffGroupMerger implements ITransactionalMerger {
+public class DiffGroupTransactionalMerger extends DiffGroupMerger implements ITransactionalMerger {
/**
* {@inheritDoc}
@@ -103,7 +103,7 @@ public class CDiffGroupMerger extends DiffGroupMerger implements ITransactionalM
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CDiffGroupMerger.this.mergeRequiredDifferences(applyInOrigin);
+ DiffGroupTransactionalMerger.this.mergeRequiredDifferences(applyInOrigin);
return null;
}
});
@@ -114,7 +114,7 @@ public class CDiffGroupMerger extends DiffGroupMerger implements ITransactionalM
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CDiffGroupMerger.this.postProcess();
+ DiffGroupTransactionalMerger.this.postProcess();
return null;
}
});
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CModelElementChangeLeftTargetMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ModelElementChangeLeftTargetTransactionalMerger.java
index 9156457a311..701e0209620 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CModelElementChangeLeftTargetMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ModelElementChangeLeftTargetTransactionalMerger.java
@@ -41,7 +41,7 @@ import org.eclipse.papyrus.uml.compare.merger.internal.utils.PapyrusEFactory;
import org.eclipse.papyrus.uml.compare.merger.utils.ITransactionalMerger;
import org.eclipse.papyrus.uml.merger.internal.provider.PapyrusMergeCommandProvider;
-public class CModelElementChangeLeftTargetMerger extends ModelElementChangeLeftTargetMerger implements ITransactionalMerger {
+public class ModelElementChangeLeftTargetTransactionalMerger extends ModelElementChangeLeftTargetMerger implements ITransactionalMerger {
/**
* {@inheritDoc}
@@ -187,7 +187,7 @@ public class CModelElementChangeLeftTargetMerger extends ModelElementChangeLeftT
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CModelElementChangeLeftTargetMerger.this.mergeRequiredDifferences(applyInOrigin);
+ ModelElementChangeLeftTargetTransactionalMerger.this.mergeRequiredDifferences(applyInOrigin);
return null;
}
});
@@ -198,7 +198,7 @@ public class CModelElementChangeLeftTargetMerger extends ModelElementChangeLeftT
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CModelElementChangeLeftTargetMerger.this.postProcess();
+ ModelElementChangeLeftTargetTransactionalMerger.this.postProcess();
return null;
}
});
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CModelElementChangeRightTargetMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ModelElementChangeRightTargetTransactionalMerger.java
index 91c15527776..07cc118adde 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CModelElementChangeRightTargetMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ModelElementChangeRightTargetTransactionalMerger.java
@@ -43,7 +43,7 @@ import org.eclipse.papyrus.uml.compare.merger.utils.ITransactionalMerger;
import org.eclipse.papyrus.uml.merger.internal.provider.PapyrusMergeCommandProvider;
-public class CModelElementChangeRightTargetMerger extends ModelElementChangeRightTargetMerger implements ITransactionalMerger {
+public class ModelElementChangeRightTargetTransactionalMerger extends ModelElementChangeRightTargetMerger implements ITransactionalMerger {
/**
* {@inheritDoc}
@@ -184,7 +184,7 @@ public class CModelElementChangeRightTargetMerger extends ModelElementChangeRigh
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CModelElementChangeRightTargetMerger.this.mergeRequiredDifferences(applyInOrigin);
+ ModelElementChangeRightTargetTransactionalMerger.this.mergeRequiredDifferences(applyInOrigin);
return null;
}
});
@@ -195,7 +195,7 @@ public class CModelElementChangeRightTargetMerger extends ModelElementChangeRigh
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CModelElementChangeRightTargetMerger.this.postProcess();
+ ModelElementChangeRightTargetTransactionalMerger.this.postProcess();
return null;
}
});
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CMoveModelElementMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/MoveModelElementTransactionalMerger.java
index 87c82eec240..63ab10d5b81 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CMoveModelElementMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/MoveModelElementTransactionalMerger.java
@@ -39,7 +39,7 @@ import org.eclipse.papyrus.uml.merger.internal.provider.PapyrusMergeCommandProvi
* Created for EMF-Compare, for MoveModelElementMerger
*
*/
-public class CMoveModelElementMerger extends MoveModelElementMerger implements ITransactionalMerger {
+public class MoveModelElementTransactionalMerger extends MoveModelElementMerger implements ITransactionalMerger {
/**
* {@inheritDoc}
@@ -170,7 +170,7 @@ public class CMoveModelElementMerger extends MoveModelElementMerger implements I
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CMoveModelElementMerger.this.mergeRequiredDifferences(applyInOrigin);
+ MoveModelElementTransactionalMerger.this.mergeRequiredDifferences(applyInOrigin);
return null;
}
});
@@ -181,7 +181,7 @@ public class CMoveModelElementMerger extends MoveModelElementMerger implements I
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CMoveModelElementMerger.this.postProcess();
+ MoveModelElementTransactionalMerger.this.postProcess();
return null;
}
});
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CReferenceChangeLeftTargetMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ReferenceChangeLeftTargetTransactionalMerger.java
index 4cfdd659124..35c15157587 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CReferenceChangeLeftTargetMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ReferenceChangeLeftTargetTransactionalMerger.java
@@ -44,7 +44,7 @@ import org.eclipse.papyrus.uml.compare.merger.internal.utils.PapyrusEFactory;
import org.eclipse.papyrus.uml.compare.merger.utils.ITransactionalMerger;
-public class CReferenceChangeLeftTargetMerger extends ReferenceChangeLeftTargetMerger implements ITransactionalMerger {
+public class ReferenceChangeLeftTargetTransactionalMerger extends ReferenceChangeLeftTargetMerger implements ITransactionalMerger {
/**
* {@inheritDoc}
@@ -206,7 +206,7 @@ public class CReferenceChangeLeftTargetMerger extends ReferenceChangeLeftTargetM
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CReferenceChangeLeftTargetMerger.this.mergeRequiredDifferences(applyInOrigin);
+ ReferenceChangeLeftTargetTransactionalMerger.this.mergeRequiredDifferences(applyInOrigin);
return null;
}
});
@@ -217,7 +217,7 @@ public class CReferenceChangeLeftTargetMerger extends ReferenceChangeLeftTargetM
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CReferenceChangeLeftTargetMerger.this.postProcess();
+ ReferenceChangeLeftTargetTransactionalMerger.this.postProcess();
return null;
}
});
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CReferenceChangeRightTargetMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ReferenceChangeRightTargetTransactionalMerger.java
index 2675d56e3fd..e2e1d533104 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CReferenceChangeRightTargetMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ReferenceChangeRightTargetTransactionalMerger.java
@@ -44,7 +44,7 @@ import org.eclipse.papyrus.uml.compare.merger.internal.utils.PapyrusEFactory;
import org.eclipse.papyrus.uml.compare.merger.utils.ITransactionalMerger;
-public class CReferenceChangeRightTargetMerger extends ReferenceChangeRightTargetMerger implements ITransactionalMerger {
+public class ReferenceChangeRightTargetTransactionalMerger extends ReferenceChangeRightTargetMerger implements ITransactionalMerger {
/**
* {@inheritDoc}
@@ -205,7 +205,7 @@ public class CReferenceChangeRightTargetMerger extends ReferenceChangeRightTarge
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CReferenceChangeRightTargetMerger.this.mergeRequiredDifferences(applyInOrigin);
+ ReferenceChangeRightTargetTransactionalMerger.this.mergeRequiredDifferences(applyInOrigin);
return null;
}
});
@@ -216,7 +216,7 @@ public class CReferenceChangeRightTargetMerger extends ReferenceChangeRightTarge
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CReferenceChangeRightTargetMerger.this.postProcess();
+ ReferenceChangeRightTargetTransactionalMerger.this.postProcess();
return null;
}
});
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CReferenceOrderChangeMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ReferenceOrderChangeTransactionalMerger.java
index 42c4bef8dd9..31fe2b1e208 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CReferenceOrderChangeMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/ReferenceOrderChangeTransactionalMerger.java
@@ -39,7 +39,7 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
-public class CReferenceOrderChangeMerger extends ReferenceOrderChangeMerger implements ITransactionalMerger {
+public class ReferenceOrderChangeTransactionalMerger extends ReferenceOrderChangeMerger implements ITransactionalMerger {
/**
* {@inheritDoc}
@@ -142,7 +142,7 @@ public class CReferenceOrderChangeMerger extends ReferenceOrderChangeMerger impl
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CReferenceOrderChangeMerger.this.mergeRequiredDifferences(applyInOrigin);
+ ReferenceOrderChangeTransactionalMerger.this.mergeRequiredDifferences(applyInOrigin);
return null;
}
});
@@ -153,7 +153,7 @@ public class CReferenceOrderChangeMerger extends ReferenceOrderChangeMerger impl
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CReferenceOrderChangeMerger.this.postProcess();
+ ReferenceOrderChangeTransactionalMerger.this.postProcess();
return null;
}
});
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CUpdateAttributeMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/UpdateAttributeTransactionalMerger.java
index b40ed6d83ab..eeac9f1c515 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CUpdateAttributeMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/UpdateAttributeTransactionalMerger.java
@@ -36,7 +36,7 @@ import org.eclipse.papyrus.uml.compare.merger.internal.utils.PapyrusEFactory;
import org.eclipse.papyrus.uml.compare.merger.utils.ITransactionalMerger;
-public class CUpdateAttributeMerger extends UpdateAttributeMerger implements ITransactionalMerger {
+public class UpdateAttributeTransactionalMerger extends UpdateAttributeMerger implements ITransactionalMerger {
/**
* {@inheritDoc}
@@ -127,7 +127,7 @@ public class CUpdateAttributeMerger extends UpdateAttributeMerger implements ITr
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CUpdateAttributeMerger.this.mergeRequiredDifferences(applyInOrigin);
+ UpdateAttributeTransactionalMerger.this.mergeRequiredDifferences(applyInOrigin);
return null;
}
});
@@ -138,7 +138,7 @@ public class CUpdateAttributeMerger extends UpdateAttributeMerger implements ITr
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CUpdateAttributeMerger.this.postProcess();
+ UpdateAttributeTransactionalMerger.this.postProcess();
return null;
}
});
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CUpdateReferenceMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/UpdateReferenceTransactionalMerger.java
index 6bcb0bc98e2..7a5f702c0e2 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/CUpdateReferenceMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/merger/UpdateReferenceTransactionalMerger.java
@@ -34,7 +34,7 @@ import org.eclipse.papyrus.uml.compare.merger.utils.ITransactionalMerger;
import org.eclipse.papyrus.uml.merger.internal.provider.PapyrusMergeCommandProvider;
-public class CUpdateReferenceMerger extends UpdateReferenceMerger implements ITransactionalMerger {
+public class UpdateReferenceTransactionalMerger extends UpdateReferenceMerger implements ITransactionalMerger {
/**
* {@inheritDoc}
@@ -159,7 +159,7 @@ public class CUpdateReferenceMerger extends UpdateReferenceMerger implements ITr
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CUpdateReferenceMerger.this.mergeRequiredDifferences(applyInOrigin);
+ UpdateReferenceTransactionalMerger.this.mergeRequiredDifferences(applyInOrigin);
return null;
}
});
@@ -170,7 +170,7 @@ public class CUpdateReferenceMerger extends UpdateReferenceMerger implements ITr
@Override
protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
- CUpdateReferenceMerger.this.postProcess();
+ UpdateReferenceTransactionalMerger.this.postProcess();
return null;
}
});
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/internal/provider/PapyrusUMLMergeProvider.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/internal/provider/PapyrusUMLMergeProvider.java
index 878a6ddce82..93fbd41246d 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/internal/provider/PapyrusUMLMergeProvider.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/internal/provider/PapyrusUMLMergeProvider.java
@@ -30,18 +30,18 @@ import org.eclipse.emf.compare.diff.metamodel.ReferenceChangeRightTarget;
import org.eclipse.emf.compare.diff.metamodel.ReferenceOrderChange;
import org.eclipse.emf.compare.diff.metamodel.UpdateAttribute;
import org.eclipse.emf.compare.diff.metamodel.UpdateReference;
-import org.eclipse.papyrus.uml.compare.merger.internal.merger.CAttributeChangeLeftTargetMerger;
-import org.eclipse.papyrus.uml.compare.merger.internal.merger.CAttributeChangeRightTargetMerger;
-import org.eclipse.papyrus.uml.compare.merger.internal.merger.CAttributeOrderChangeMerger;
-import org.eclipse.papyrus.uml.compare.merger.internal.merger.CDiffGroupMerger;
-import org.eclipse.papyrus.uml.compare.merger.internal.merger.CModelElementChangeLeftTargetMerger;
-import org.eclipse.papyrus.uml.compare.merger.internal.merger.CModelElementChangeRightTargetMerger;
-import org.eclipse.papyrus.uml.compare.merger.internal.merger.CMoveModelElementMerger;
-import org.eclipse.papyrus.uml.compare.merger.internal.merger.CReferenceChangeLeftTargetMerger;
-import org.eclipse.papyrus.uml.compare.merger.internal.merger.CReferenceChangeRightTargetMerger;
-import org.eclipse.papyrus.uml.compare.merger.internal.merger.CReferenceOrderChangeMerger;
-import org.eclipse.papyrus.uml.compare.merger.internal.merger.CUpdateAttributeMerger;
-import org.eclipse.papyrus.uml.compare.merger.internal.merger.CUpdateReferenceMerger;
+import org.eclipse.papyrus.uml.compare.merger.internal.merger.AttributeChangeLeftTargetTransactionalMerger;
+import org.eclipse.papyrus.uml.compare.merger.internal.merger.AttributeChangeRightTargetTransactionalMerger;
+import org.eclipse.papyrus.uml.compare.merger.internal.merger.AttributeOrderChangeTransactionalMerger;
+import org.eclipse.papyrus.uml.compare.merger.internal.merger.DiffGroupTransactionalMerger;
+import org.eclipse.papyrus.uml.compare.merger.internal.merger.ModelElementChangeLeftTargetTransactionalMerger;
+import org.eclipse.papyrus.uml.compare.merger.internal.merger.ModelElementChangeRightTargetTransactionalMerger;
+import org.eclipse.papyrus.uml.compare.merger.internal.merger.MoveModelElementTransactionalMerger;
+import org.eclipse.papyrus.uml.compare.merger.internal.merger.ReferenceChangeLeftTargetTransactionalMerger;
+import org.eclipse.papyrus.uml.compare.merger.internal.merger.ReferenceChangeRightTargetTransactionalMerger;
+import org.eclipse.papyrus.uml.compare.merger.internal.merger.ReferenceOrderChangeTransactionalMerger;
+import org.eclipse.papyrus.uml.compare.merger.internal.merger.UpdateAttributeTransactionalMerger;
+import org.eclipse.papyrus.uml.compare.merger.internal.merger.UpdateReferenceTransactionalMerger;
import org.eclipse.papyrus.uml.compare.merger.utils.PapyrusMap;
@@ -61,18 +61,18 @@ public class PapyrusUMLMergeProvider implements IMergerProvider {
public Map<Class<? extends DiffElement>, Class<? extends IMerger>> getMergers() {
if(mergerTypes == null) {
mergerTypes = new PapyrusMap<Class<? extends DiffElement>, Class<? extends IMerger>>();
- mergerTypes.put(DiffGroup.class, CDiffGroupMerger.class);
- mergerTypes.put(ModelElementChangeRightTarget.class, CModelElementChangeRightTargetMerger.class);
- mergerTypes.put(ModelElementChangeLeftTarget.class, CModelElementChangeLeftTargetMerger.class);
- mergerTypes.put(MoveModelElement.class, CMoveModelElementMerger.class);
- mergerTypes.put(ReferenceChangeRightTarget.class, CReferenceChangeRightTargetMerger.class);
- mergerTypes.put(ReferenceChangeLeftTarget.class, CReferenceChangeLeftTargetMerger.class);
- mergerTypes.put(UpdateReference.class, CUpdateReferenceMerger.class);
- mergerTypes.put(AttributeChangeRightTarget.class, CAttributeChangeRightTargetMerger.class);
- mergerTypes.put(AttributeChangeLeftTarget.class, CAttributeChangeLeftTargetMerger.class);
- mergerTypes.put(UpdateAttribute.class, CUpdateAttributeMerger.class);
- mergerTypes.put(ReferenceOrderChange.class, CReferenceOrderChangeMerger.class);
- mergerTypes.put(AttributeOrderChange.class, CAttributeOrderChangeMerger.class);
+ mergerTypes.put(DiffGroup.class, DiffGroupTransactionalMerger.class);
+ mergerTypes.put(ModelElementChangeRightTarget.class, ModelElementChangeRightTargetTransactionalMerger.class);
+ mergerTypes.put(ModelElementChangeLeftTarget.class, ModelElementChangeLeftTargetTransactionalMerger.class);
+ mergerTypes.put(MoveModelElement.class, MoveModelElementTransactionalMerger.class);
+ mergerTypes.put(ReferenceChangeRightTarget.class, ReferenceChangeRightTargetTransactionalMerger.class);
+ mergerTypes.put(ReferenceChangeLeftTarget.class, ReferenceChangeLeftTargetTransactionalMerger.class);
+ mergerTypes.put(UpdateReference.class, UpdateReferenceTransactionalMerger.class);
+ mergerTypes.put(AttributeChangeRightTarget.class, AttributeChangeRightTargetTransactionalMerger.class);
+ mergerTypes.put(AttributeChangeLeftTarget.class, AttributeChangeLeftTargetTransactionalMerger.class);
+ mergerTypes.put(UpdateAttribute.class, UpdateAttributeTransactionalMerger.class);
+ mergerTypes.put(ReferenceOrderChange.class, ReferenceOrderChangeTransactionalMerger.class);
+ mergerTypes.put(AttributeOrderChange.class, AttributeOrderChangeTransactionalMerger.class);
//DiffExtensionMerger : not used for the moment
//DefaultExtensionMerger : not used for the moment
}

Back to the top