Use nullOrEmpty test for strings returned AdapterFactoryItemDelegator.

AdapterFactoryItemDelegator#getText() never return null.

Change-Id: I4b6187fef16fe503c3325bb4d79aea4be82a88fa

4 files changed, 17 insertions, 15 deletions

diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java
index 586280e9e..1dce2412f 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.emf.compare.provider.spec;
 
-import com.google.common.base.Strings;
+import static com.google.common.base.Strings.isNullOrEmpty;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.util.URI;
@@ -125,7 +125,7 @@ public class AttributeChangeItemProviderSpec extends AttributeChangeItemProvider
 			value = EcoreUtil.convertToString(attChange.getAttribute().getEAttributeType(), attValue);
 		}
 
-		if (Strings.isNullOrEmpty(value)) {
+		if (isNullOrEmpty(value)) {
 			if (attValue instanceof EObject && ((EObject)attValue).eIsProxy()) {
 				value = "proxy : " + ((InternalEObject)attValue).eProxyURI().toString();
 			} else {
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 bc0679cf4..77b6cd46b 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
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.emf.compare.provider.spec;
 
+import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.collect.Iterables.any;
 import static org.eclipse.emf.compare.utils.EMFComparePredicates.hasState;
 
@@ -87,15 +88,15 @@ public class MatchItemProviderSpec extends MatchItemProvider implements IItemSty
 		Match match = (Match)object;
 		String ret = itemDelegator.getText(match.getLeft());
 
-		if (ret == null) {
+		if (isNullOrEmpty(ret)) {
 			ret = itemDelegator.getText(match.getRight());
 		}
 
-		if (ret == null) {
+		if (isNullOrEmpty(ret)) {
 			ret = itemDelegator.getText(match.getOrigin());
 		}
 
-		if (ret == null) {
+		if (isNullOrEmpty(ret)) {
 			ret = super.getText(object);
 		}
 
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java
index 1c93f0978..157e492eb 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java
@@ -10,10 +10,9 @@
  *******************************************************************************/
 package org.eclipse.emf.compare.provider.spec;
 
+import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.collect.Iterables.any;
 
-import com.google.common.base.Strings;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.compare.Diff;
@@ -145,7 +144,7 @@ public class ReferenceChangeItemProviderSpec extends ReferenceChangeItemProvider
 	 */
 	private static boolean isStringAndNullOrEmpty(Object s) {
 		if (s instanceof String) {
-			return Strings.isNullOrEmpty((String)s);
+			return isNullOrEmpty((String)s);
 		} else {
 			return false;
 		}
@@ -172,7 +171,7 @@ public class ReferenceChangeItemProviderSpec extends ReferenceChangeItemProvider
 	protected String getValueText(final ReferenceChange refChange) {
 		EObject refChangeValue = refChange.getValue();
 		String value = itemDelegator.getText(refChangeValue);
-		if (Strings.isNullOrEmpty(value)) {
+		if (isNullOrEmpty(value)) {
 			if (refChangeValue.eIsProxy()) {
 				value = "proxy : " + ((InternalEObject)refChangeValue).eProxyURI().toString();
 			} else {
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java
index 78797e278..7f0b86b09 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.emf.compare.provider.spec;
 
+import static com.google.common.base.Strings.isNullOrEmpty;
+
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.compare.DifferenceKind;
 import org.eclipse.emf.compare.DifferenceSource;
@@ -94,13 +96,13 @@ public class ResourceAttachmentChangeItemProviderSpec extends ResourceAttachment
 		ResourceAttachmentChange resourceAttachmentChange = (ResourceAttachmentChange)object;
 		final Match match = resourceAttachmentChange.getMatch();
 		String value = itemDelegator.getText(match.getLeft());
-		if (value == null) {
+		if (isNullOrEmpty(value)) {
 			value = itemDelegator.getText(match.getRight());
 		}
-		if (value == null) {
+		if (isNullOrEmpty(value)) {
 			value = itemDelegator.getText(match.getOrigin());
 		}
-		if (value == null) {
+		if (isNullOrEmpty(value)) {
 			value = super.getText(object);
 		}
 
@@ -130,13 +132,13 @@ public class ResourceAttachmentChangeItemProviderSpec extends ResourceAttachment
 		final ResourceAttachmentChange rac = (ResourceAttachmentChange)object;
 		final Match match = rac.getMatch();
 		String ret = itemDelegator.getText(match.getLeft());
-		if (ret == null) {
+		if (isNullOrEmpty(ret)) {
 			ret = itemDelegator.getText(match.getRight());
 		}
-		if (ret == null) {
+		if (isNullOrEmpty(ret)) {
 			ret = itemDelegator.getText(match.getOrigin());
 		}
-		if (ret == null) {
+		if (isNullOrEmpty(ret)) {
 			ret = super.getText(object);
 		}