From 0d430e00bed34cca1d41c26cc2cad35b797e89b8 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Fri, 4 Dec 2015 16:46:32 +0000 Subject: [PATCH] Fix reverted boolean value git-svn-id: https://svn.argeo.org/commons/trunk@8681 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.cms/src/org/argeo/cms/forms/EditableLink.java | 5 +++-- .../org/argeo/cms/forms/EditableMultiStringProperty.java | 2 +- .../src/org/argeo/cms/forms/EditablePropertyDate.java | 6 +++--- .../src/org/argeo/cms/forms/EditablePropertyString.java | 7 ++++--- org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java | 2 +- org.argeo.cms/src/org/argeo/cms/forms/FormUtils.java | 7 +------ 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/org.argeo.cms/src/org/argeo/cms/forms/EditableLink.java b/org.argeo.cms/src/org/argeo/cms/forms/EditableLink.java index 17e3255b1..ece0be36b 100644 --- a/org.argeo.cms/src/org/argeo/cms/forms/EditableLink.java +++ b/org.argeo.cms/src/org/argeo/cms/forms/EditableLink.java @@ -4,6 +4,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.cms.viewers.EditablePart; +import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -40,7 +41,7 @@ public class EditableLink extends EditablePropertyString implements Control child = getControl(); if (child instanceof Label) { Label lbl = (Label) child; - if (FormUtils.notEmpty(text)) + if (EclipseUiUtils.isEmpty(text)) lbl.setText(message); else if (readOnly) setLinkValue(lbl, text); @@ -50,7 +51,7 @@ public class EditableLink extends EditablePropertyString implements lbl.setText(text); } else if (child instanceof Text) { Text txt = (Text) child; - if (FormUtils.notEmpty(text)) { + if (EclipseUiUtils.isEmpty(text)) { txt.setText(""); txt.setMessage(message); } else diff --git a/org.argeo.cms/src/org/argeo/cms/forms/EditableMultiStringProperty.java b/org.argeo.cms/src/org/argeo/cms/forms/EditableMultiStringProperty.java index 629630b6b..fdaa0365c 100644 --- a/org.argeo.cms/src/org/argeo/cms/forms/EditableMultiStringProperty.java +++ b/org.argeo.cms/src/org/argeo/cms/forms/EditableMultiStringProperty.java @@ -196,7 +196,7 @@ public class EditableMultiStringProperty extends StyledControl implements String value = text.getText(); String errMsg = null; - if (FormUtils.notEmpty(value)) + if (EclipseUiUtils.isEmpty(value)) return; if (values.contains(value)) diff --git a/org.argeo.cms/src/org/argeo/cms/forms/EditablePropertyDate.java b/org.argeo.cms/src/org/argeo/cms/forms/EditablePropertyDate.java index 83580df63..928a28508 100644 --- a/org.argeo.cms/src/org/argeo/cms/forms/EditablePropertyDate.java +++ b/org.argeo.cms/src/org/argeo/cms/forms/EditablePropertyDate.java @@ -79,13 +79,13 @@ public class EditablePropertyDate extends StyledControl implements EditablePart Control child = getControl(); if (child instanceof Label) { Label lbl = (Label) child; - if (FormUtils.notEmpty(text)) + if (EclipseUiUtils.isEmpty(text)) lbl.setText(message); else lbl.setText(text); } else if (child instanceof Text) { Text txt = (Text) child; - if (FormUtils.notEmpty(text)) { + if (EclipseUiUtils.isEmpty(text)) { txt.setText(""); } else txt.setText(text); @@ -99,7 +99,7 @@ public class EditablePropertyDate extends StyledControl implements EditablePart } public synchronized void stopEditing() { - if (FormUtils.notEmpty(dateTxt.getText())) + if (EclipseUiUtils.isEmpty(dateTxt.getText())) getControl().setData(STYLE, FormStyle.propertyMessage.style()); else getControl().setData(STYLE, FormStyle.propertyText.style()); diff --git a/org.argeo.cms/src/org/argeo/cms/forms/EditablePropertyString.java b/org.argeo.cms/src/org/argeo/cms/forms/EditablePropertyString.java index e86312922..e7840396d 100644 --- a/org.argeo.cms/src/org/argeo/cms/forms/EditablePropertyString.java +++ b/org.argeo.cms/src/org/argeo/cms/forms/EditablePropertyString.java @@ -8,6 +8,7 @@ import javax.jcr.RepositoryException; import org.argeo.cms.viewers.EditablePart; import org.argeo.cms.widgets.EditableText; +import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; @@ -41,13 +42,13 @@ public class EditablePropertyString extends EditableText implements Control child = getControl(); if (child instanceof Label) { Label lbl = (Label) child; - if (FormUtils.notEmpty(text)) + if (EclipseUiUtils.isEmpty(text)) lbl.setText(message + " "); else lbl.setText(text); } else if (child instanceof Text) { Text txt = (Text) child; - if (FormUtils.notEmpty(text)) { + if (EclipseUiUtils.isEmpty(text)) { txt.setText(""); txt.setMessage(message + " "); } else @@ -61,7 +62,7 @@ public class EditablePropertyString extends EditableText implements } public synchronized void stopEditing() { - if (FormUtils.notEmpty(((Text) getControl()).getText())) + if (EclipseUiUtils.isEmpty(((Text) getControl()).getText())) getControl().setData(STYLE, propertyMessage.style()); else getControl().setData(STYLE, propertyText.style()); diff --git a/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java b/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java index 7460a00fd..7890f4710 100644 --- a/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java +++ b/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java @@ -121,7 +121,7 @@ public class FormPageViewer extends AbstractPageViewer { // JCR : Model node = ept.getNode(); String propName = ept.getPropertyName(); - if (FormUtils.notEmpty(txt)) { + if (EclipseUiUtils.isEmpty(txt)) { if (node.hasProperty(propName)) node.getProperty(propName).remove(); } else { diff --git a/org.argeo.cms/src/org/argeo/cms/forms/FormUtils.java b/org.argeo.cms/src/org/argeo/cms/forms/FormUtils.java index f5745889e..cf9984b86 100644 --- a/org.argeo.cms/src/org/argeo/cms/forms/FormUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/forms/FormUtils.java @@ -33,15 +33,10 @@ public class FormUtils { public final static String DEFAULT_SHORT_DATE_FORMAT = "dd/MM/yyyy"; - /** Simply checks if a string is not null nor empty */ - public static boolean notEmpty(String stringToTest) { - return EclipseUiUtils.notEmpty(stringToTest); - } - /** Best effort to convert a String to a calendar. Fails silently */ public static Calendar parseDate(DateFormat dateFormat, String calStr) { Calendar cal = null; - if (notEmpty(calStr)) { + if (EclipseUiUtils.notEmpty(calStr)) { try { Date date = dateFormat.parse(calStr); cal = new GregorianCalendar(); -- 2.30.2