6053.patch

     **                           and converted to integer. See #5345.
     **     VVT 20211118          Fixed: incorrect coordinate conversion when setting size atributes. See #5034-1422.
     **     ME  20220209          Replace getAttr for "realized" with isRealized method.
     **     RV  20220610          Modified frame col/row/x/y methods to return null is frame is null.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
        @Override
        public decimal getFrameColumn()
+       {
           return MathOps.plus(getColumn(), getAttr("frameColumnOffset", () -> config.frameColumnOffset, true));
           if(this.frame == null)
              return new decimal();
           return getColumn();
+       }
        /**
-...
        @Override
        public decimal getFrameRow()
+       {
           return MathOps.plus(getRow(), getAttr("frameRowOffset", () -> config.frameRowOffset, true));
           if(this.frame == null)
              return new decimal();
           return getRow();
+       }
        /**
-...
        @Override
        public integer getFrameX()
+       {
           // if we are in ChUI, this actually returns the FRAME-COL
           return new integer(LogicalTerminal.isChui()
                                 ? getFrameColumn()
                                 : MathOps.plus(getX(), getAttr("frameXOffset", () -> config.frameXOffset, true)));
           if(this.frame == null)
              return new integer();
           return LogicalTerminal.isChui() ? new integer(getColumn()) : getX();
+       }
        /**
-...
        @Override
        public integer getFrameY()
+       {
           // if we are in ChUI, this actually returns the FRAME-ROW
           return new integer(LogicalTerminal.isChui()
                                 ? getFrameRow()
                                 : MathOps.plus(getY(), getAttr("frameYOffset", () -> config.frameYOffset, true)));
           if(this.frame == null)
              return new integer();
           return LogicalTerminal.isChui() ? new integer(getRow()) : getY();
+       }
        /**

     ** 023 EVL 20190401          Adding runtime support for AUTO-COMPLETION attribute.
     ** 024 IAS 20200823          Rework (de)serialization.
     **     EVL 20200925          Pack all boolean attributes into single 32-bit integer for socket read/write.
     **     RV  20220610          Added initialization block.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
           out.writeInt(selectedIndex);
           writeEnum(out, mode);
+       }
        /**
         * Initialize defaults for this config.
         */
+       {
           widthChars = 13.8;
           heightChars = 1.0;
           format = "x(8)";
+       }
+    }

     **                           because all values will return true in this case.
     **     OM  20220304          4GL quirk: in the GUI clients, setting the SCREEN-VALUE to "" will make it ?.
     **     ME  20220410          Partial fix for screen-value validation for non-character data type.
     **     BP  20220610          Delete the conditions from setHeightChars/Pixels because it can never be set.
     */
     /*
-...
        @Override
        public void setHeightChars(NumberType height)
+       {
           if (_isRealized())
+          {
              ErrorManager.recordOrShowError(4078,
                 String.format("Unable to set attribute HEIGHT for %s %s",
                               type(), widgetName()), false);
+          }
           else
+          {
              super.setHeightChars(height);
+          }
+       }
        /**
-...
        @Override
        public void setHeightChars(double height)
+       {
           if (_isRealized())
+          {
              ErrorManager.recordOrShowError(4078,
                 String.format("Unable to set attribute HEIGHT for %s %s",
                               type(), widgetName()), false);
+          }
           else
+          {
              super.setHeightChars(height);
+          }
+       }
        /**
-...
        @Override
        public void setHeightPixels(NumberType heightPixels)
+       {
           if (_isRealized())
+          {
              ErrorManager.recordOrShowError(4078,
                 String.format("Unable to set attribute HEIGHT-PIXELS for %s %s",
                               type(), widgetName()), false);
+          }
           else
+          {
              super.setHeightPixels(heightPixels);
+          }
+       }
        /**
-...
        @Override
        public void setHeightPixels(int heightPixels)
+       {
           if (_isRealized())
+          {
              ErrorManager.recordOrShowError(4078,
                 String.format("Unable to set attribute HEIGHT-PIXELS for %s %s",
                               type(), widgetName()), false);
+          }
           else
+          {
              super.setHeightPixels(heightPixels);
+          }
+       }
        /**

     **     CA  20210709          Dynamic side-labels are part of the FIELD-GROUP in FWD, too - so they must not be
     **                           walked explicitly.
     **     HC  20211102          Implemented i18n support.
     **     RV  20220610          Modified getIndex method to return unknown if widget is dynamic.
     */
     /*
-...
        @Override
        public integer getIndex()
+       {
           if (config.dynamic)
              return new integer();
           return new integer(getAttr("index", () -> config.index));
+       }

     **                           case for radio-set to check validity.
     **     ME  20220410          Partial fix for screen-value validation for non-character data type.
     **     IAS 20220527          Re-worked delete operation using deleteFromControlSet
     **     ME  20220610          Remove use of wasRealized and use _isRealized method instead.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
+       {
           if (!isValidScreenValue(value))
+          {
              if (frame != null && getAttr("wasRealized", () -> config.wasRealized, true))
              if (frame != null && _isRealized())
+             {
                 ErrorManager.recordOrShowWarning(4058, String.format(
                          "Attribute SCREEN-VALUE for the %s %s has an invalid value of %s", type(),

new/src/com/goldencode/p2j/ui/FillInConfig.java 2022-06-10 11:16:29 +0000
51	51	** 030 VVT 20200203 Javadoc fix.
52	52	** 031 IAS 20200823 Rework (de)serialization.
53	53	** EVL 20200925 Pack all boolean attributes into single 32-bit integer for socket read/write.
	54	** RV 20220610 Added initialization block.
54	55	*/
55	56	/*
56	57	** This program is free software: you can redistribute it and/or modify
...	...
213	214	*/
214	215	public FillInConfig()
215	216	{
216		heightChars = 1;
217	217	}
218	218
219	219	/**
...	...
225	225	protected FillInConfig(int id)
226	226	{
227	227	super(id);
228		heightChars = 1;
229	228	}
230	229
231	230	/**
...	...
237	236	public FillInConfig(WidgetId id)
238	237	{
239	238	super(id);
240		heightChars = 1;
241	239	}
242	240
243	241	/**
...	...
349	347	writeExternalizable(out, ehFont);
350	348	writeString(out, subtype);
351	349	}
	350
	351	/**
	352	* Initialize defaults for this config.
	353	*/
	354	{
	355	heightChars = 1.0;
	356	}
