diff options
| -rw-r--r-- | plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java index b743ecad3..3f735bdf0 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java @@ -39,16 +39,11 @@ public class MatchItemProviderSpec extends MatchItemProvider { */
@Override
public Object getImage(Object object) {
- Object ret = null;
Match match = (Match)object;
-
- AdapterFactory af = CompareItemProviderAdapterFactorySpec
- .getRootAdapterFactoryIfComposeable(adapterFactory);
-
- ret = CompareItemProviderAdapterFactorySpec.getImage(af, match.getLeft());
+ Object ret = CompareItemProviderAdapterFactorySpec.getImage(adapterFactory, match.getLeft());
if (ret == null) {
- ret = CompareItemProviderAdapterFactorySpec.getImage(af, match.getRight());
+ ret = CompareItemProviderAdapterFactorySpec.getImage(adapterFactory, match.getRight());
}
if (ret == null) {
@@ -65,16 +60,11 @@ public class MatchItemProviderSpec extends MatchItemProvider { */
@Override
public String getText(Object object) {
- String ret = null;
Match match = (Match)object;
-
- AdapterFactory af = CompareItemProviderAdapterFactorySpec
- .getRootAdapterFactoryIfComposeable(adapterFactory);
-
- ret = CompareItemProviderAdapterFactorySpec.getText(af, match.getLeft());
+ String ret = CompareItemProviderAdapterFactorySpec.getText(adapterFactory, match.getLeft());
if (ret == null) {
- ret = CompareItemProviderAdapterFactorySpec.getText(af, match.getRight());
+ ret = CompareItemProviderAdapterFactorySpec.getText(adapterFactory, match.getRight());
}
if (ret == null) {
|