=== modified file 'src/com/goldencode/p2j/ui/ProgressBar.java' --- src/com/goldencode/p2j/ui/ProgressBar.java 2019-10-24 14:58:49 +0000 +++ src/com/goldencode/p2j/ui/ProgressBar.java 2019-12-06 14:15:04 +0000 @@ -137,17 +137,17 @@ public integer getBorderStyle(); /** - * Set border style for an object. + * Set the border style for an object. * BorderStyleConstants - ccFixedSingle=1 ccNone=0 * * @param value - * border style + * the border style */ @LegacyMethod(name = "PB-BORDER-STYLE") public void setBorderStyle(integer value); /** - * Set border style for an object. + * Set the border style for an object. * BorderStyleConstants - ccFixedSingle=1 ccNone=0 * * @param value @@ -194,45 +194,45 @@ public decimal getMin(); /** - * Set minimum value. + * Set the minimum value. * * @param value - * minimum value + * the minimum value */ @LegacyMethod(name = "PB-MIN") public void setMin(decimal value); /** - * Set minimum value. + * Set the minimum value. * * @param value - * minimum value + * the minimum value */ @LegacyMethod(name = "PB-MIN") public void setMin(double value); /** - * Return maximum value. + * Return the maximum value. * - * @return maximum value + * @return the maximum value */ @LegacyMethod(name = "PB-MAX") public decimal getMax(); /** - * Set maximum value. + * Set the maximum value. * * @param value - * maximum value + * the maximum value */ @LegacyMethod(name = "PB-MAX") public void setMax(decimal value); /** - * Set maximum value. + * Set the maximum value. * * @param value - * maximum value + * the maximum value */ @LegacyMethod(name = "PB-MAX") public void setMax(double value); @@ -246,25 +246,25 @@ public decimal getValue(); /** - * Set current value. + * Set the current value. * * @param value - * new value + * the new current value */ @LegacyMethod(name = "PB-VALUE") public void setValue(decimal value); /** - * Set current value. + * Set the current value. * * @param value - * new value + * the new current value */ @LegacyMethod(name = "PB-VALUE") public void setValue(double value); /** - * Refresh control. + * Refresh the control. */ @LegacyMethod(name = "PB-REFRESH") public void progBarRefresh(); === modified file 'src/com/goldencode/p2j/ui/ProgressBarWidget.java' --- src/com/goldencode/p2j/ui/ProgressBarWidget.java 2019-10-29 14:00:04 +0000 +++ src/com/goldencode/p2j/ui/ProgressBarWidget.java 2019-12-11 13:39:26 +0000 @@ -74,7 +74,7 @@ implements ProgressBar { /* PB-COM-DATA */ - comhandle comData = DataObject.newInstance(this); + private comhandle comData = DataObject.newInstance(this); /** * Default constructor. === modified file 'src/com/goldencode/p2j/ui/client/gui/ImageGuiImpl.java' --- src/com/goldencode/p2j/ui/client/gui/ImageGuiImpl.java 2019-05-16 19:42:54 +0000 +++ src/com/goldencode/p2j/ui/client/gui/ImageGuiImpl.java 2019-12-06 16:06:10 +0000 @@ -270,7 +270,7 @@ // are cached on the web-side gd.draw(origin, clip, () -> { - if (!drawImage() && !config.transparent) + if (!drawImage() && !config.transparent && colorResolver != null) { colorResolver.colors(); gd.setColor(colorResolver.bgColor); === modified file 'src/com/goldencode/p2j/ui/client/gui/theme/ClassicTheme.java' --- src/com/goldencode/p2j/ui/client/gui/theme/ClassicTheme.java 2019-11-19 14:11:39 +0000 +++ src/com/goldencode/p2j/ui/client/gui/theme/ClassicTheme.java 2019-12-11 14:48:02 +0000 @@ -7170,14 +7170,14 @@ /** * Draws progress bar {@code ProgressBarGui} widget. * - * @param slider + * @param pb * The {@code ProgressBarGui} widget. * @param gd * The {@code GuiDriver} used for drawing operations. + * @param gc + * The {@code GuiColorResolver} used color selection. * @param gf * The {@code GuiFontResolver} to be used. - * @param gc - * The {@code GuiColorResolver} used color selection. * @param x * The horizontal location (in pixel units) of the widget to be painted/component. * @param y @@ -7227,14 +7227,14 @@ /** * Draws progress bar {@code ProgressBarGui} widget bar. * - * @param slider + * @param pb * The {@code ProgressBarGui} widget. * @param gd * The {@code GuiDriver} used for drawing operations. + * @param gc + * The {@code GuiColorResolver} used color selection. * @param gf * The {@code GuiFontResolver} to be used. - * @param gc - * The {@code GuiColorResolver} used color selection. * @param x * The horizontal location (in pixel units) of the widget to be painted/component. * @param y @@ -7274,9 +7274,13 @@ { int w = Math.min(barSize, block); if (is3D) + { gd.fillRect(posX, y + 3, w, height - 6); + } else + { gd.fillRect(posX, y + 2, w, height - 4); + } barSize -= step; posX += step; } @@ -7302,9 +7306,13 @@ { int h = Math.min(barSize, block); if (is3D) + { gd.fillRect(x + 3, posY - h, width - 6, h); + } else + { gd.fillRect(x + 1, posY - h, width - 2, h); + } barSize -= step; posY -= step; } === modified file 'src/com/goldencode/p2j/ui/client/gui/theme/Theme.java' --- src/com/goldencode/p2j/ui/client/gui/theme/Theme.java 2019-10-11 07:29:39 +0000 +++ src/com/goldencode/p2j/ui/client/gui/theme/Theme.java 2019-12-11 14:42:04 +0000 @@ -2261,14 +2261,14 @@ /** * Draws progress bar {@code ProgressBarGui} widget. * - * @param slider + * @param pb * The {@code ProgressBarGui} widget. * @param gd * The {@code GuiDriver} used for drawing operations. + * @param gc + * The {@code GuiColorResolver} used color selection. * @param gf * The {@code GuiFontResolver} to be used. - * @param gc - * The {@code GuiColorResolver} used color selection. * @param x * The horizontal location (in pixel units) of the widget to be painted/component. * @param y @@ -2290,14 +2290,14 @@ /** * Draws progress bar {@code ProgressBarGui} widget bar. * - * @param slider + * @param pb * The {@code ProgressBarGui} widget. * @param gd * The {@code GuiDriver} used for drawing operations. + * @param gc + * The {@code GuiColorResolver} used color selection. * @param gf * The {@code GuiFontResolver} to be used. - * @param gc - * The {@code GuiColorResolver} used color selection. * @param x * The horizontal location (in pixel units) of the widget to be painted/component. * @param y === modified file 'src/com/goldencode/p2j/ui/ocx/DataObject.java' --- src/com/goldencode/p2j/ui/ocx/DataObject.java 2019-11-19 14:11:39 +0000 +++ src/com/goldencode/p2j/ui/ocx/DataObject.java 2019-12-06 13:48:59 +0000 @@ -112,6 +112,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "FILES") public comhandle files() { @@ -121,6 +122,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "CLEAR") public void clear() { @@ -130,6 +132,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "GETDATA") public memptr getData(integer format) { @@ -143,6 +146,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "GETDATA") public memptr getData(Integer format) { @@ -152,6 +156,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "SETDATA") public void setData(memptr value, integer format) { @@ -165,6 +170,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "SETDATA") public void setData(memptr value, Integer format) { @@ -174,6 +180,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "GETFORMAT") public logical getFormat(integer format) { @@ -186,6 +193,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "GETFORMAT") public logical getFormat(Integer format) { === modified file 'src/com/goldencode/p2j/ui/ocx/DataObjectFiles.java' --- src/com/goldencode/p2j/ui/ocx/DataObjectFiles.java 2019-11-19 14:11:39 +0000 +++ src/com/goldencode/p2j/ui/ocx/DataObjectFiles.java 2019-12-06 13:49:44 +0000 @@ -108,6 +108,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "CLEAR") public void clear() { @@ -117,6 +118,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "COUNT") public integer count() { @@ -126,6 +128,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "ITEM") public character item(integer index) { @@ -138,6 +141,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "ITEM") public character item(Integer index) { @@ -147,6 +151,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "ADD") public void add(character fileName) { @@ -159,6 +164,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "ADD") public void add(String fileName) { @@ -168,6 +174,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "ADD") public void add(character fileName, integer index) { @@ -180,6 +187,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "ADD") public void add(String fileName, integer index) { @@ -189,12 +197,14 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "ADD") public void add(character fileName, Integer index) { add(fileName, new integer(index)); } + @Override @ComMethod(name = "ADD") public void add(String fileName, Integer index) { @@ -204,6 +214,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "REMOVE") public void remove(integer index) { @@ -213,6 +224,7 @@ LogicalTerminal.getClient().removeDroppedFile(index.intValue()); } + @Override @ComMethod(name = "REMOVE") public void remove(Integer index) { === modified file 'src/com/goldencode/p2j/ui/ocx/ListImage.java' --- src/com/goldencode/p2j/ui/ocx/ListImage.java 2019-11-07 15:56:38 +0000 +++ src/com/goldencode/p2j/ui/ocx/ListImage.java 2019-12-06 13:50:03 +0000 @@ -105,6 +105,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "DRAW") public void draw(integer hDC, integer x, integer y, integer style) { @@ -114,6 +115,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "EXTRACTICON") public memptr extractIcon() { @@ -123,6 +125,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "INDEX") public integer getIndex() { @@ -132,6 +135,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "INDEX") public void setIndex(integer index) { @@ -141,6 +145,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "INDEX") public void setIndex(int index) { @@ -150,6 +155,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "KEY") public character getKey() { @@ -159,6 +165,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "KEY") public void setKey(character key) { @@ -168,6 +175,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "KEY") public void setKey(String key) { @@ -177,6 +185,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "PICTURE") public memptr getPicture() { @@ -186,6 +195,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "PICTURE") public void setPicture(memptr data) { @@ -195,6 +205,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "TAG") public BaseDataType getTag() { @@ -204,6 +215,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "TAG") public void setTag(BaseDataType tag) { === modified file 'src/com/goldencode/p2j/ui/ocx/ListImages.java' --- src/com/goldencode/p2j/ui/ocx/ListImages.java 2019-11-07 15:56:38 +0000 +++ src/com/goldencode/p2j/ui/ocx/ListImages.java 2019-12-06 13:49:54 +0000 @@ -105,6 +105,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "ADD") public comhandle add(integer index, character key, comhandle picture) { @@ -116,6 +117,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "ADD") public comhandle add(ComParameter index, ComParameter key, ComParameter picture) { @@ -125,6 +127,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "ITEM") public comhandle getItem(integer index) { @@ -134,6 +137,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "ITEM") public comhandle getItem(character key) { @@ -143,6 +147,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "ITEM") public comhandle getItem(int index) { @@ -152,6 +157,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "ITEM") public comhandle getItem(String key) { @@ -161,6 +167,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "CLEAR") public void clear() { @@ -170,6 +177,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "COUNT") public integer getCount() { @@ -179,6 +187,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "COUNT") public void setCount(integer count) { @@ -188,6 +197,7 @@ /** * {@inheritDoc} */ + @Override @ComProperty(name = "COUNT") public void setCount(int count) { @@ -197,6 +207,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "REMOVE") public void remove(integer index) { @@ -206,6 +217,7 @@ /** * {@inheritDoc} */ + @Override @ComMethod(name = "REMOVE") public void remove(int index) { === modified file 'src/com/goldencode/p2j/util/comhandle.java' --- src/com/goldencode/p2j/util/comhandle.java 2019-03-02 14:19:48 +0000 +++ src/com/goldencode/p2j/util/comhandle.java 2019-12-06 15:17:50 +0000 @@ -702,7 +702,7 @@ { // special case when ZERO_RESOURCE is passed in, convert it to local ZERO_RESOURCE WrappedResource res = ((handle) value).getResource(); - if (res != null && res.id() == 0) + if (res != null && res.id() == null) { _setValue(ZERO_RESOURCE); }