352	357	}

     **     EVL 20210709          We need to send the 0 based selection index to client side for start position
     **                           when calling the SET-SELECTION method for fill-in widget.
     **     EVL 20210709          Adding focusAndSelect() method as FWD extension.
     **     RV  20220610          Added override for setDataType method.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
              return;
+          }
           if (_isRealized())
+          {
              warningAlreadyRealized("SUBTYPE");
              return;
+          }
           setSubType(value.toStringMessage());
+       }
-...
+       }
        /**
         * Sets new value of DATA-TYPE attribute.
+        *
         * @param dataType
         *        new value of DATA-TYPE attribute
         */
        @Override
        public void setDataType(character dataType)
+       {
           if (dataType == null || dataType.isUnknown())
+          {
              ErrorManager.recordOrShowError(4056, type());
              // ** Attribute DATA-TYPE for the <type> widget has an invalid value of UNKNOWN.
              return;
+          }
           if (_isRealized())
+          {
              warningAlreadyRealized("DATA-TYPE");
              return;
+          }
           setDataType(dataType.toStringMessage());
+       }
        /**
         * Sets the text widget that is used as the side label for this widget. This is the
         * equivalent of the SIDE-LABEL-HANDLE attribute of COMBO-BOX, EDITOR, FILL-IN, RADIO-SET,
         * SELECTION-LIST, SLIDER and TEXT widgets.

     **                           Notes resolution.  Added root frame detection code.  According to testcases the
     **                           root frame should return unknown value as tab-position.
     **     ME  20220512          Frame has fixed size only when size is assigned outside of frame setup.
     **     ME  20220610          Remove use of wasRealized and use only _isRealized method instead.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
           int restrictedWidth = restrictedWidthPixels;
           if (_isRealized() && getAttr("wasRealized", () -> config.wasRealized))
           if (_isRealized())
+          {
              // Find the first ancestor of window or frame type, use this ancestor's maximum and virtual
              // widths to restrict the input frame width value
-...
           final int restrictedHeightPixels = truncatePixelSize(heightPixels, attribute);
           int restrictedHeight = restrictedHeightPixels;
           if (_isRealized() && getAttr("wasRealized", () -> config.wasRealized))
           if (_isRealized())
+          {
              // Find the first ancestor of window or frame type, use this ancestor's maximum and virtual
              // heights to restrict the input frame height value

     **                           to reduce unnecessary warnings Ref:6208#note-22
     **     VVT 20220525          moveAfterTab method renamed to moveAfterTabItem in sake of consistence with
     **                           moveBeforeTabItem. See #6383.
     **     ME  20220610          Do not mark the widget as realized if realization not possible (no frame).
     **     RV  20220610          Replaced displayError/recordOrShowError with recordOrShowWarning were needed.
     */
     /*
-...
                 .append(type())
                 .append(" widget is not in a frame");
              // and display it
              ErrorManager.displayError(4073, err.toString());
              ErrorManager.recordOrShowWarning(4073, err.toString(), true, false, true, true);
              return;
+          }
-...
        @Override
        public void realize()
+       {
           if (getAttr("wasRealized", () -> config.wasRealized, true))
           if (getAttr("realized", () -> config.realized, true))
+          {
              return;
+          }
-...
                    false);
+          }
           /**
            * Set the auxiliary flag to indicate whether the widget's has been realized.
            *  A temporary solution. Most likely should be revised
            *  after a proper realization of the realize() method,
            */
           config.wasRealized = true;
           // TODO: implement
           else
