# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marian.edu@acorn.ro-20201217070436-zfj898zblrgkad95 # target_branch: https://proj.goldencode.com/downloads/skeletons/repo/ # testament_sha1: 7edfbcb014d1bf664de3908c4772d22cf11a894d # timestamp: 2020-12-17 09:04:43 +0200 # base_revision_id: ges@goldencode.com-20200729153510-gth8x5gz83h5csge # # Begin patch === modified file 'oo4gl/Ccs/Common/Support/IHandleHolder.cls' --- oo4gl/Ccs/Common/Support/IHandleHolder.cls 2019-05-07 15:57:06 +0000 +++ oo4gl/Ccs/Common/Support/IHandleHolder.cls 2020-12-17 07:04:36 +0000 @@ -1,4 +1,4 @@ interface Ccs.Common.Support.IHandleHolder inherits Ccs.Common.Support.IPrimitiveHolder: - define public property Value as handle get. set. + define public property Value as handle get. end. === modified file 'oo4gl/Ccs/Common/Support/IPrimitiveHolder.cls' --- oo4gl/Ccs/Common/Support/IPrimitiveHolder.cls 2018-11-20 18:35:49 +0000 +++ oo4gl/Ccs/Common/Support/IPrimitiveHolder.cls 2020-12-17 07:04:36 +0000 @@ -1,2 +1,3 @@ -interface Ccs.Common.Support.IPrimitiveHolder: -end. +interface Ccs.Common.Support.IPrimitiveHolder: + +end. === modified file 'oo4gl/OpenEdge/Core/Collections/ICollection.cls' --- oo4gl/OpenEdge/Core/Collections/ICollection.cls 2020-07-29 11:20:46 +0000 +++ oo4gl/OpenEdge/Core/Collections/ICollection.cls 2020-12-17 07:04:36 +0000 @@ -28,6 +28,4 @@ method public Progress.Lang.Object extent ToArray (). - method public OpenEdge.Core.Collections.IIterator Iterator (). - end. === modified file 'oo4gl/OpenEdge/Core/Collections/IList.cls' --- oo4gl/OpenEdge/Core/Collections/IList.cls 2020-07-29 11:20:46 +0000 +++ oo4gl/OpenEdge/Core/Collections/IList.cls 2020-12-17 07:04:36 +0000 @@ -2,9 +2,6 @@ inherits OpenEdge.Core.Collections.ICollection, OpenEdge.Core.Collections.IIterable: - define public property Size as integer no-undo - public get. - method public logical Add ( piIndex as integer, poElement as Progress.Lang.Object). method public logical AddAll ( piIndex as integer, poCollection as OpenEdge.Core.Collections.ICollection). @@ -27,30 +24,4 @@ method public OpenEdge.Core.Collections.IList SubList ( poFromPosition as integer, poToPosition as integer). - method public logical Add ( poElement as Progress.Lang.Object). - - method public logical AddAll ( poCollection as OpenEdge.Core.Collections.ICollection). - - method public logical AddArray ( poElements as Progress.Lang.Object extent ). - - method public void Clear (). - - method public logical Contains ( poElement as Progress.Lang.Object). - - method public logical ContainsAll ( poCollection as OpenEdge.Core.Collections.ICollection). - - method public logical IsEmpty (). - - method public logical Remove ( poElement as Progress.Lang.Object). - - method public logical RemoveAll ( poCollection as OpenEdge.Core.Collections.ICollection). - - method public logical RetainAll ( poCollection as OpenEdge.Core.Collections.ICollection). - - method public void ToTable ( output table-handle p1). - - method public Progress.Lang.Object extent ToArray (). - - method public OpenEdge.Core.Collections.IIterator Iterator (). - end. === modified file 'oo4gl/OpenEdge/Core/Collections/IListIterator.cls' --- oo4gl/OpenEdge/Core/Collections/IListIterator.cls 2020-07-29 11:20:46 +0000 +++ oo4gl/OpenEdge/Core/Collections/IListIterator.cls 2020-12-17 07:04:36 +0000 @@ -9,10 +9,4 @@ method public integer PreviousIndex (). - method public logical HasNext (). - - method public Progress.Lang.Object Next (). - - method public logical Remove (). - end. === modified file 'oo4gl/OpenEdge/Logging/LogMessage.cls' --- oo4gl/OpenEdge/Logging/LogMessage.cls 2018-11-20 18:35:49 +0000 +++ oo4gl/OpenEdge/Logging/LogMessage.cls 2020-12-17 07:04:36 +0000 @@ -1,5 +1,4 @@ class OpenEdge.Logging.LogMessage: - define public property Arguments as character get. define public property BaseText as character get. @@ -39,4 +38,10 @@ constructor public LogMessage(p1 as character, p2 as character, p3 as character extent): end. + + method public void AddContext ( pKey as character, pContext as Progress.Lang.Object): + end. + + method public Progress.Lang.Object GetContext ( pKey as character): + end. end. === modified file 'oo4gl/OpenEdge/Logging/Logger.cls' --- oo4gl/OpenEdge/Logging/Logger.cls 2020-06-05 10:23:14 +0000 +++ oo4gl/OpenEdge/Logging/Logger.cls 2020-12-17 07:04:36 +0000 @@ -87,6 +87,9 @@ constructor public Logger(input p1 as character, input p2 as OpenEdge.Logging.LogLevelEnum, input p3 as OpenEdge.Logging.Filter.LoggerFilterList): end. + constructor public Logger ( pcName as character, poLevel as OpenEdge.Logging.LogLevelEnum, poLogFilters as OpenEdge.Logging.Filter.ILoggerFilter extent ): + end. + method public void Trace(input p1 as character): end. === modified file 'oo4gl/OpenEdge/Logging/VoidLogger.cls' --- oo4gl/OpenEdge/Logging/VoidLogger.cls 2020-04-15 21:32:23 +0000 +++ oo4gl/OpenEdge/Logging/VoidLogger.cls 2020-12-17 07:04:36 +0000 @@ -115,4 +115,6 @@ method public void Warn(p1 as OpenEdge.Logging.LogMessage, p2 as Progress.Lang.Error): end. + method public override logical Equals ( poRef as Progress.Lang.Object): + end. end. === modified file 'oo4gl/Progress/IO/InputStream.cls' --- oo4gl/Progress/IO/InputStream.cls 2020-07-29 11:20:46 +0000 +++ oo4gl/Progress/IO/InputStream.cls 2020-12-17 07:04:36 +0000 @@ -1,6 +1,6 @@ class Progress.IO.InputStream abstract: - define public property Close as logical get. + define public property Closed as logical get. method public void Close(): end. @@ -8,6 +8,9 @@ method public int64 Read( input target as memptr ): end. + method public int64 Read( input target as handle ): + end. + method public abstract int64 Read( input target as memptr, input offset as int64, input length as int64 ). method public abstract int64 Read( input delimiter as character, output target as character ). === modified file 'oo4gl/Progress/IO/OutputStream.cls' --- oo4gl/Progress/IO/OutputStream.cls 2019-03-22 16:23:40 +0000 +++ oo4gl/Progress/IO/OutputStream.cls 2020-12-17 07:04:36 +0000 @@ -12,6 +12,9 @@ method public int64 Write(source-data AS MEMPTR): end. + + method public int64 Write(source-data AS handle): + end. method public void Flush(): end. # Begin bundle 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 QJpo+SA=