Skip to content

Commit 252b901

Browse files
committed
12.7 Release
1 parent 8e76c2c commit 252b901

37 files changed

+2471
-921
lines changed

adecomm/_about.p

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/****************************************************************************
2-
*Copyright (C) 2005,2010-2013,2014,2015,2017,2020,2021 by Progress Software *
3-
*Corporation. All rights reserved. Prior versions of this work may *
4-
*contain portions contributed by participants of Possenet. *
5-
*****************************************************************************/
1+
/*********************************************************************************
2+
*Copyright (C) 2005,2010-2013,2014,2015,2017,2020,2021,2023 by Progress Software *
3+
*Corporation. All rights reserved. Prior versions of this work may *
4+
*contain portions contributed by participants of Possenet. *
5+
**********************************************************************************/
66
/*
77
Procedure: adecomm/_about.p
88
Author: R. Ryan
@@ -226,8 +226,8 @@ DO WITH FRAME {&FRAME-NAME}:
226226

227227
IF NOT SESSION:WINDOW-SYSTEM BEGINS "TTY":u THEN
228228
AboutText2 = AboutText2 +
229-
"OpenEdge includes Infragistics Ultimate UI for Windows Forms 2021 Vol. 1. " +
230-
cCopyright + " 2021 Infragistics, Inc. " +
229+
"OpenEdge includes Infragistics Ultimate UI for Windows Forms 2022 Vol. 2. " +
230+
cCopyright + " 2023 Infragistics, Inc. " +
231231
"All rights reserved." +
232232
CHR(10) + CHR(10).
233233

adecomm/_auddat.p

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*************************************************************/
2-
/* Copyright (c) 1984-2006,2008-2010,2015-2016 by Progress Software Corporation */
2+
/* Copyright (c) 1984-2006,2008-2010,2015-2016,2023 by Progress Software Corporation */
33
/* */
44
/* All rights reserved. No part of this program or document */
55
/* may be reproduced in any form or by any means without */
@@ -50,6 +50,7 @@
5050
fernando Dec 23, 2008 Support for encryption events
5151
fernando Jun 18, 2009 Support for encryption events
5252
fernando 01/05/2010 Expanding transaction id format
53+
kberlia 02/07/2023 Corrected field name.
5354
------------------------------------------------------------------------*/
5455
DEFINE INPUT PARAMETER piReport AS INTEGER NO-UNDO.
5556
DEFINE INPUT PARAMETER pcFileName AS CHARACTER NO-UNDO.
@@ -652,9 +653,9 @@ PROCEDURE createDataSet:
652653
cTopFilter = (IF pcFilter EQ "All" THEN
653654
""
654655
ELSE
655-
" WHERE (DATE(_client-session._auth-date-time) >= " +
656+
" WHERE (DATE(_client-session._Authentication-date-time) >= " +
656657
ENTRY(1,pcFilter) +
657-
" AND DATE(_client-session._auth-date-time) <= " +
658+
" AND DATE(_client-session._Authentication-date-time) <= " +
658659
ENTRY(2,pcFilter) + ") ").
659660

660661
IF iTable > 1 THEN DO:

adedict/IDX/_newidx.p

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*********************************************************************
2-
* Copyright (C) 2008-2014,2020 by Progress Software Corporation. All *
2+
* Copyright (C) 2008-2014,2020,2022 by Progress Software Corporation. All *
33
* rights reserved. Prior versions of this work may contain portions *
44
* contributed by participants of Possenet. *
55
* *
@@ -47,6 +47,7 @@ History:
4747
fernando 10/03/07 Handle comma on the area name - OE00135682
4848
fernando 06/26/08 Removed encryption area from list
4949
Kberlia 10/29/20 Added Argument in _pro_area_list.p to support default area.
50+
tmasood 10/14/22 Removed reference of _isdata.i
5051
----------------------------------------------------------------------------*/
5152

5253

@@ -71,6 +72,7 @@ Define var curr_type as CHARACTER NO-UNDO.
7172
define variable lNoArea as logical no-undo.
7273
define variable LastArea as character no-undo.
7374
define variable lAreaOk as logical no-undo.
75+
define variable hTable as handle no-undo.
7476

7577
Define buffer x_File for dictdb._File.
7678