+          {
              config.realized = true;
+          }
+       }
        /**
-...
        @Override
        public integer getTabPosition()
+       {
           if (frame == null)
+          {
              return new integer();
+          }
           return getFrame().getFieldGroup().getTabPosition(this);
+       }
-...
+          {
              return true;
+          }
           if (!getAttr("wasRealized", () -> config.wasRealized, true))
           if (!getAttr("realized", () -> config.realized, true))
+          {
              ErrorManager.recordOrShowError(4104,
                    String.format(
-...
                    false);
              if (attr != null)
+             {
                 ErrorManager.recordOrShowError(4077,
                       String.format(
                       "Unable to query attribute %s for %s %s",
                       attr, type(), widgetName()),
                       false);
                 ErrorManager.recordOrShowWarning(4077,
                          String.format("Unable to query attribute %s for %s %s", attr, type(),
                                   widgetName()),
                          true, false, true, true);
+             }
              return false;
+          }
-...
                    .append(type())
                    .append(" widget");
                 // and display it
                 ErrorManager.displayError(4072, err.toString());
                 ErrorManager.recordOrShowWarning(4072, err.toString(), true, false, true, true);
+             }
              return false;
+          }

     **     AL2 20220512          Replaced getTempDirectory with readHtmlBrowserWhitelist.
     **     IAS 20220527          Added deleteFromControlSet operation
     **     AL2 20220606          Added getHTMLBrowserLoadTimeout.
     **     ME  20220610          Check for invalid frame on nextTabItem/previousTabItem.
     */
     /*
-...
         */
        public static handle nextTabItem(GenericFrame frame, GenericWidget<?> widget)
+       {
           if (frame == null || frame.getFieldGroup() == null)
+          {
              return new handle();
+          }
           return frame.getFieldGroup().nextTabItem(widget);
+       }
-...
         */
        public static handle previousTabItem(GenericFrame frame, GenericWidget<?> widget)
+       {
           if (frame == null || frame.getFieldGroup() == null)
+          {
              return new handle();
+          }
           return frame.getFieldGroup().previousTabItem(widget);
+       }

     **     ME  20220323          Modified the manner in which  the attributes are accessed/modified. Ref. #6173.
     **     VVT 20220405          Regression fixed: zero selection list widget height, introduced in
     **                           rev. 13675. See #5937-79.
     **     RV  20220610          Modified methods for properties that realize the widget to throw respective
     **                           warnings/errors.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
        @Override
        public integer getInnerChars()
+       {
           return new integer(getAttr("innerChars", () -> config.innerChars, true));
           if (!canAccess(null)) // this is how 4GL works
+          {
              return new integer();
+          }
           return new integer(Math.max(0, getAttr("innerChars", () -> config.innerChars, true)));
+       }
        /**
-...
+       {
           if (!canAccess(null)) // this is how 4GL works
+          {
              ErrorManager.recordOrShowError(4104, String.format(
                    "Unknown error code 1 for attribute ? on the %s widget",
                    type()),
                    false);
              return new integer();
+          }
           return new integer(Math.max(0, getAttr("innerLines", () -> config.innerLines, true)));
+       }
-...
        @Override
        public decimal getWidthChars()
+       {
           if (!canAccess("WIDHTH"))
           if (!canAccess("WIDTH"))
+          {
              return new decimal(0);
+          }
-...
+       }
        /**
         * Gets the HEIGHT-PIXELS writable attribute.
+        *
         * @return   The current value of the HEIGHT-PIXELS attribute.
         */
        @Override
        public integer getHeightPixels()
+       {
           if (!canAccess("HEIGHT-PIXELS"))
+          {
              return new integer(0);
+          }
           return super.getHeightPixels();
+       }
        /**
         * Gets the WIDTH-PIXELS writable attribute.
+        *
         * @return   The current value of the WIDTH-PIXELS attribute.
         */
        @Override
        public integer getWidthPixels()
