Fix a potential NPE
Change-Id: Iac249678833a1b8834ffeaba095f27b18818ffff
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
diff --git a/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/api/utils/Util.java b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/api/utils/Util.java
index e9d7239..66dc27a 100644
--- a/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/api/utils/Util.java
+++ b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/api/utils/Util.java
@@ -31,15 +31,15 @@
}
/**
- * Returns the first of a series of alternative string values which is not {@link Util#blank blank}.
+ * Returns the first of a series of alternative string values which is not null.
*
* @param alternatives
* the alernative strings, in order of preference.
- * @return the first non-blank alternative, or <code>null</code> if they are all blank.
+ * @return the first non-null alternative, or an empty string if they are all null.
*/
- public static String firstNonBlank(String... alternatives) {
+ public static String firstNonNull(String... alternatives) {
for (String s : alternatives) {
- if (!isBlank(s)) {
+ if (s != null) {
return s;
}
}
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFTextLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFTextLifecycleManager.java
index 4ff59e0..ade7dcc 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFTextLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFTextLifecycleManager.java
@@ -190,7 +190,7 @@
public void apply(Object value) {
if (!text.isDisposed()) {
if (value != null && !(text.getText() != null && text.getText().equals(value.toString()))) {
- text.setText(Util.firstNonBlank(value.toString(), "")); //$NON-NLS-1$
+ text.setText(Util.firstNonNull(value.toString(), "")); //$NON-NLS-1$
}
EEFTextLifecycleManager.this.setStyle();
if (!text.isEnabled()) {
