patch.6016.patch

     **     RFB 20211022          Additional documentation to point out the empty string condition. Ref #4710.
     **     HC  20211102          Implemented i18n support.
     **     AL2 20220124          Make all control set entities to check for screen-value validity.
     **     ME  20220201          Allow for multiple values list when setting screen-value (delimiter is used).
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
     import java.util.*;
     import java.util.function.*;
     import java.util.regex.*;
     import java.util.stream.Collectors;
     import java.util.stream.Stream;
     import com.goldencode.p2j.util.*;
     import com.goldencode.p2j.ui.client.format.*;
-...
+       {
           if (inUIStmt || !internalScreenValueUsage)
+          {
              if (value instanceof character && !isValidScreenValue((character) value))
              if (value instanceof character && !validateScreenValue((character) value))
+             {
                 if (_isRealized() && frame != null &&
                     getAttr("wasRealized", () -> frame.getFrameWidget().config().wasRealized, true))
+                {
                    ErrorManager.recordOrShowError(4058, String.format(
                          "Attribute SCREEN-VALUE for the %s %s has an invalid value of %s", type(),
                          widgetName(), ((BaseDataType) value).isUnknown() ? "UNKNOWN" : value), false);
+                }
                 return false;
+             }
+          }
-...
           return super.setScreenValue(frameBuf, value, inUIStmt);
+       }
        /**
         * Validate the value(s) for SCREEN-VALUE attribute, the delimiter is used
         * to split it into an array.
+        *
         * @param value
         * The to be validated as SCREEN-VALUE attribute.
+        *
         * @return <code>true</code> if the value is a valid screen-value.
         */
        boolean validateScreenValue(character value)
+       {
           if (!value.isUnknown())
+          {
              char delimiter = getAttr("delimiter", () -> config.delimiter);
              character[] values = TextOps.entries(character.class, value.getValue(),
                       String.valueOf(delimiter));
              if (!isValidScreenValue(values))
+             {
                 if (_isRealized())
+                {
                    ErrorManager.recordOrShowWarning(4058, String.format(
                             "Attribute SCREEN-VALUE for the %s %s has an invalid value of %s", type(),
                             widgetName(), (value.isUnknown() ? "UNKNOWN" : value.getValue())), true,
                             false, false, true);
+                }
                 return false;
+             }
+          }
           return true;
+       }
        /**
         * Check if the tested value is in the control-set values.
-...
         */
        protected boolean isValidScreenValue(character value)
+       {
           if (value.isUnknown() || getAttr("items", () -> config.items) == null)
+          {
              return false;
+          }
           // test value
           return Arrays.stream(getAttr("items", () -> config.items)).anyMatch(item -> item.getCharacterValue().equals(value));
           return isValidScreenValue(new character[] { value });
+       }
        /**
         * Check if the tested value(s) is in the control-set values.
+        *
         * @param    value
         *           The tested value(s)
+        *
         * @return   True if the tested value(s) is in the control-set values, otherwise false.
         */
        protected boolean isValidScreenValue(character... values)
+       {
           if (values == null || values.length == 0)
+          {
              return false;
+          }
           ControlSetItem[] items = getAttr("items", () -> config.items);
           if (items == null)
+          {
              return false;
+          }
           for (character value : values)
+          {
              if (!value.isUnknown() && !Arrays.stream(items).anyMatch(item -> CompareOps._isEqual(item.getCharacterValue(), value)))
+             {
                 return false;
+             }
+          }
           return true;
+       }
        /**

     **     VVT 20220120          Fixed: setting SCROLLBAR-HORIZONTAL and/or SCROLLBAR-VERTICAL for a realized
     **                           widget must be rejected with the warning 4053. See #5937-53.
     **     AL2 20220124          Check screen-value validity through ControlSetEntity.
     **     ME  20220201          Handle multiple values list in set screen-value.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
     package com.goldencode.p2j.ui;
     import java.util.Arrays;
     import java.util.Set;
     import java.util.stream.Collectors;
     import com.goldencode.p2j.util.*;
     /**
-...
        @Override
        boolean setScreenValue(ScreenBuffer frameBuf, Object value, boolean inUIStmt)
+       {
           if (inUIStmt && frameBuf.getWidgetValue(getId()) != null)
+          {
              if (value == null || (
                  value instanceof BaseDataType &&
                  !(value instanceof character) &&
                  ((BaseDataType) value).isUnknown()))
           if (!(value instanceof character))
+          {
              // we can't set non-character value to selection list
              return false;
+          }
           character cvalue = (character) value;
           if (!cvalue.isUnknown() && cvalue.toJavaType().length() == 0)
+          {
              cvalue.setUnknown();
+          }
           return super.setScreenValue(frameBuf, cvalue, inUIStmt);
+       }
        /**
         * Validate the value(s) for SCREEN-VALUE attribute, the delimiter is used
         * to split it into an array.
+        *
         * If valid the SCREEN-VALUE will be updated to reflect the resulting value.
+        *
         * @param value
         *        The to be validated as SCREEN-VALUE attribute.
+        *
         * @return <code>true</code> if the value is a valid screen-value.
         */
        @Override
        boolean validateScreenValue(character value)
