Changeset 4525

Timestamp:

Oct 22, 2013, 2:43:08 PM (9 years ago)

Author:

olle

Message:

Refs #818. Refs #805. File selection updated to avoid creating extra unwanted buttons, when navigating the directory tree to find files to select:

1. Class/file action/directory/ViewActiveDirectory.java in client/servlet/ updated in private method String fetchNextButtonName(Boolean select, Boolean selectMoveDir, VString fieldName, String defaultName) to exchange a four-character string "null" for a null value, when obtained from a posted parameter or session attribute value. This has the side effect that no button can be created in this way having the name "null", but this is unlikely to cause any problems.

File:

• trunk/client/servlet/src/org/proteios/action/directory/ViewActiveDirectory.java (modified) (4 diffs)

trunk/client/servlet/src/org/proteios/action/directory/ViewActiveDirectory.java

@@ -731 +731 @@
     {
         String nextButtonName = null;
+        String stringsource = "default when select == false";
         if (select == null || select)
         {
@@ -737 +738 @@
             {
                 nextButtonName = getString(fieldName);
+                // Replace 4-character string "null" with null value
+                if (nextButtonName != null && nextButtonName.equals("null"))
+                {
+                  nextButtonName = null;
+                }
+                stringsource = "posted parameters";
             }
             catch (InvalidParameterValue e)
@@ -743 +750 @@
             {
                 nextButtonName = getSessionAttribute(fieldName);
+                // Replace 4-character string "null" with null value
+                if (nextButtonName != null && nextButtonName.equals("null"))
+                {
+                  nextButtonName = null;
+                }
+               stringsource = "session attribute";
             }
             if (nextButtonName == null || nextButtonName.equals(""))
             {
                 nextButtonName = defaultName;
+                stringsource = "default name";
             }
             // If selection is for directory to move file to, override above
@@ -752 +766 @@
             {
                 nextButtonName = "Next";
-            }
+                stringsource = "default when selectMoveDir == true";
+            }
+        }
+        if (nextButtonName == null)
+        {
+            log.debug("fetchNextButtonName(): fieldName = " + fieldName.getName() + " select = " + select + " selectMoveDir = " + selectMoveDir + " defaultName = " + defaultName + " : nextButtonName = " + nextButtonName + " obtained from " + stringsource);
+        }
+        else
+        {
+             log.debug("fetchNextButtonName(): fieldName = " + fieldName.getName() + " select = " + select + " selectMoveDir = " + selectMoveDir + " defaultName = " + defaultName + " : nextButtonName = \"" + nextButtonName + "\" obtained from " + stringsource);
         }
         return nextButtonName;