Merge security.ui bundle in the cms.ui.workbench bundle

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / forms / FormUtils.java

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 f5745889e3604d8066aae59ec9745b20e892407d..f8d08b08d8a418299e75fc553a2f520c411ad511 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/forms/FormUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/forms/FormUtils.java
@@ -11,7 +11,7 @@ import javax.jcr.RepositoryException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
+import org.argeo.cms.CmsException;
 import org.argeo.cms.CmsView;
 import org.argeo.cms.util.CmsUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
@@ -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();
@@ -67,7 +62,7 @@ public class FormUtils {
                                try {
                                        cmsView.navigateTo(node.getPath());
                                } catch (RepositoryException e) {
-                                       throw new ArgeoException("Unable to get path for node "
+                                       throw new CmsException("Unable to get path for node "
                                                        + node + " before calling navigateTo(path)", e);
                                }
                        }