@@ -507,21 +509,17 @@ do:
507509
do:
508510
/* Before putting up this horrible message, check to see if
509511
there's data in the table. If there's no data the user
510-
shouldn't need to worry. _isdata.i won't compile unless
511-
table is committed and in that case, we know there's no data
512-
either. There's no way to suppress compile errors from showing
513-
up on the screen (e.g., NO-ERROR won't do it) so do output to
514-
file to redirect them so the user won't see anything.
512+
shouldn't need to worry.
515513
*/
516-
run adecomm/_tmpfile.p (INPUT "", INPUT ".dct", OUTPUT tmpfile).
517-
output to VALUE(tmpfile).
518-
do ON STOP UNDO, LEAVE:
519-
run adedict/_isdata.i (OUTPUT is_data) VALUE(s_CurrTbl).
514+
create buffer hTable for table s_CurrTbl no-error.
515+
assign is_data = false.
516+
if valid-handle(hTable) then do ON STOP UNDO, LEAVE:
517+
hTable:FIND-FIRST() no-error.
518+
if hTable:AVAILABLE then
519+
assign is_data = true. /* table is committed */
520520
end.
521-
output close.
522-
os-delete VALUE(tmpfile).
523-
if compiler:error then
524-
is_data = false. /* table isn't committed yet */
521+
/* don't need the dynamic buffer anymore */
522+
delete object hTable no-error.
525523
if is_data then
526524
do:
527525
answer = yes. /* set's yes as default button */

adeicon/u-logo.bmp

82 Bytes
Binary file not shown.

businesscomponents/Ccs/BusinessLogic/IGetDataTableRequest.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ INTERFACE Ccs.BusinessLogic.IGetDataTableRequest:
7373
field names require mapping etc.
7474
Query Strings must be provided in the following format
7575
CustNum = 42
76-
CustNum = 42 AND OrderStatus = Ordered
76+
CustNum = 42 AND OrderStatus = "Ordered"
7777
------------------------------------------------------------------------------*/
7878
DEFINE PUBLIC PROPERTY QueryString AS CHARACTER NO-UNDO
7979
GET.

businesscomponents/OpenEdge/BusinessLogic/BusinessEntity.cls

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**********************************************************************************************
2-
* Copyright (C) 2014-2019, 2021-2022 by Progress Software Corporation. All rights reserved. *
2+
* Copyright (C) 2014-2019, 2021-2023 by Progress Software Corporation. All rights reserved. *
33
* Prior versions of this work may contain portions contributed by participants of Possenet. *
44
***********************************************************************************************/
55
/*---------------------------------------------------------------------------------------------
@@ -561,16 +561,18 @@ CLASS OpenEdge.BusinessLogic.BusinessEntity ABSTRACT:
561561
DEFINE VAR hBeforeBuffer AS HANDLE NO-UNDO.
562562
DEFINE VAR lAvailable AS LOGICAL NO-UNDO.
563563
DEFINE VAR hBeforeQuery AS HANDLE EXTENT NO-UNDO.
564+
DEFINE VAR cMessage AS CHAR NO-UNDO.
564565
DEFINE VAR cErrMessage AS CHAR NO-UNDO.
565566
DEFINE VAR appError AS Progress.Lang.AppError NO-UNDO.
566567

567568
EXTENT(hBeforeQuery) = ProDataSet:NUM-BUFFERS.
568569

569-
cErrMessage = err:GetMessage(1).
570-
// Check to see if ReturnValue set
571-
IF (cErrMessage EQ ? OR LENGTH(cErrMessage) EQ 0) AND TYPE-OF(err, Progress.Lang.AppError) THEN DO:
570+
IF err:NumMessages > 0 THEN DO:
571+
cMessage = err:GetMessage(1).
572+
END.
573+
ELSE IF TYPE-OF(err, Progress.Lang.AppError) THEN DO:
572574
appError = CAST(err, Progress.Lang.AppError).
573-
cErrMessage = appError:ReturnValue.
575+
cMessage = appError:ReturnValue.
574576
END.
575577

576578
// If UpdateMode was never set, don't bother setting REJECTED attributes.
@@ -592,19 +594,24 @@ CLASS OpenEdge.BusinessLogic.BusinessEntity ABSTRACT:
592594
DO WHILE lAvailable:
593595
hBeforeBuffer:REJECTED = TRUE.
594596
IF hBeforeBuffer:ERROR EQ TRUE THEN DO:
595-
hBeforeBuffer:ERROR-STRING = GetRowErrorMessage(hBeforeBuffer, cErrMessage).
597+
hBeforeBuffer:ERROR-STRING = GetRowErrorMessage(hBeforeBuffer, cMessage).
596598
END.
597599
lAvailable = hBeforeQuery[iIndex]:GET-NEXT().
598600
END.
599601
END.
600602
END.
601603
END.
602604
ELSE DO:
603-
cErrMessage = "Unable to call SAVE-ROW-CHANGES(). " + cErrMessage.
605+
cErrMessage = SUBSTITUTE("Unable to call SAVE-ROW-CHANGES(). &1", cMessage).
604606
END.
605607

606608
IF UpdateMode EQ UpdateModeEnum:CUD_NOBI OR UpdateMode EQ UpdateModeEnum:UNDEFINED THEN DO:
607-
UNDO, THROW NEW Progress.Lang.AppError(cErrMessage, 0).
609+
IF cErrMessage > "" THEN
610+
UNDO, THROW NEW Progress.Lang.AppError(cErrMessage, 0).
611+
ELSE IF err:NumMessages > 0 THEN
612+
UNDO, THROW err.
613+
ELSE
614+
UNDO, THROW NEW Progress.Lang.AppError(cMessage, 0).
608615
END.
609616

610617
FINALLY:

corelib/Ccs/Common/ISessionManager.cls

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ INTERFACE Ccs.Common.ISessionManager INHERITS IManager:
3737

3838
/* Establish the server session runtime.
3939
40-
@param handle The handle to the Client Principal object representing the clients session identity
40+
@param handle The handle to the Client Principal object representing the client's session identity
4141
@throws Progress.Lang.SysError, Progress.Lang.AppError */
4242
METHOD PUBLIC VOID establishRequestEnvironment( INPUT phClientPrincipal AS HANDLE ).
4343