+       {
           if (super.validateScreenValue(value))
+          {
              // if valid update the screen-value
              if (!value.isUnknown())
+             {
                 // we can set unknown value to character selection list
                 return false;
                 String delimiter = String.valueOf(getAttr("delimiter", () -> config.delimiter));
                 character[] values = TextOps.entries(character.class, value.getValue(), delimiter);
                 ControlSetItem[] items = getAttr("items", () -> config.items);
                 // resulting screen-value might be different due to:
                 // - reorder based on item's index
                 // - only first item with given value is selected (case insensitive)
                 if (getAttr("multiple", () -> config.multiple))
+                {
                    // for multiple selection existing selection is kept (append)
                    Set<Integer> selection = Arrays.stream(frame.getSelection(this)).map(i -> i + 1)
                             .boxed().collect(Collectors.toSet());
                    for (character val : values)
+                   {
                       for (ControlSetItem item : items)
+                      {
                          if (CompareOps._isEqual(val, item.getCharacterValue()))
+                         {
                             selection.add(item.getItemId());
                             break;
+                         }
+                      }
+                   }
                    character newValue = new character(
                             Arrays.stream(items).filter(item -> selection.contains(item.getItemId()))
                                      .map(item -> item.getCharacterValue().getValue())
                                      .collect(Collectors.joining(delimiter)));
                    value.assign(newValue);
+                }
                 else
+                {
                    // last value from the list win
                    for (ControlSetItem item : items)
+                   {
                       if (CompareOps._isEqual(values[values.length - 1], item.getCharacterValue()))
+                      {
                          value.assign(item.getCharacterValue());
                          break;
+                      }
+                   }
+                }
+             }
              if (value instanceof character &&
                 ((character) value).toJavaType().length() == 0)
+             {
                 return false;
+             }
+          }
           if (!inUIStmt                        &&
               value instanceof character       &&
               !((character) value).isUnknown() &&
                ((character) value).toJavaType().length() == 0)
+          {
              ((character) value).setUnknown();
+          }
           return super.setScreenValue(frameBuf, value, inUIStmt);
              return true;
+          }
           return false;
+       }
        /**
         * Check if the tested value is valid for screen-value.
         * Unknown is a valid option as it will clear the selection.
+        *
         * @param    value
         *           The tested value
+        *
         * @return   True if the tested value is valid for screen-value, otherwise false.
         */
        @Override
        protected boolean isValidScreenValue(character value)
+       {
           // it is valid to assign unknown to screen-value of a selection list widget

     **     VVT 20220119          Minor annotation and javadoc fixes.
     **     VVT 20220126          setSelectionMode() now returns boolean indicating any change was done
     **                           by the method call. See #5937.
     **     ME  20220201          Force refresh on <code>afterConfigUpdate</code> if model is empty
     **                           (configuration items needs to be parsed during initialization).
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
              // 4gl API does allows only to replace all list items at once, which regenerates *all* item IDs.
              // As the result, it is sufficient to compare only the first item IDs here.
              needToResetView |= newItems[0].getItemId() != oldItems[0].getItemId();
              needToResetView |= newItems[0].getItemId() != oldItems[0].getItemId() || list.model().size() == 0;
+          }
           if (needToResetView)

     **                           toggleCurrentRowSelection(). selectItem() method is now unused and
     **                           removed. Method getDefaultEvent() overloaded. Several #5937 issues fixed.
     **                           Class members sorted.
     **     ME  20220201          Handle multiple values list in set screen-value.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
        public void setValue(BaseDataType value)
+       {
           selected  = false;
           initValue = new character();
           boolean doRepaint = false;
           if (value.isUnknown())
              return;
           selectionClear();
           if (value instanceof character)
+          {
              String itemList = ((character) value).getValue();
              char[] delim = new char[1];
              delim[0] = config.delimiter;
              String d = new String(delim);
              String[] elem = itemList.split(d);
              boolean isChui = ThinClient.getInstance().isChui();
              for (String element : elem)
+             {
                 BaseDataType val =
                    DisplayFormat.instanceOfType(isChui, config.dataType, element);
                 if (setSingleValue(val))
                    doRepaint = true;
+             }
              selectionClear();
              doRepaint = true;
+          }
           else
              doRepaint = setSingleValue(value);
+          {
              if (value instanceof character)
+             {
                 String itemList = ((character) value).getValue();
                 char[] delim = new char[1];
                 delim[0] = config.delimiter;
                 String d = new String(delim);
                 String[] elem = itemList.split(d);
                 boolean isChui = ThinClient.getInstance().isChui();
                 for (String element : elem)
+                {
                    BaseDataType val =
                       DisplayFormat.instanceOfType(isChui, config.dataType, element);
                    if (setSingleValue(val))
                       doRepaint = true;
+                }
+             }
              else
+             {
                 doRepaint = setSingleValue(value);
+             }
+          }
           if (doRepaint)
+          {
              repaint();
              initValue = value;
              initValue = getScreenValue();
+          }
+       }
-...
              return false;
+          }
           boolean doRepaint = false;
           if (selectionMode() == ListSelectionModel.SINGLE_SELECTION)
+          {
              selectionClear();
+          }
           for (int i = 0; i < items.length; i++)
+          {
-...
+             {
                 select(i,i);
                 if (first() >= 0)
                    ensureRowVisible(first());
                 if (i >= 0)
                    ensureRowVisible(i);
                 doRepaint = true;
                 // only first entry that matches the value is selected
                 return true;
+             }
+          }
           return doRepaint;
           return false;
+       }
+    }
+    }

Project

General

Profile

FWD » Core Development » User Interface