Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikaël Barbero2013-04-20 08:39:38 +0000
committerMikaël Barbero2013-04-23 09:14:09 +0000
commite67bf74e272d89868c20aac35b9bf77bd71987e7 (patch)
treeb7908acf8c9be0988359aa4e44724a69850e1753
parent818bccd279ae48240b34053d12216cb416eb6a63 (diff)
downloadorg.eclipse.emf.compare-e67bf74e272d89868c20aac35b9bf77bd71987e7.tar.gz
org.eclipse.emf.compare-e67bf74e272d89868c20aac35b9bf77bd71987e7.tar.xz
org.eclipse.emf.compare-e67bf74e272d89868c20aac35b9bf77bd71987e7.zip
Remove dead code
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java29
1 files changed, 0 insertions, 29 deletions
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java
index 62cc123b3..30990fc23 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java
@@ -15,7 +15,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.compare.AttributeChange;
import org.eclipse.emf.compare.Comparison;
@@ -30,7 +29,6 @@ import org.eclipse.emf.compare.utils.ReferenceUtil;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
@@ -40,18 +38,6 @@ public final class MergeViewerUtil {
private MergeViewerUtil() {
}
- public static Diff getDiffWithValue(Iterable<Diff> differences, Object value, MergeViewerSide side) {
- Diff ret = null;
- for (Diff diff : differences) {
- Object valueOfDiff = getValueFromDiff(diff, side);
- if (valueOfDiff == value) {
- ret = diff;
- break;
- }
- }
- return ret;
- }
-
public static List<?> getValues(Diff diff, MergeViewerSide side) {
Match ownerMatch = diff.getMatch();
EObject eObject = getEObject(ownerMatch, side);
@@ -150,21 +136,6 @@ public final class MergeViewerUtil {
return ret;
}
- public static Object getParent(Object object, AdapterFactory adapterFactory) {
- ITreeItemContentProvider treeItemContentProvider = (ITreeItemContentProvider)adapterFactory.adapt(
- object, ITreeItemContentProvider.class);
-
- return treeItemContentProvider != null ? treeItemContentProvider.getParent(object) : null;
- }
-
- public static Object[] getChildren(Object object, AdapterFactory adapterFactory) {
- ITreeItemContentProvider treeItemContentProvider = (ITreeItemContentProvider)adapterFactory.adapt(
- object, ITreeItemContentProvider.class);
-
- return (treeItemContentProvider != null ? treeItemContentProvider.getChildren(object)
- : Collections.EMPTY_LIST).toArray();
- }
-
/**
* Returns the current resource on the given side of the given comparison.
*

Back to the top