4444
/* Establish the server session runtime.
4545
46-
@param character A known string representing the clients session identity
46+
@param character A known string representing the client's session identity
4747
@throws Progress.Lang.SysError, Progress.Lang.AppError */
4848
METHOD PUBLIC VOID establishRequestEnvironment( INPUT pcSessionID AS CHARACTER ).
4949

50-
/* End the server session runtime and return it to a safe state.
50+
/* "End" the server session runtime and return it to a "safe" state.
5151
5252
@throws Progress.Lang.SysError, Progress.Lang.AppError */
5353
METHOD PUBLIC VOID endRequestEnvironment( ).

corelib/OpenEdge/Core/Assertion/assertequality.i

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
&if 1=0 &then
22
/************************************************
3-
Copyright (c) 2022 by Progress Software Corporation. All rights reserved.
3+
Copyright (c) 2022,2023 by Progress Software Corporation. All rights reserved.
44
*************************************************/
55
/** ------------------------------------------------------------------------
66
File : OpenEdge/Core/Assertion/assertequality.i
@@ -53,7 +53,23 @@ Copyright (c) 2022 by Progress Software Corporation. All rights reserved.
5353
5454
// If sizes are equals then compare contents by use of hashing
5555
if message-digest("SHA-256", a) ne message-digest("SHA-256", b) then
56-
return error new AssertionFailedError("Hashes of memptr values are not equal", 0).
56+
return error new AssertionFailedError("Hashes of memptr values are not equal":u, 0).
57+
&elseif "{&Datatype}" eq "raw" &then
58+
// Use a simpler error message as raw values cannot be output directly.
59+
if not (a eq b) then
60+
return error new AssertionFailedError("Raw values are not equal":u, 0).
61+
&elseif "{&Datatype}" eq "character" &then
62+
if not (a eq b) then do:
63+
if (length(a) + length(b)) ge 30000 then
64+
// Use a simpler error message to avoid errors from too-long substitutions.
65+
return error new AssertionFailedError("Character values are not equal":u, 0).
66+
else
67+
return error new AssertionFailedError(substitute(subMessage, a, b), 0).
68+
end.
69+
&elseif "{&Datatype}" eq "longchar" &then
70+
// Always use a simpler error message to avoid errors from too-long substitutions.
71+
if not (a eq b) then
72+
return error new AssertionFailedError("Longchar values are not equal":u, 0).
5773
&else
5874
if not (a eq b) then
5975
return error new AssertionFailedError(substitute(subMessage, a, b), 0).
@@ -75,7 +91,23 @@ Copyright (c) 2022 by Progress Software Corporation. All rights reserved.
7591
&elseif "{&Datatype}" eq "memptr" &then
7692
// If both size and contents (hashes) match then values are considered equal.
7793
if get-size(a) eq get-size(b) and message-digest("SHA-256", a) eq message-digest("SHA-256", b) then
78-
return error new AssertionFailedError(substitute(subMessage, "Hash of 'a'", "hash of 'b'"), 0).
94+
return error new AssertionFailedError(substitute(subMessage, "Hash of 'a'":u, "hash of 'b'":u), 0).
95+
&elseif "{&Datatype}" eq "raw" &then
96+
// Use a simpler error message as raw values cannot be output directly.
97+
if a eq b then
98+
return error new AssertionFailedError("Raw values are equal":u, 0).
99+
&elseif "{&Datatype}" eq "character" &then
100+
if a eq b then do:
101+
if (length(a) + length(b)) ge 30000 then
102+
// Use a simpler error message to avoid errors from too-long substitutions.
103+
return error new AssertionFailedError("Character values are equal":u, 0).
104+
else
105+
return error new AssertionFailedError(substitute(subMessage, a, b), 0).
106+
end.
107+
&elseif "{&Datatype}" eq "longchar" &then
108+
// Always use a simpler error message to avoid errors from too-long substitutions.
109+
if a eq b then
110+
return error new AssertionFailedError("Longchar values are equal":u, 0).
79111
&else
80112
if a eq b then
81113
return error new AssertionFailedError(substitute(subMessage, a, b), 0).

corelib/OpenEdge/Core/Assertion/assertnotunknownorempty.i

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ Copyright (c) 2022 by Progress Software Corporation. All rights reserved.
117117
end method. // NotUnknownOrEmpty
118118
119119
{&CommentShortArray}
120+
{&_proparse_ prolint-nowarn(varusage)}
120121
method public static void NotNullOrEmpty (input pArgument as {&DataType} extent):
121122
&if "{&Datatype}" eq "Object" &then
122123
NotUnknown(pArgument, "argument":u).
@@ -129,6 +130,7 @@ Copyright (c) 2022 by Progress Software Corporation. All rights reserved.
129130
end method. // NotNullOrEmpty
130131
131132
{&CommentLongArray}
133+
{&_proparse_ prolint-nowarn(varusage)}
132134
method public static void NotNullOrEmpty (input pArgument as {&DataType} extent, input pcName as char):
133135
&if "{&Datatype}" eq "Object" &then
134136
NotUnknown(pArgument, "argument":u).
@@ -152,6 +154,7 @@ Copyright (c) 2022 by Progress Software Corporation. All rights reserved.
152154
end method. // NotUnknownOrEmpty
153155
154156
{&CommentLongArray}
157+
{&_proparse_ prolint-nowarn(varusage)}
155158
method public static void NotUnknownOrEmpty (input pArgument as {&DataType} extent, input pcName as char):
156159
&if "{&Datatype}" eq "Object" &then
157160
NotUnknown(pArgument, "argument":u).

corelib/OpenEdge/Core/Collections/StringKeyedMap.cls

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,12 @@ class OpenEdge.Core.Collections.StringKeyedMap implements IStringKeyedMap:
114114
@return logical TRUE if a record exists with the given key; FALSE if there are no matching entries */
115115
method private logical FindMapRecord(input pKey as character, buffer pMap for StrKeyMap):
116116
release pMap.
117-
117+
118118
if can-find(pMap
119119
where pMap.ParentMap eq int64(this-object)
120120
and pMap.Key eq pKey )
121121
then
122+
{&_proparse_ prolint-nowarn(findnoerror)}
122123
find pMap
123124
where pMap.ParentMap eq int64(this-object)
124125
and pMap.Key eq pKey.
@@ -241,7 +242,7 @@ class OpenEdge.Core.Collections.StringKeyedMap implements IStringKeyedMap:
241242
end.
242243

243244
return true.
244-
end.
245+
end method.
245246

246247
/* Returns true if this map contains all of the values in a collection.
247248
@@ -268,7 +269,7 @@ class OpenEdge.Core.Collections.StringKeyedMap implements IStringKeyedMap:
268269
end.
269270

270271
return false.
271-
end.
272+
end method.
272273

273274
/* Returns true if this map maps one or more keys to the specified value.
274275
@@ -315,7 +316,7 @@ class OpenEdge.Core.Collections.StringKeyedMap implements IStringKeyedMap:
315316
method public Progress.Lang.Object Get(input pKey as Progress.Lang.Object):
316317
Assert:IsType(pKey, get-class(String)).
317318

318-
return Get(cast(pKey, String)).
319+
return get(cast(pKey, String)).
319320
end method.
320321

321322
/** Retrieves the value for a particular key

0 commit comments

Comments
 (0)