Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-04-05 05:15:06 -0400
committerEike Stepper2013-04-05 05:15:06 -0400
commit976e48e5967a2888f768043af20cb49b7717e821 (patch)
tree5967b6978a7c08c8b3c51c82b70d62fe78997c4d
parent61f224419450d14781232e2aa6a6ab33887a156f (diff)
downloadcdo-976e48e5967a2888f768043af20cb49b7717e821.tar.gz
cdo-976e48e5967a2888f768043af20cb49b7717e821.tar.xz
cdo-976e48e5967a2888f768043af20cb49b7717e821.zip
Add JavaDoc for Compare integration
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/package-info.java16
2 files changed, 21 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
index 614b0f9608..2e7093dbe6 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
@@ -37,10 +37,13 @@ import org.eclipse.emf.compare.postprocessor.IPostProcessor;
import org.eclipse.emf.compare.req.IReqEngine;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
import com.google.common.base.Function;
/**
+ * A class with many overridable factory methods that help to create EMF {@link Comparison comparisons}.
+ *
* @author Eike Stepper
*/
public class CDOCompare
@@ -181,6 +184,8 @@ public class CDOCompare
}
/**
+ * A {@link DefaultMatchEngine match engine} that treats {@link Resource resources} as {@link EObject EObjects}.
+ *
* @author Eike Stepper
*/
public static final class CDOMatchEngine extends DefaultMatchEngine
diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/package-info.java b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/package-info.java
new file mode 100644
index 0000000000..1e89004436
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/package-info.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * 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:
+ * Eike Stepper - initial API and implementation
+ */
+
+/**
+ * Classes that help to open EMF Compare user interfaces on CDO models.
+ */
+package org.eclipse.emf.cdo.ui.compare;
+

Back to the top