+       {
           if (!canAccess("WIDTH-PIXELS"))
+          {
              return new integer(0);
+          }
           return super.getWidthPixels();
+       }
        /**
         * Getter for the MULTIPLE read-only attribute.
+        *
         * @return  value of MULTIPLE attribute
-...
+       }
        /**
         * Set SORT attribute.
+        *
         * @param    sort
         *           New value for the attribute.
         */
        public void setSort(logical sort)
+       {
           if (_isRealized())
+          {
              warningAlreadyRealized("SORT");
              return;
+          }
           setSort(sort.booleanValue());
+       }
        /**
         * Implements the IS-SELECTED() widget method.
+        *
         * @param  item
-...
        @Override
        public character getScreenValue()
+       {
           return frame.getScreenValue(this, true);
           if (!canAccess("SCREEN-VALUE"))
+          {
              return new character();
+          }
           return super.getScreenValue();
+       }
        /**

     ** 018 HC  20211102 Implemented i18n support.
     **     ME  20220208 Drop temporary 'wasRealized' flag.
     **     ME  20220216 Revert drop of 'wasRealized' flag.
     **     ME  20221006 Complete widget realization and remove temporary solution.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
        /** Flag to indicate whether the widget has been realized. **/
        public boolean realized = false;
        /** Flag to indicate whether the widget's has been realized.
        *  A temporary solution. Most likely should be revised
        *  after a proper realization of the realize() method,
        * */
        public boolean wasRealized = false;
        /** The HIDDEN attribute, which stops widgets from displaying. */
        public boolean hidden = false;
-...
           if (manualHightlight) booleanAttrs |= ATTR_MASK_MANUAL_HIGHLIGHT;
           if (selectable)       booleanAttrs |= ATTR_MASK_SELECTABLE;
           if (disableRedraw)    booleanAttrs |= ATTR_MASK_DIS_REDRAW;
           if (wasRealized)      booleanAttrs |= ATTR_MASK_WAS_REALIZED;
           out.writeInt(booleanAttrs);
     //      System.err.printf("WidgetConfig.writeExternal: %s; %s: %s, %s, %s, %s, %s, %s, %s, %s\n",
-...
           manualHightlight = (booleanAttrs & ATTR_MASK_MANUAL_HIGHLIGHT) == ATTR_MASK_MANUAL_HIGHLIGHT;
           selectable       = (booleanAttrs & ATTR_MASK_SELECTABLE) == ATTR_MASK_SELECTABLE;
           disableRedraw    = (booleanAttrs & ATTR_MASK_DIS_REDRAW) == ATTR_MASK_DIS_REDRAW;
           wasRealized      = (booleanAttrs & ATTR_MASK_WAS_REALIZED) == ATTR_MASK_WAS_REALIZED;
     //      System.err.printf("WidgetConfig.readExternal: %s; %s: %s, %s, %s, %s, %s, %s, %s, %s\n",
     //            this, id, frameId, popupMenuId, enabled, visible, realized, header, hidden, modified);
-...
           menuKey = config.menuKey;
           menuMouse = config.menuMouse;
           disableRedraw = config.disableRedraw;
           wasRealized = config.wasRealized;
+       }
        /**

     **                           init(Column|Row) is valid it should be used instead of 0.
     **     ME  20220208          Use 'isRealised' frame method instead of 'wasRealised' configuration.
     **     ME  20220216          Revert drop of 'wasRealized' flag.
     **     ME  20220610          Complete widget realization and remove temporary solution.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
           if (!frame.isRootFrame())
+          {
              if (!cfg.wasRealized)
              if (!frame.isRealized())
+             {
                 frame.setLocation(cfg.initColumn != BaseConfig.INV_COORD ? cfg.initColumn : 0,
                                   cfg.initRow != BaseConfig.INV_COORD ? cfg.initRow : 0);

     **                  flickering due to unexpected z-order of the overlay windows, focus lost and
     **                  subsequent key input issues, submenu overlay windows showing when they should
     **                  not.
     **     ME  20220610 Complete widget realization and remove temporary solution.
     */
     /*
-...
              if (visible && !config.realized)
+             {
                 config.realized = true;
                 config.wasRealized = true;
                 Frame container = parent(Frame.class);
                 if (container != null)
+                {
-...
+          }
           cfg.realized = false;
           cfg.wasRealized = false;
           cfg.visible = false;
           cfg.hidden = false;

Project

General

Profile

FWD » Core Development » User Interface