Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/EMFCompareOperation.java')
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/EMFCompareOperation.java65
1 files changed, 31 insertions, 34 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/EMFCompareOperation.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/EMFCompareOperation.java
index 6ac1198f0bf..fd8d06f3c98 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/EMFCompareOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/EMFCompareOperation.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.core.dsl.integration;
import java.util.Calendar;
-
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.compare.diff.metamodel.ComparisonResourceSnapshot;
@@ -30,43 +29,41 @@ import org.eclipse.osee.framework.core.operation.AbstractOperation;
*/
public class EMFCompareOperation extends AbstractOperation {
- private final EObject ancestor;
- private final EObject modified;
- private final ComparisonResourceSnapshot comparisonSnapshot;
+ private final EObject ancestor;
+ private final EObject modified;
+ private final ComparisonResourceSnapshot comparisonSnapshot;
- public EMFCompareOperation(EObject ancestor, EObject modified,
- ComparisonResourceSnapshot comparisonSnapshot) {
- super("Compare", EMFCompareOperation.class.getPackage().getName());
- this.ancestor = ancestor;
- this.modified = modified;
- this.comparisonSnapshot = comparisonSnapshot;
- }
+ public EMFCompareOperation(EObject ancestor, EObject modified, ComparisonResourceSnapshot comparisonSnapshot) {
+ super("Compare", EMFCompareOperation.class.getPackage().getName());
+ this.ancestor = ancestor;
+ this.modified = modified;
+ this.comparisonSnapshot = comparisonSnapshot;
+ }
- @Override
- protected void doWork(IProgressMonitor monitor) throws Exception {
- OseeDslStandaloneSetup.doSetup();
- URI uri = URI.createURI("http://org.eclipse/osee/types/oseetypecache2");
- // URI uri = URI.createURI("dummy:/ancestor.osee");
- // final ResourceSet resourceSet1 = new ResourceSetImpl();
- // Resource resource1 = resourceSet1.createResource(uri);
- Resource resource1 = new ResourceImpl(uri);
- resource1.getContents().add(ancestor);
+ @Override
+ protected void doWork(IProgressMonitor monitor) throws Exception {
+ OseeDslStandaloneSetup.doSetup();
+ URI uri = URI.createURI("http://org.eclipse/osee/types/oseetypecache2");
+ // URI uri = URI.createURI("dummy:/ancestor.osee");
+ // final ResourceSet resourceSet1 = new ResourceSetImpl();
+ // Resource resource1 = resourceSet1.createResource(uri);
+ Resource resource1 = new ResourceImpl(uri);
+ resource1.getContents().add(ancestor);
- // final ResourceSet resourceSet2 = new ResourceSetImpl();
- // Resource resource2 = resourceSet2.createResource(uri);
- Resource resource2 = new ResourceImpl(uri);
- resource2.getContents().add(modified);
+ // final ResourceSet resourceSet2 = new ResourceSetImpl();
+ // Resource resource2 = resourceSet2.createResource(uri);
+ Resource resource2 = new ResourceImpl(uri);
+ resource2.getContents().add(modified);
- final MatchModel match = MatchService.doMatch(ancestor, modified,
- ancestor, null);
- monitor.worked(calculateWork(0.40));
+ final MatchModel match = MatchService.doMatch(ancestor, modified, ancestor, null);
+ monitor.worked(calculateWork(0.40));
- final DiffModel diff = DiffService.doDiff(match, true);
- monitor.worked(calculateWork(0.40));
+ final DiffModel diff = DiffService.doDiff(match, true);
+ monitor.worked(calculateWork(0.40));
- comparisonSnapshot.setDate(Calendar.getInstance().getTime());
- comparisonSnapshot.setMatch(match);
- comparisonSnapshot.setDiff(diff);
- monitor.worked(calculateWork(0.20));
- }
+ comparisonSnapshot.setDate(Calendar.getInstance().getTime());
+ comparisonSnapshot.setMatch(match);
+ comparisonSnapshot.setDiff(diff);
+ monitor.worked(calculateWork(0.20));
+ }
}

Back to the top