6410a.patch
new/rules/include/common-progress.rules 2023-05-03 14:35:40 +0000 | ||
---|---|---|
493 | 493 |
** not produce a buffer reference. |
494 | 494 |
** 240 HC 20230223 Implemented POST-MESSAGE and OPEN-HTML-STRING methods for HTML- |
495 | 495 |
** BROWSER widget. |
496 |
** ME 20230503 Support 'poly' method return type (mapped to Object). |
|
496 | 497 |
*/ |
497 | 498 |
--> |
498 | 499 |
|
... | ... | |
6710 | 6711 |
<rule>ttype == prog.oo_meth_void |
6711 | 6712 |
<action>cls = "void"</action> |
6712 | 6713 |
</rule> |
6714 |
<rule>ttype == prog.oo_meth_poly |
|
6715 |
<action>cls = "Object"</action> |
|
6716 |
</rule> |
|
6713 | 6717 |
<rule>cls == "" |
6714 | 6718 |
<action> |
6715 | 6719 |
errmsg = sprintf("Unrecognized return type %s", |
new/src/com/goldencode/p2j/oo/core/LegacyString.java 2023-05-03 14:12:04 +0000 | ||
---|---|---|
19 | 19 |
** ME 20220402 Use internal's longchar hashCode instead of that of the actual string (case sensitive, trim). |
20 | 20 |
** CA 20220923 Variable definitions (including associated with parameters) must be done always outside of |
21 | 21 |
** the BlockManager API |
22 |
** ME 20230503 Fix setter annotation for encoding, join method name update as per conversion (#6410). |
|
22 | 23 |
*/ |
23 | 24 | |
24 | 25 |
/* |
... | ... | |
137 | 138 |
})); |
138 | 139 |
} |
139 | 140 | |
140 |
@LegacySignature(type = Type.SETTER, name = "Logger", parameters = {
|
|
141 |
@LegacySignature(type = Type.SETTER, name = "Encoding", parameters = {
|
|
141 | 142 |
@LegacyParameter(name = "pcEncoding", type = "CHARACTER", mode = "INPUT") }) |
142 | 143 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL | RT_LVL_FULL) |
143 | 144 |
@Override |
... | ... | |
482 | 483 |
@LegacyParameter(name = "p1", type = "OBJECT", extent = -1, qualified = "openedge.core.string", mode = "INPUT"), |
483 | 484 |
@LegacyParameter(name = "p2", type = "CHARACTER", mode = "INPUT") }) |
484 | 485 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL | RT_LVL_STUB) |
485 |
public static object<? extends com.goldencode.p2j.oo.core.LegacyString> join_1(
|
|
486 |
public static object<? extends com.goldencode.p2j.oo.core.LegacyString> join( |
|
486 | 487 |
final object<? extends com.goldencode.p2j.oo.core.LegacyString>[] _p1, |
487 | 488 |
final character _p2) |
488 | 489 |
{ |
new/src/com/goldencode/p2j/oo/core/system/ApplicationError.java 2023-05-03 14:08:50 +0000 | ||
---|---|---|
16 | 16 |
** RFB 20221223 Minor javadoc repair |
17 | 17 |
** CA 20220513 Renamed _BaseObject_.clone() to legacyClone(), as it can be overriden by sub-classes and |
18 | 18 |
** the access mode may collide with the Java's Object.clone(). |
19 |
** ME 20230503 Use the getter for security (made private #6410). |
|
19 | 20 |
*/ |
20 | 21 | |
21 | 22 |
/* |
... | ... | |
245 | 246 |
return function(ApplicationError.class, this, "Clone", object.class, new Block((Body) () -> |
246 | 247 |
{ |
247 | 248 |
err.assign(ObjectOps.newInstance(getClass(), "I", innerError)); |
248 |
err.ref().setSeverity(severity);
|
|
249 |
err.ref().setSeverity(getSeverity());
|
|
249 | 250 |
err.ref().setReturnValue(getReturnValue()); |
250 | 251 |
|
251 | 252 |
for (int i = 0; i < getNumMessages().intValue(); i++) |
new/src/com/goldencode/p2j/oo/core/system/ArgumentError.java 2023-05-02 10:43:41 +0000 | ||
---|---|---|
6 | 6 |
** |
7 | 7 |
** -#- -I- --Date-- ---------------------------------------Description---------------------------------------- |
8 | 8 |
** 001 CA 20230430 First version. |
9 |
** ME 20230502 Fix ctors as per 4GL skeleton. |
|
9 | 10 |
*/ |
10 | 11 | |
11 | 12 |
/* |
... | ... | |
87 | 88 |
})); |
88 | 89 |
} |
89 | 90 | |
90 |
@LegacySignature(type = Type.CONSTRUCTOR) |
|
91 |
@LegacySignature(type = Type.CONSTRUCTOR, parameters = |
|
92 |
{ |
|
93 |
@LegacyParameter(name = "pcArgs1", type = "CHARACTER", mode = "INPUT"), |
|
94 |
@LegacyParameter(name = "pcArgs2", type = "CHARACTER", mode = "INPUT") |
|
95 |
}) |
|
91 | 96 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL | RT_LVL_FULL) |
92 |
public void __core_system_ArgumentError_constructor__()
|
|
97 |
public void __convert_openedge_core_system_argumentError_constructor__(final character _pcArgs1, final character _pcArgs2)
|
|
93 | 98 |
{ |
94 |
internalProcedure(ApplicationError.class, this, "__core_system_ArgumentError_constructor__", |
|
95 |
new Block((Body) () -> |
|
99 |
character pcArgs1 = TypeFactory.initInput(_pcArgs1); |
|
100 |
character pcArgs2 = TypeFactory.initInput(_pcArgs2); |
|
101 |
|
|
102 |
internalProcedure(ArgumentError.class, this, "__convert_openedge_core_system_argumentError_constructor__", new Block((Body) () -> |
|
96 | 103 |
{ |
97 | 104 |
__core_system_ApplicationError_constructor__(); |
105 |
addMessage(pcArgs1, new integer(1)); |
|
106 |
addMessage(pcArgs2, new integer(2)); |
|
98 | 107 |
})); |
99 | 108 |
} |
100 | 109 | |
101 |
@LegacySignature(type = Type.CONSTRUCTOR, parameters = { |
|
102 |
@LegacyParameter(name = "p1", type = "OBJECT", qualified = "progress.lang.error", mode = "INPUT") }) |
|
110 |
@LegacySignature(type = Type.CONSTRUCTOR, parameters = |
|
111 |
{ |
|
112 |
@LegacyParameter(name = "poInnerError", type = "OBJECT", qualified = "progress.lang.error", mode = "INPUT"), |
|
113 |
@LegacyParameter(name = "pcArgs1", type = "CHARACTER", mode = "INPUT"), |
|
114 |
@LegacyParameter(name = "pcArgs2", type = "CHARACTER", mode = "INPUT") |
|
115 |
}) |
|
103 | 116 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL | RT_LVL_FULL) |
104 |
public void __core_system_ArgumentError_constructor__( |
|
105 |
final object<? extends com.goldencode.p2j.oo.lang.LegacyError> _p1) |
|
117 |
public void __convert_openedge_core_system_argumentError_constructor__(final object<? extends com.goldencode.p2j.oo.lang.LegacyError> _poInnerError, final character _pcArgs1, final character _pcArgs2) |
|
106 | 118 |
{ |
107 |
object<? extends com.goldencode.p2j.oo.lang.LegacyError> p1 = TypeFactory.initInput(_p1); |
|
108 |
internalProcedure(ApplicationError.class, this, "__core_system_ArgumentError_constructor__", |
|
109 |
new Block((Body) () -> |
|
119 |
object<? extends com.goldencode.p2j.oo.lang.LegacyError> poInnerError = TypeFactory.initInput(_poInnerError); |
|
120 |
character pcArgs1 = TypeFactory.initInput(_pcArgs1); |
|
121 |
character pcArgs2 = TypeFactory.initInput(_pcArgs2); |
|
122 |
|
|
123 |
internalProcedure(ArgumentError.class, this, "__convert_openedge_core_system_argumentError_constructor__", new Block((Body) () -> |
|
110 | 124 |
{ |
111 |
__core_system_ApplicationError_constructor__(p1); |
|
125 |
__core_system_ApplicationError_constructor__(poInnerError); |
|
126 |
addMessage(pcArgs1, new integer(1)); |
|
127 |
addMessage(pcArgs2, new integer(2)); |
|
112 | 128 |
})); |
113 | 129 |
} |
114 | 130 |
} |
new/src/com/goldencode/p2j/oo/json/objectmodel/JsonArray.java 2023-05-03 14:15:45 +0000 | ||
---|---|---|
26 | 26 |
** SVL 20230108 Improved performance by replacing some "for-each" loops with indexed "for" loops. |
27 | 27 |
** CA 20230116 Avoid using handle.unwrap, handle.getReference or other BDT usage from within FWD runtime. |
28 | 28 |
** 010 CA 20230215 Sanitized the LegacySignature parameters, so their type match their Java method definition. |
29 |
** ME 20230503 Reconvert skeleton and update ctor/method signatures (#6410). |
|
29 | 30 |
*/ |
30 | 31 | |
31 | 32 |
/* |
... | ... | |
430 | 431 |
})); |
431 | 432 |
} |
432 | 433 |
|
433 |
/** |
|
434 |
TODO: overloaded c'tors! |
|
435 | 434 |
@LegacySignature(type = Type.CONSTRUCTOR, parameters = |
436 | 435 |
{ |
437 | 436 |
@LegacyParameter(name = "val", type = "OBJECT", extent = -1, qualified = "progress.json.objectmodel.jsonarray", mode = "INPUT") |
438 | 437 |
}) |
439 |
public void __json_objectmodel_JsonArray_constructor__(final object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonArray>[] _val) |
|
438 |
public void __json_objectmodel_JsonArray_1_constructor__(final object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonArray>[] _val)
|
|
440 | 439 |
{ |
441 | 440 |
object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonArray>[] val = TypeFactory.initInput(_val); |
442 | 441 |
|
443 |
internalProcedure(this, "__json_objectmodel_JsonArray_constructor__", new Block((Body) () -> |
|
442 |
internalProcedure(this, "__json_objectmodel_JsonArray_1_constructor__", new Block((Body) () ->
|
|
444 | 443 |
{ |
445 | 444 |
__json_objectmodel_JsonConstruct_constructor__(); |
446 | 445 |
addElementsCtorImpl(val); |
447 | 446 |
})); |
448 | 447 |
} |
449 |
*/ |
|
450 | 448 | |
451 | 449 |
/** |
452 | 450 |
* Destructor for this class. Cleanup/delete any created resources. |
... | ... | |
485 | 483 | |
486 | 484 |
@LegacySignature(type = Type.SETTER, name = "Length", parameters = |
487 | 485 |
{ |
488 |
@LegacyParameter(name = "var", type = "INT64", mode = "INPUT")
|
|
486 |
@LegacyParameter(name = "var", type = "INTEGER", mode = "INPUT")
|
|
489 | 487 |
}) |
490 | 488 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
491 |
public void setLength(final int64 _var)
|
|
489 |
public void setLength(final integer _var)
|
|
492 | 490 |
{ |
493 |
int64 var = TypeFactory.initInput(_var);
|
|
491 |
integer var = TypeFactory.initInput(_var);
|
|
494 | 492 |
|
495 | 493 |
internalProcedure(this, "Length", new Block((Body) () -> |
496 | 494 |
{ |
... | ... | |
750 | 748 | |
751 | 749 |
@LegacySignature(returns = "INTEGER", type = Type.METHOD, name = "Add", parameters = |
752 | 750 |
{ |
753 |
@LegacyParameter(name = "val", type = "CLOB", mode = "INPUT") |
|
754 |
}) |
|
755 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
|
756 |
public integer add(clob _val) |
|
757 |
{ |
|
758 |
clob val = TypeFactory.initInput(_val); |
|
759 |
|
|
760 |
return function(this, "Add", integer.class, new Block((Body) () -> addElementImpl(val))); |
|
761 |
} |
|
762 | ||
763 |
@LegacySignature(returns = "INTEGER", type = Type.METHOD, name = "Add", parameters = |
|
764 |
{ |
|
765 | 751 |
@LegacyParameter(name = "val", type = "BLOB", mode = "INPUT") |
766 | 752 |
}) |
767 | 753 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
... | ... | |
777 | 763 |
@LegacyParameter(name = "val", type = "OBJECT", qualified = "progress.json.objectmodel.jsonarray", mode = "INPUT") |
778 | 764 |
}) |
779 | 765 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
780 |
public integer add_1(final object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonArray> _val)
|
|
766 |
public integer add(final object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonArray> _val) |
|
781 | 767 |
{ |
782 | 768 |
object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonArray> val = TypeFactory.initInput(_val); |
783 | 769 |
|
... | ... | |
792 | 778 |
@LegacyParameter(name = "val", type = "OBJECT", qualified = "progress.json.objectmodel.jsonobject", mode = "INPUT") |
793 | 779 |
}) |
794 | 780 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
795 |
public integer add_2(final object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonObject> _val)
|
|
781 |
public integer add_1(final object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonObject> _val)
|
|
796 | 782 |
{ |
797 | 783 |
object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonObject> val = TypeFactory.initInput(_val); |
798 | 784 |
|
... | ... | |
1032 | 1018 |
@LegacyParameter(name = "val", type = "OBJECT", extent = -1, qualified = "progress.json.objectmodel.jsonarray", mode = "INPUT") |
1033 | 1019 |
}) |
1034 | 1020 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
1035 |
public integer add_3(final object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonArray>[] _val)
|
|
1021 |
public integer add(final object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonArray>[] _val) |
|
1036 | 1022 |
{ |
1037 | 1023 |
object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonArray>[] val = TypeFactory.initInput(_val); |
1038 | 1024 |
|
... | ... | |
1047 | 1033 |
@LegacyParameter(name = "val", type = "OBJECT", extent = -1, qualified = "progress.json.objectmodel.jsonobject", mode = "INPUT") |
1048 | 1034 |
}) |
1049 | 1035 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
1050 |
public integer add_4(final object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonObject>[] _val)
|
|
1036 |
public integer add_1(final object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonObject>[] _val)
|
|
1051 | 1037 |
{ |
1052 | 1038 |
object<? extends com.goldencode.p2j.oo.json.objectmodel.JsonObject>[] val = TypeFactory.initInput(_val); |
1053 | 1039 |
|
... | ... | |
1107 | 1093 |
addElementImpl(idx, val); |
1108 | 1094 |
})); |
1109 | 1095 |
} |
1096 |
|
|
1097 |
@LegacySignature(returns = "INTEGER", type = Type.METHOD, name = "Add", parameters = |
|
1098 |
{ |
|
1099 |
@LegacyParameter(name = "idx", type = "INTEGER", mode = "INPUT"), |
|
1100 |
@LegacyParameter(name = "val", type = "COMHANDLE", mode = "INPUT", extent = -1) |
|
1101 |
}) |
|
1102 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
|
1103 |
public integer add(final integer _idx, final comhandle[] _val) |
|
1104 |
{ |
|
1105 |
integer idx = TypeFactory.initInput(_idx); |
|
1106 |
comhandle[] val = TypeFactory.initInput(_val); |
|
1107 |
|
|
1108 |
return function(this, "Add", integer.class, new Block((Body) () -> |
|
1109 |
{ |
|
1110 |
addElementsImpl(idx, val); |
|
1111 |
})); |
|
1112 |
} |
|
1110 | 1113 | |
1111 | 1114 |
@LegacySignature(returns = "INTEGER", type = Type.METHOD, name = "Add", parameters = |
1112 | 1115 |
{ |
new/src/com/goldencode/p2j/oo/lang/LegacyClass.java 2023-05-03 14:19:47 +0000 | ||
---|---|---|
30 | 30 |
** parameter. |
31 | 31 |
** CA 20220526 Added default legacy constructor method. |
32 | 32 |
** CA 20220828 Implemented 'getInterfaces()' method. |
33 |
** ME 20230503 Reconvert skeleton and update method signatures, invoke returns Object (extent) (#6410). |
|
33 | 34 |
*/ |
34 | 35 | |
35 | 36 |
/* |
... | ... | |
183 | 184 |
* @param propName |
184 | 185 |
* The property name. |
185 | 186 |
* @param idx |
186 |
* The index. |
|
187 |
* The index (any-value only for .NET indexed objects).
|
|
187 | 188 |
* |
188 | 189 |
* @return See above. |
189 | 190 |
*/ |
190 | 191 |
@LegacySignature(type = Type.METHOD, name = "GetPropertyValue", returns = "BDT", parameters = |
191 | 192 |
{ |
192 | 193 |
@LegacyParameter(name = "propName", type = "CHARACTER", mode = "INPUT"), |
193 |
@LegacyParameter(name = "idx", type = "BDT", mode = "INPUT")
|
|
194 |
@LegacyParameter(name = "idx", type = "INTEGER", mode = "INPUT")
|
|
194 | 195 |
}) |
195 | 196 |
@LegacyResourceSupport(supportLvl = CVT_LVL_PARTIAL|RT_LVL_STUB) |
196 |
public Object getPropertyValue(character propName, Object idx)
|
|
197 |
public Object getPropertyValue(character propName, integer idx)
|
|
197 | 198 |
{ |
198 | 199 |
// TODO: |
199 | 200 |
return new unknown(); |
... | ... | |
230 | 231 |
* @param propName |
231 | 232 |
* The property name. |
232 | 233 |
* @param idx |
233 |
* The index. |
|
234 |
* The index (any-value only for .NET indexed objects).
|
|
234 | 235 |
* |
235 | 236 |
* @return See above. |
236 | 237 |
*/ |
... | ... | |
238 | 239 |
{ |
239 | 240 |
@LegacyParameter(name = "instance", type = "OBJECT", qualified = "Progress.Lang.Object", mode = "INPUT"), |
240 | 241 |
@LegacyParameter(name = "propName", type = "CHARACTER", mode = "INPUT"), |
241 |
@LegacyParameter(name = "idx", type = "BDT", mode = "INPUT")
|
|
242 |
@LegacyParameter(name = "idx", type = "INTEGER", mode = "INPUT")
|
|
242 | 243 |
}) |
243 | 244 |
@LegacyResourceSupport(supportLvl = CVT_LVL_PARTIAL|RT_LVL_STUB) |
244 | 245 |
public Object getPropertyValue(object<? extends _BaseObject_> instance, |
245 | 246 |
character propName, |
246 |
Object idx)
|
|
247 |
integer idx)
|
|
247 | 248 |
{ |
248 | 249 |
// TODO: |
249 | 250 |
return new unknown(); |
... | ... | |
370 | 371 |
* When called for a class that is not a subclass of {@code LegacyEnum} or {@code FlagsEnum}. |
371 | 372 |
*/ |
372 | 373 |
@LegacySignature(returns = "CHARACTER", type = Type.METHOD, name = "GetEnumValues") |
373 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB)
|
|
374 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
|
|
374 | 375 |
public character getEnumValues() |
375 | 376 |
{ |
376 | 377 |
if (!isValidEnum()) |
... | ... | |
400 | 401 |
{ |
401 | 402 |
@LegacyParameter(name = "name", type = "CHARACTER", mode = "INPUT") |
402 | 403 |
}) |
403 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB)
|
|
404 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
|
|
404 | 405 |
public int64 getEnumValue(character name) |
405 | 406 |
{ |
406 | 407 |
if (!isValidEnum()) |
... | ... | |
430 | 431 |
{ |
431 | 432 |
@LegacyParameter(name = "name", type = "CHARACTER", mode = "INPUT") |
432 | 433 |
}) |
433 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB)
|
|
434 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
|
|
434 | 435 |
public int64 getEnumValue(String name) |
435 | 436 |
{ |
436 | 437 |
return getEnumValue(new character(name)); |
... | ... | |
458 | 459 |
{ |
459 | 460 |
@LegacyParameter(name = "value", type = "INT64", mode = "INPUT") |
460 | 461 |
}) |
461 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB)
|
|
462 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
|
|
462 | 463 |
public character getEnumName(int64 value) |
463 | 464 |
{ |
464 | 465 |
if (!isValidEnum()) |
... | ... | |
489 | 490 |
*/ |
490 | 491 |
@LegacySignature(returns = "CHARACTER", type = Type.METHOD, name = "GetEnumName", parameters = |
491 | 492 |
{ |
492 |
@LegacyParameter(name = "value", type = "INTEGER", mode = "INPUT")
|
|
493 |
@LegacyParameter(name = "value", type = "INT64", mode = "INPUT")
|
|
493 | 494 |
}) |
494 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB)
|
|
495 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
|
|
495 | 496 |
public character getEnumName(long value) |
496 | 497 |
{ |
497 | 498 |
return getEnumName(new int64(value)); |
... | ... | |
770 | 771 |
@LegacyParameter(name = "method", type = "CHARACTER", mode = "INPUT") |
771 | 772 |
}) |
772 | 773 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
773 |
public BaseDataType invoke(character method)
|
|
774 |
public Object invoke(character method)
|
|
774 | 775 |
{ |
775 | 776 |
return ObjectOps.invoke(typeName, method); |
776 | 777 |
} |
... | ... | |
843 | 844 |
@LegacyParameter(name = "parms", type = "OBJECT", mode = "INPUT", qualified = "Progress.Lang.ParameterList") |
844 | 845 |
}) |
845 | 846 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_BASIC) |
846 |
public BaseDataType invoke(character method, object<? extends ParameterList> parms)
|
|
847 |
public Object invoke(character method, object<? extends ParameterList> parms)
|
|
847 | 848 |
{ |
848 | 849 |
ParameterList opl = parms.ref(); |
849 | 850 |
// TODO: validate params? |
850 | 851 |
String modes = opl.getModes(); |
851 | 852 |
Object[] args = opl.getArgs(); |
852 | 853 |
|
853 |
BaseDataType[] retVal = new BaseDataType[1];
|
|
854 |
Object[] retVal = new Object[1];
|
|
854 | 855 |
Runnable task = () -> retVal[0] = ObjectOps.invoke(typeName, method, modes, args); |
855 | 856 |
|
856 | 857 |
invokeImpl(opl, modes, args, task); |
... | ... | |
874 | 875 |
@LegacyParameter(name = "method", type = "CHARACTER", mode = "INPUT"), |
875 | 876 |
}) |
876 | 877 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
877 |
public BaseDataType invoke(object<? extends _BaseObject_> ref, character method)
|
|
878 |
public Object invoke(object<? extends _BaseObject_> ref, character method)
|
|
878 | 879 |
{ |
879 | 880 |
return ObjectOps.invoke(ref, method); |
880 | 881 |
} |
... | ... | |
898 | 899 |
@LegacyParameter(name = "parms", type = "OBJECT" , mode = "INPUT", qualified = "Progress.Lang.ParameterList") |
899 | 900 |
}) |
900 | 901 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_BASIC) |
901 |
public BaseDataType invoke(object<? extends _BaseObject_> ref,
|
|
902 |
public Object invoke(object<? extends _BaseObject_> ref,
|
|
902 | 903 |
character method, |
903 | 904 |
object<? extends ParameterList> parms) |
904 | 905 |
{ |
... | ... | |
907 | 908 |
String modes = opl.getModes(); |
908 | 909 |
Object[] args = opl.getArgs(); |
909 | 910 |
|
910 |
BaseDataType[] retVal = new BaseDataType[1];
|
|
911 |
Object[] retVal = new Object[1];
|
|
911 | 912 |
Runnable task = () -> retVal[0] = ObjectOps.invoke(ref, method, modes, args); |
912 | 913 |
|
913 | 914 |
invokeImpl(opl, modes, args, task); |
... | ... | |
1088 | 1089 |
{ |
1089 | 1090 |
@LegacyParameter(name = "parms", type = "OBJECT", qualified = "progress.lang.parameterlist", mode = "INPUT") |
1090 | 1091 |
}) |
1092 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1091 | 1093 |
public object<? extends LegacyConstructor> getConstructor(final object<? extends com.goldencode.p2j.oo.lang.ParameterList> _parms) |
1092 | 1094 |
{ |
1093 | 1095 |
object<? extends com.goldencode.p2j.oo.lang.ParameterList> parms = TypeFactory.initInput(_parms); |
... | ... | |
1100 | 1102 |
@LegacyParameter(name = "flags", type = "OBJECT", qualified = "progress.reflect.flags", mode = "INPUT"), |
1101 | 1103 |
@LegacyParameter(name = "parms", type = "OBJECT", qualified = "progress.lang.parameterlist", mode = "INPUT") |
1102 | 1104 |
}) |
1105 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1103 | 1106 |
public object<? extends LegacyConstructor> getConstructor(final object<? extends com.goldencode.p2j.oo.reflect.Flags> _flags, final object<? extends com.goldencode.p2j.oo.lang.ParameterList> _parms) |
1104 | 1107 |
{ |
1105 | 1108 |
object<? extends com.goldencode.p2j.oo.reflect.Flags> flags = TypeFactory.initInput(_flags); |
... | ... | |
1109 | 1112 |
} |
1110 | 1113 | |
1111 | 1114 |
@LegacySignature(returns = "OBJECT", type = Type.METHOD, name = "GetConstructors", extent = -1, qualified = "progress.reflect.constructor") |
1115 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1112 | 1116 |
public object<? extends LegacyConstructor>[] getConstructors() |
1113 | 1117 |
{ |
1114 | 1118 |
return extentFunction(LegacyClass.class, this, "GetConstructors", object.class, new Block()); |
... | ... | |
1118 | 1122 |
{ |
1119 | 1123 |
@LegacyParameter(name = "flags", type = "OBJECT", qualified = "progress.reflect.flags", mode = "INPUT") |
1120 | 1124 |
}) |
1125 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1121 | 1126 |
public object<? extends LegacyConstructor>[] getConstructors(final object<? extends com.goldencode.p2j.oo.reflect.Flags> _flags) |
1122 | 1127 |
{ |
1123 | 1128 |
object<? extends com.goldencode.p2j.oo.reflect.Flags> flags = TypeFactory.initInput(_flags); |
... | ... | |
1129 | 1134 |
{ |
1130 | 1135 |
@LegacyParameter(name = "name", type = "CHARACTER", mode = "INPUT") |
1131 | 1136 |
}) |
1137 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1132 | 1138 |
public object<? extends com.goldencode.p2j.oo.reflect.Event> getEvent(final character _name) |
1133 | 1139 |
{ |
1134 | 1140 |
character name = TypeFactory.initInput(_name); |
... | ... | |
1141 | 1147 |
@LegacyParameter(name = "name", type = "CHARACTER", mode = "INPUT"), |
1142 | 1148 |
@LegacyParameter(name = "flags", type = "OBJECT", qualified = "progress.reflect.flags", mode = "INPUT") |
1143 | 1149 |
}) |
1150 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1144 | 1151 |
public object<? extends com.goldencode.p2j.oo.reflect.Event> getEvent(final character _name, final object<? extends com.goldencode.p2j.oo.reflect.Flags> _flags) |
1145 | 1152 |
{ |
1146 | 1153 |
character name = TypeFactory.initInput(_name); |
... | ... | |
1150 | 1157 |
} |
1151 | 1158 | |
1152 | 1159 |
@LegacySignature(returns = "OBJECT", type = Type.METHOD, name = "GetEvents", extent = -1, qualified = "progress.reflect.event") |
1160 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1153 | 1161 |
public object<? extends com.goldencode.p2j.oo.reflect.Event>[] getEvents() |
1154 | 1162 |
{ |
1155 | 1163 |
return extentFunction(LegacyClass.class, this, "GetEvents", object.class, new Block()); |
... | ... | |
1159 | 1167 |
{ |
1160 | 1168 |
@LegacyParameter(name = "flags", type = "OBJECT", qualified = "progress.reflect.flags", mode = "INPUT") |
1161 | 1169 |
}) |
1170 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1162 | 1171 |
public object<? extends com.goldencode.p2j.oo.reflect.Event>[] getEvents(final object<? extends com.goldencode.p2j.oo.reflect.Flags> _flags) |
1163 | 1172 |
{ |
1164 | 1173 |
object<? extends com.goldencode.p2j.oo.reflect.Flags> flags = TypeFactory.initInput(_flags); |
... | ... | |
1174 | 1183 |
* @return The array of {@link LegacyClass} instances for each interface of this class. |
1175 | 1184 |
*/ |
1176 | 1185 |
@LegacySignature(returns = "OBJECT", type = Type.METHOD, name = "GetInterfaces", extent = -1, qualified = "progress.lang.class") |
1186 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
|
1177 | 1187 |
public object<? extends LegacyClass>[] getInterfaces() |
1178 | 1188 |
{ |
1179 | 1189 |
object<? extends LegacyClass>[] res[] = new object[][] |
... | ... | |
1217 | 1227 |
@LegacyParameter(name = "method-name", type = "CHARACTER", mode = "INPUT"), |
1218 | 1228 |
@LegacyParameter(name = "parms", type = "OBJECT", qualified = "progress.lang.parameterlist", mode = "INPUT") |
1219 | 1229 |
}) |
1230 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1220 | 1231 |
public object<? extends Legacy4GLMethod> getMethod(final character _methodName, final object<? extends com.goldencode.p2j.oo.lang.ParameterList> _parms) |
1221 | 1232 |
{ |
1222 | 1233 |
UnimplementedFeature.missing("Progress.Lang.Class:getMethod(character, progress.lang.parameterlist)"); |
... | ... | |
1233 | 1244 |
@LegacyParameter(name = "flags", type = "OBJECT", qualified = "progress.reflect.flags", mode = "INPUT"), |
1234 | 1245 |
@LegacyParameter(name = "parms", type = "OBJECT", qualified = "progress.lang.parameterlist", mode = "INPUT") |
1235 | 1246 |
}) |
1247 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1236 | 1248 |
public object<? extends Legacy4GLMethod> getMethod(final character _methodName, final object<? extends com.goldencode.p2j.oo.reflect.Flags> _flags, final object<? extends com.goldencode.p2j.oo.lang.ParameterList> _parms) |
1237 | 1249 |
{ |
1238 | 1250 |
UnimplementedFeature.missing("Progress.Lang.Class:getMethod(character, progress.reflect.flags, progress.lang.parameterlist)"); |
... | ... | |
1245 | 1257 |
} |
1246 | 1258 | |
1247 | 1259 |
@LegacySignature(returns = "OBJECT", type = Type.METHOD, name = "GetMethods", extent = -1, qualified = "progress.reflect.method") |
1260 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1248 | 1261 |
public object<? extends Legacy4GLMethod>[] getMethods() |
1249 | 1262 |
{ |
1250 | 1263 |
UnimplementedFeature.missing("Progress.Lang.Class:getMethods()"); |
... | ... | |
1256 | 1269 |
{ |
1257 | 1270 |
@LegacyParameter(name = "flags", type = "OBJECT", qualified = "progress.reflect.flags", mode = "INPUT") |
1258 | 1271 |
}) |
1272 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1259 | 1273 |
public object<? extends Legacy4GLMethod>[] getMethods(final object<? extends com.goldencode.p2j.oo.reflect.Flags> _flags) |
1260 | 1274 |
{ |
1261 | 1275 |
UnimplementedFeature.missing("Progress.Lang.Class:getMethods(progress.reflect.flags)"); |
... | ... | |
1266 | 1280 |
} |
1267 | 1281 | |
1268 | 1282 |
@LegacySignature(returns = "OBJECT", type = Type.METHOD, name = "GetProperties", extent = -1, qualified = "progress.reflect.property") |
1283 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1269 | 1284 |
public object<? extends com.goldencode.p2j.oo.reflect.Property>[] getProperties() |
1270 | 1285 |
{ |
1286 |
UnimplementedFeature.missing("Progress.Lang.Class:getProperties()"); |
|
1287 |
|
|
1271 | 1288 |
return extentFunction(LegacyClass.class, this, "GetProperties", object.class, new Block()); |
1272 | 1289 |
} |
1273 | 1290 | |
... | ... | |
1275 | 1292 |
{ |
1276 | 1293 |
@LegacyParameter(name = "flags", type = "OBJECT", qualified = "progress.reflect.flags", mode = "INPUT") |
1277 | 1294 |
}) |
1295 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1278 | 1296 |
public object<? extends com.goldencode.p2j.oo.reflect.Property>[] getProperties(final object<? extends com.goldencode.p2j.oo.reflect.Flags> _flags) |
1279 | 1297 |
{ |
1298 |
UnimplementedFeature.missing("Progress.Lang.Class:getProperties(progress.reflect.flags)"); |
|
1299 |
|
|
1280 | 1300 |
object<? extends com.goldencode.p2j.oo.reflect.Flags> flags = TypeFactory.initInput(_flags); |
1281 | 1301 |
|
1282 | 1302 |
return extentFunction(LegacyClass.class, this, "GetProperties", object.class, new Block()); |
... | ... | |
1286 | 1306 |
{ |
1287 | 1307 |
@LegacyParameter(name = "name", type = "CHARACTER", mode = "INPUT") |
1288 | 1308 |
}) |
1309 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1289 | 1310 |
public object<? extends com.goldencode.p2j.oo.reflect.Property> getProperty(final character _name) |
1290 | 1311 |
{ |
1312 |
UnimplementedFeature.missing("Progress.Lang.Class:getProperty(character)"); |
|
1313 |
|
|
1291 | 1314 |
character name = TypeFactory.initInput(_name); |
1292 | 1315 |
|
1293 | 1316 |
return function(LegacyClass.class, this, "GetProperty", object.class, new Block()); |
... | ... | |
1298 | 1321 |
@LegacyParameter(name = "name", type = "CHARACTER", mode = "INPUT"), |
1299 | 1322 |
@LegacyParameter(name = "flags", type = "OBJECT", qualified = "progress.reflect.flags", mode = "INPUT") |
1300 | 1323 |
}) |
1324 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1301 | 1325 |
public object<? extends com.goldencode.p2j.oo.reflect.Property> getProperty(final character _name, final object<? extends com.goldencode.p2j.oo.reflect.Flags> _flags) |
1302 | 1326 |
{ |
1327 |
UnimplementedFeature.missing("Progress.Lang.Class:getProperty(character, progress.reflect.flags)"); |
|
1328 | ||
1303 | 1329 |
character name = TypeFactory.initInput(_name); |
1304 | 1330 |
object<? extends com.goldencode.p2j.oo.reflect.Flags> flags = TypeFactory.initInput(_flags); |
1305 | 1331 |
|
... | ... | |
1307 | 1333 |
} |
1308 | 1334 | |
1309 | 1335 |
@LegacySignature(returns = "OBJECT", type = Type.METHOD, name = "GetVariables", extent = -1, qualified = "progress.reflect.variable") |
1336 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1310 | 1337 |
public object<? extends com.goldencode.p2j.oo.reflect.Variable>[] getVariables() |
1311 | 1338 |
{ |
1339 |
UnimplementedFeature.missing("Progress.Lang.Class:getVariables()"); |
|
1340 |
|
|
1312 | 1341 |
return extentFunction(LegacyClass.class, this, "GetVariables", object.class, new Block()); |
1313 | 1342 |
} |
1314 | 1343 | |
... | ... | |
1316 | 1345 |
{ |
1317 | 1346 |
@LegacyParameter(name = "flags", type = "OBJECT", qualified = "progress.reflect.flags", mode = "INPUT") |
1318 | 1347 |
}) |
1348 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1319 | 1349 |
public object<? extends com.goldencode.p2j.oo.reflect.Variable>[] getVariables(final object<? extends com.goldencode.p2j.oo.reflect.Flags> _flags) |
1320 | 1350 |
{ |
1351 |
UnimplementedFeature.missing("Progress.Lang.Class:getVariables(progress.reflect.flags)"); |
|
1352 | ||
1321 | 1353 |
object<? extends com.goldencode.p2j.oo.reflect.Flags> flags = TypeFactory.initInput(_flags); |
1322 | 1354 |
|
1323 | 1355 |
return extentFunction(LegacyClass.class, this, "GetVariables", object.class, new Block()); |
... | ... | |
1327 | 1359 |
{ |
1328 | 1360 |
@LegacyParameter(name = "name", type = "CHARACTER", mode = "INPUT") |
1329 | 1361 |
}) |
1362 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1330 | 1363 |
public object<? extends com.goldencode.p2j.oo.reflect.Variable> getVariable(final character _name) |
1331 | 1364 |
{ |
1365 |
UnimplementedFeature.missing("Progress.Lang.Class:getVariable(character)"); |
|
1366 |
|
|
1332 | 1367 |
character name = TypeFactory.initInput(_name); |
1333 | 1368 |
|
1334 | 1369 |
return function(LegacyClass.class, this, "GetVariable", object.class, new Block()); |
... | ... | |
1339 | 1374 |
@LegacyParameter(name = "name", type = "CHARACTER", mode = "INPUT"), |
1340 | 1375 |
@LegacyParameter(name = "flags", type = "OBJECT", qualified = "progress.reflect.flags", mode = "INPUT") |
1341 | 1376 |
}) |
1377 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1342 | 1378 |
public object<? extends com.goldencode.p2j.oo.reflect.Variable> getVariable(final character _name, final object<? extends com.goldencode.p2j.oo.reflect.Flags> _flags) |
1343 | 1379 |
{ |
1380 |
UnimplementedFeature.missing("Progress.Lang.Class:getVariable(character,progress.reflect.flags)"); |
|
1381 |
|
|
1344 | 1382 |
character name = TypeFactory.initInput(_name); |
1345 | 1383 |
object<? extends com.goldencode.p2j.oo.reflect.Flags> flags = TypeFactory.initInput(_flags); |
1346 | 1384 |
|
... | ... | |
1352 | 1390 |
@LegacyParameter(name = "pname", type = "CHARACTER", mode = "INPUT"), |
1353 | 1391 |
@LegacyParameter(name = "value", type = "BDT", mode = "INPUT") |
1354 | 1392 |
}) |
1393 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1355 | 1394 |
public void setPropertyValue(final character _pname, final Object _value) |
1356 | 1395 |
{ |
1396 |
UnimplementedFeature.missing("Progress.Lang.Class:setPropertyValue(character,bdt)"); |
|
1397 |
|
|
1357 | 1398 |
character pname = TypeFactory.initInput(_pname); |
1358 | 1399 |
|
1359 | 1400 |
internalProcedure(LegacyClass.class, this, "SetPropertyValue", new Block()); |
... | ... | |
1361 | 1402 | |
1362 | 1403 |
@LegacySignature(type = Type.METHOD, name = "SetPropertyValue", parameters = { |
1363 | 1404 |
@LegacyParameter(name = "pname", type = "CHARACTER", mode = "INPUT"), |
1364 |
@LegacyParameter(name = "index", type = "BDT", mode = "INPUT"),
|
|
1405 |
@LegacyParameter(name = "index", type = "INTEGER", mode = "INPUT"),
|
|
1365 | 1406 |
@LegacyParameter(name = "value", type = "BDT", mode = "INPUT") }) |
1366 |
public void setPropertyValue(final character _pname, final Object _index, |
|
1407 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1408 |
public void setPropertyValue(final character _pname, final integer _index, |
|
1367 | 1409 |
final Object _value) |
1368 | 1410 |
{ |
1411 |
UnimplementedFeature.missing("Progress.Lang.Class:setPropertyValue(character,integer,bdt)"); |
|
1412 |
|
|
1369 | 1413 |
character pname = TypeFactory.initInput(_pname); |
1414 |
integer index = TypeFactory.initInput(_index); |
|
1370 | 1415 | |
1371 | 1416 |
internalProcedure(LegacyClass.class, this, "SetPropertyValue", new Block()); |
1372 | 1417 |
} |
... | ... | |
1377 | 1422 |
@LegacyParameter(name = "pname", type = "CHARACTER", mode = "INPUT"), |
1378 | 1423 |
@LegacyParameter(name = "value", type = "BDT", mode = "INPUT") |
1379 | 1424 |
}) |
1425 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1380 | 1426 |
public void setPropertyValue(final object<? extends com.goldencode.p2j.oo.lang._BaseObject_> _objRef, final character _pname, final Object _value) |
1381 | 1427 |
{ |
1428 |
UnimplementedFeature.missing("Progress.Lang.Class:setPropertyValue(progress.lang.object,character,bdt)"); |
|
1429 |
|
|
1382 | 1430 |
object<? extends com.goldencode.p2j.oo.lang._BaseObject_> objRef = TypeFactory.initInput(_objRef); |
1383 | 1431 |
character pname = TypeFactory.initInput(_pname); |
1384 | 1432 |
|
... | ... | |
1388 | 1436 |
@LegacySignature(type = Type.METHOD, name = "SetPropertyValue", parameters = { |
1389 | 1437 |
@LegacyParameter(name = "obj-ref", type = "OBJECT", qualified = "progress.lang.object", mode = "INPUT"), |
1390 | 1438 |
@LegacyParameter(name = "pname", type = "CHARACTER", mode = "INPUT"), |
1391 |
@LegacyParameter(name = "index", type = "BDT", mode = "INPUT"),
|
|
1439 |
@LegacyParameter(name = "index", type = "INTEGER", mode = "INPUT"),
|
|
1392 | 1440 |
@LegacyParameter(name = "value", type = "BDT", mode = "INPUT") }) |
1441 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
1393 | 1442 |
public void setPropertyValue( |
1394 | 1443 |
final object<? extends com.goldencode.p2j.oo.lang._BaseObject_> _objRef, |
1395 |
final character _pname, final Object _index,
|
|
1444 |
final character _pname, final integer _index,
|
|
1396 | 1445 |
final Object _value) |
1397 | 1446 |
{ |
1447 |
UnimplementedFeature.missing("Progress.Lang.Class:setPropertyValue(progress.lang.object,character,integer,bdt)"); |
|
1448 |
|
|
1398 | 1449 |
object<? extends com.goldencode.p2j.oo.lang._BaseObject_> objRef = TypeFactory |
1399 | 1450 |
.initInput(_objRef); |
1400 | 1451 |
character pname = TypeFactory.initInput(_pname); |
1401 | ||
1452 |
integer index = TypeFactory.initInput(_index); |
|
1453 |
|
|
1402 | 1454 |
internalProcedure(LegacyClass.class, this, "SetPropertyValue", new Block()); |
1403 | 1455 |
} |
1404 | 1456 |
} |
new/src/com/goldencode/p2j/oo/lang/ParameterList.java 2023-05-03 14:21:29 +0000 | ||
---|---|---|
15 | 15 |
** 008 CA 20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy signature. |
16 | 16 |
** 009 ME 20210507 Improve parameter validation (call syntax uses '-' as separator instead space). |
17 | 17 |
** 010 GES 20220511 Match changes in CallMode and ParameterOption. |
18 |
** ME 20230503 Reconvert skeleton and getSignatureList and new setParameter method. (#6410). |
|
18 | 19 |
*/ |
19 | 20 | |
20 | 21 |
/* |
... | ... | |
206 | 207 |
return new logical(true); |
207 | 208 |
} |
208 | 209 |
|
210 |
|
|
211 |
@LegacySignature(type = Type.METHOD, name = "SetParameter", returns = "LOGICAL", parameters = |
|
212 |
{ |
|
213 |
@LegacyParameter(name = "pos", type = "INTEGER", mode = "INPUT"), |
|
214 |
@LegacyParameter(name = "val", type = "OBJECT", mode = "INPUT") |
|
215 |
}) |
|
216 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
217 |
public logical setParameter(final integer pos, final Object val) |
|
218 |
{ |
|
219 |
return function(ParameterList.class, this, "SetParameter", logical.class, new Block((Body) () -> { |
|
220 |
|
|
221 |
if (pos.isUnknown() || pos.intValue() < 0 || pos.intValue() > this.getNumParameters().intValue()) |
|
222 |
{ |
|
223 |
String msg = "SetParameter position must be 1 based and less than or equal to " + this.getNumParameters().intValue() + "."; |
|
224 |
ErrorManager.recordOrThrowError(15293, msg, false); |
|
225 |
} |
|
226 |
|
|
227 |
CallParameter param = parameters[pos.intValue() - 1]; |
|
228 |
|
|
229 |
param = Call.createParameter(param.dataType, param.mode, val, false, true); |
|
230 |
|
|
231 |
if (param == null) |
|
232 |
{ |
|
233 |
returnNormal(new logical(false)); |
|
234 |
} |
|
235 |
|
|
236 |
parameters[pos.intValue() - 1] = param; |
|
237 |
|
|
238 |
returnNormal(new logical(true)); |
|
239 |
})); |
|
240 |
} |
|
241 |
|
|
209 | 242 |
/** |
210 | 243 |
* Implementation of the SET-PARAMETER method. |
211 | 244 |
* |
... | ... | |
352 | 385 |
{ |
353 | 386 |
return parameters; |
354 | 387 |
} |
388 |
|
|
389 |
@LegacySignature(type = Type.GETTER, name = "SignatureList", returns = "CHARACTER") |
|
390 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
391 |
public character getSignatureList() |
|
392 |
{ |
|
393 |
return new character(); |
|
394 |
} |
|
395 | ||
396 |
|
|
355 | 397 |
} |
new/src/com/goldencode/p2j/oo/lang/ProError.java 2023-05-03 14:07:42 +0000 | ||
---|---|---|
18 | 18 |
** signature. |
19 | 19 |
** CA 20220208 Implemented the callstack property. |
20 | 20 |
** VVT 20221221 Serialization support added (see #4658). |
21 |
** ME 20230503 Make severity private (#6410). |
|
21 | 22 |
*/ |
22 | 23 | |
23 | 24 |
/* |
... | ... | |
90 | 91 |
*/ |
91 | 92 |
@LegacyResource(resource = "Progress.Lang.ProError") |
92 | 93 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_BASIC) |
94 |
@LegacySerializable |
|
93 | 95 |
public class ProError |
94 | 96 |
extends BaseObject |
95 | 97 |
implements LegacyError, |
96 | 98 |
Externalizable |
97 | 99 |
{ |
98 | 100 |
/** The severity property. */ |
99 |
protected integer severity = new integer(0);
|
|
101 |
private integer severity = new integer(0);
|
|
100 | 102 |
|
101 | 103 |
/** The recorded errors. */ |
102 | 104 |
protected List<NumberedException> errors = new ArrayList<>(); |
new/src/com/goldencode/p2j/oo/net/http/CookieJar.java 2023-05-03 14:24:38 +0000 | ||
---|---|---|
14 | 14 |
** signature. |
15 | 15 |
** CA 20210609 Updated INPUT/INPUT-OUTPUT parameters to the new approach, where they are explicitly |
16 | 16 |
** initialized at the method's execution, and not at the caller's arguments. |
17 |
** ME 20211012 Increment/decrement object references on add/remove. |
|
17 |
** ME 20211012 Increment/decrement object references on add/remove. |
|
18 |
** ME 20230503 Update method references for JsonArray (updated as part of #6410). |
|
18 | 19 |
*/ |
19 | 20 | |
20 | 21 |
/* |
... | ... | |
571 | 572 | |
572 | 573 |
persistentCookies.get().stream() |
573 | 574 |
.filter(c -> c.cookie._isValid() && !_isExpired(c.cookie.ref())) |
574 |
.forEach(c -> jsonArr.ref().add_2(_serializeCookie(c)));
|
|
575 |
.forEach(c -> jsonArr.ref().add_1(_serializeCookie(c)));
|
|
575 | 576 | |
576 | 577 |
jsonObj.ref().add(new character(TAG_COOKIES), jsonArr); |
577 | 578 |
new/src/com/goldencode/p2j/oo/net/http/Credentials.java 2023-05-03 14:26:01 +0000 | ||
---|---|---|
9 | 9 |
* |
10 | 10 |
** 002 CA 20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy |
11 | 11 |
** signature. |
12 |
** ME 20230503 Update legacy support annotations. |
|
12 | 13 |
*/ |
13 | 14 | |
14 | 15 |
/* |
... | ... | |
81 | 82 |
* in OpenEdge/Net/HTTP/Credentials.cls). |
82 | 83 |
*/ |
83 | 84 |
@LegacyResource(resource = "OpenEdge.Net.HTTP.Credentials") |
84 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB)
|
|
85 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
|
|
85 | 86 |
public class Credentials |
86 | 87 |
extends BaseObject |
87 | 88 |
{ |
... | ... | |
180 | 181 |
* @return 'domain' attribute value. |
181 | 182 |
*/ |
182 | 183 |
@LegacySignature(returns = "CHARACTER", type = Type.GETTER, name = "Domain") |
183 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB)
|
|
184 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
|
|
184 | 185 |
public character getDomain() |
185 | 186 |
{ |
186 | 187 |
return function(this, "Domain", character.class, new Block((Body) () -> |
... | ... | |
215 | 216 |
* @return 'password' attribute value. |
216 | 217 |
*/ |
217 | 218 |
@LegacySignature(returns = "CHARACTER", type = Type.GETTER, name = "Password") |
218 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB)
|
|
219 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
|
|
219 | 220 |
public character getPassword() |
220 | 221 |
{ |
221 | 222 |
return function(this, "Password", character.class, new Block((Body) () -> |
... | ... | |
250 | 251 |
* @return 'userName' attribute value. |
251 | 252 |
*/ |
252 | 253 |
@LegacySignature(returns = "CHARACTER", type = Type.GETTER, name = "UserName") |
253 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB)
|
|
254 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
|
|
254 | 255 |
public character getUserName() |
255 | 256 |
{ |
256 | 257 |
return function(this, "UserName", character.class, new Block((Body) () -> |
new/src/com/goldencode/p2j/oo/net/http/filter/payload/JsonEntityWriter.java 2023-05-03 14:23:34 +0000 | ||
---|---|---|
15 | 15 |
** be tracked. |
16 | 16 |
** All TypeFactory.object variable definitions must be done outside of the top-level block. |
17 | 17 |
** CA 20221024 write(ByteBucket) must interpret the bytes as 'utf-8' source codepage. |
18 |
** ME 20230503 Update method references for JsonArray (updated as part of #6410). |
|
18 | 19 |
*/ |
19 | 20 | |
20 | 21 |
/* |
... | ... | |
500 | 501 |
{ |
501 | 502 |
if (ObjectOps.typeOf(this.entity, JsonArray.class).booleanValue()) |
502 | 503 |
{ |
503 |
ObjectOps.cast(this.entity, JsonArray.class).ref().add_2(jsonErr);
|
|
504 |
ObjectOps.cast(this.entity, JsonArray.class).ref().add_1(jsonErr);
|
|
504 | 505 |
} |
505 | 506 |
else if (ObjectOps.typeOf(this.entity, JsonObject.class).booleanValue()) |
506 | 507 |
{ |
507 | 508 |
jsonArr.assign(ObjectOps.newInstance(JsonArray.class)); |
508 |
jsonArr.ref().add_2(ObjectOps.cast(this.entity, JsonObject.class));
|
|
509 |
jsonArr.ref().add_2(jsonErr);
|
|
509 |
jsonArr.ref().add_1(ObjectOps.cast(this.entity, JsonObject.class));
|
|
510 |
jsonArr.ref().add_1(jsonErr);
|
|
510 | 511 |
|
511 | 512 |
this.entity.assign(jsonArr); |
512 | 513 |
} |
... | ... | |
604 | 605 |
} |
605 | 606 |
else |
606 | 607 |
{ |
607 |
ObjectOps.cast(this.entity, JsonArray.class).ref().add_2(oRet);
|
|
608 |
ObjectOps.cast(this.entity, JsonArray.class).ref().add_1(oRet);
|
|
608 | 609 |
} |
609 | 610 |
} |
610 | 611 |
else if (ObjectOps.typeOf(this.entity, JsonObject.class).booleanValue()) |
new/src/com/goldencode/p2j/oo/net/serverconnection/ClientSocket.java 2023-05-03 14:28:07 +0000 | ||
---|---|---|
16 | 16 |
** ME 20210426 Fixed properties initial values (class not implemented, http client used instead). |
17 | 17 |
** OM 20210917 Code maintenance. |
18 | 18 |
** CA 20220513 Fixed legacy signature for 'writeData'. |
19 |
** ME 20230503 Reconvert skeleton, remove setter for connected, set connect params on ctor (#6410). |
|
19 | 20 |
*/ |
20 | 21 | |
21 | 22 |
/* |
... | ... | |
222 | 223 |
})); |
223 | 224 |
} |
224 | 225 | |
225 |
@LegacySignature(type = Type.SETTER, name = "Connected", parameters = |
|
226 |
{ |
|
227 |
@LegacyParameter(name = "var", type = "LOGICAL", mode = "INPUT") |
|
228 |
}) |
|
229 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
|
230 |
public void setConnected(final logical _var) |
|
231 |
{ |
|
232 |
logical var = TypeFactory.initInput(_var); |
|
233 |
|
|
234 |
internalProcedure(ClientSocket.class, this, "Connected", new Block((Body) () -> |
|
235 |
{ |
|
236 |
connected.assign(var); |
|
237 |
})); |
|
238 |
} |
|
239 | ||
240 | 226 |
@LegacySignature(returns = "OBJECT", qualified = "OpenEdge.Core.ServerConnection.IConnectionParameters", type = Type.GETTER, name = "ConnectionParameters") |
241 | 227 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB) |
242 | 228 |
public object<? extends IconnectionParameters> getConnectionParameters() |
... | ... | |
610 | 596 |
internalProcedure(ClientSocket.class, this, "__net_serverconnection_ClientSocket_constructor__", new Block((Body) () -> |
611 | 597 |
{ |
612 | 598 |
__lang_BaseObject_constructor__(); |
599 |
connectionParameters.assign(p1); |
|
613 | 600 |
})); |
614 | 601 |
} |
615 | 602 |
new/src/com/goldencode/p2j/oo/net/serverconnection/ClientSocketConnectionParameters.java 2023-05-03 14:29:52 +0000 | ||
---|---|---|
16 | 16 |
** signature. |
17 | 17 |
** 005 ME 20210322 Implement missing functionality (OE12.2). |
18 | 18 |
** CA 20210609 Set the EXTENT for legacy properties or variables. |
19 |
** ME 20230503 Reconvert skeleton, add new setter methods for extent properties (#6410). |
|
19 | 20 |
*/ |
20 | 21 | |
21 | 22 |
/* |
... | ... | |
214 | 215 |
sslCiphers = (character[]) assignMulti(sslCiphers, var); |
215 | 216 |
})); |
216 | 217 |
} |
218 |
|
|
219 |
@LegacySignature(type = Type.SETTER, name = "SslCiphers", parameters = |
|
220 |
{ |
|
221 |
@LegacyParameter(name = "var", type = "CHARACTER", mode = "INPUT") |
|
222 |
}) |
|
223 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
|
224 |
public void setAllSslCiphers(final character _var) |
|
225 |
{ |
|
226 |
character var = TypeFactory.initInput(_var); |
|
227 |
|
|
228 |
internalProcedure(ClientSocketConnectionParameters.class, this, "SslCiphers", new Block((Body) () -> |
|
229 |
{ |
|
230 |
assignMulti(sslCiphers, var); |
|
231 |
})); |
|
232 |
} |
|
233 | ||
217 | 234 | |
218 | 235 |
@LegacySignature(returns = "INTEGER", type = Type.LENGTH, name = "SslCiphers") |
219 | 236 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
... | ... | |
298 | 315 |
})); |
299 | 316 |
} |
300 | 317 | |
318 |
@LegacySignature(type = Type.SETTER, name = "SslProtocols", parameters = |
|
319 |
{ |
|
320 |
@LegacyParameter(name = "var", type = "CHARACTER", mode = "INPUT") |
|
321 |
}) |
|
322 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
|
323 |
public void setAllSslProtocols(final character _var) |
|
324 |
{ |
|
325 |
character var = TypeFactory.initInput(_var); |
|
326 |
|
|
327 |
internalProcedure(ClientSocketConnectionParameters.class, this, "SslProtocols", new Block((Body) () -> |
|
328 |
{ |
|
329 |
assignMulti(sslProtocols, var); |
|
330 |
})); |
|
331 |
} |
|
332 |
|
|
301 | 333 |
@LegacySignature(returns = "INTEGER", type = Type.LENGTH, name = "SslProtocols") |
302 | 334 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL) |
303 | 335 |
public integer lengthOfSslProtocols() |
... | ... | |
539 | 571 |
{ |
540 | 572 |
@LegacyParameter(name = "p1", type = "CHARACTER", mode = "INPUT") |
541 | 573 |
}) |
542 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
|
|
574 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_PARTIAL)
|
|
543 | 575 |
public character getConnectionString(final character _p1) |
544 | 576 |
{ |
545 | 577 |
return getConnectionString(); |
... | ... | |
549 | 581 |
{ |
550 | 582 |
@LegacyParameter(name = "p1", type = "OBJECT", qualified = "openedge.core.serverconnection.formatmaskenum", mode = "INPUT") |
551 | 583 |
}) |
552 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
|
|
584 |
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_PARTIAL)
|
|
553 | 585 |
public character getConnectionString(final object<? extends FormatMaskEnum> _p1) |
554 | 586 |
{ |
555 | 587 |
return getConnectionString(); |
new/src/com/goldencode/p2j/persist/serial/JsonExport.java 2023-05-03 16:45:23 +0000 | ||
---|---|---|
35 | 35 |
** CA 20230116 Avoid using handle.unwrap, handle.getReference or other BDT usage from within FWD runtime. |
36 | 36 |
** 009 IAS 20230303 Fixed <code>decimal</code> serialization |
37 | 37 |
** 20230315 Added support for the DATA-REALATION:FOREIGN-KEY-HIDDEN attribute. |
38 |
** ME 20230503 Update method references for JsonArray (updated as part of #6410). |
|
38 | 39 |
*/ |
39 | 40 | |
40 | 41 |
/* |
... | ... | |
502 | 503 |
} |
503 | 504 |
else if (json instanceof JsonArray) |
504 | 505 |
{ |
505 |
((JsonArray) json).setLength(new int64(0));
|
|
506 |
((JsonArray) json).setLength(new integer(0));
|
|
506 | 507 |
} |
507 | 508 |
else |
508 | 509 |
{ |
... | ... | |
562 | 563 |
return; |
563 | 564 |
} |
564 | 565 |
|
565 |
root.ref().add_2(node);
|
|
566 |
root.ref().add_1(node);
|
|
566 | 567 |
}); |
567 | 568 |
|
568 | 569 |
JsonObject json = (JsonObject) (((ObjectVar<?>) ufo).ref()); |
... | ... | |
596 | 597 |
return; |
597 | 598 |
} |
598 | 599 |
|
599 |
json.add_2(node);
|
|
600 |
json.add_1(node);
|
|
600 | 601 |
}); |
601 | 602 |
} |
602 | 603 |
|
... | ... | |
733 | 734 |
case "raw": dest.add((raw) datum); break; |
734 | 735 |
case "recid": dest.add((recid) datum); break; |
735 | 736 |
case "rowid": dest.add((rowid) datum); break; |
736 |
case "object": dest.add_2((object) datum); break;
|
|
737 |
case "object": dest.add_1((object) datum); break;
|
|
737 | 738 |
case "blob": dest.add((blob) datum); break; |
738 | 739 |
case "clob": dest.add((clob) datum); break; |
739 | 740 |
} |
... | ... | |
800 | 801 |
return; |
801 | 802 |
} |
802 | 803 |
|
803 |
ttRoot.ref().add_2(node);
|
|
804 |
ttRoot.ref().add_1(node);
|
|
804 | 805 |
}); |
805 | 806 |
|
806 | 807 |
dsRoot.ref().add(after.getSerializeName(), ttRoot); |
... | ... | |
1557 | 1558 |
iLoop.assign(i + 1); |
1558 | 1559 |
|
1559 | 1560 |
oError.assign(ObjectOps.newInstance(JsonObject.class)); |
1560 |
oErrorList.ref().add_2(oError);
|
|
1561 |
oErrorList.ref().add_1(oError);
|
|
1561 | 1562 |
oError.ref().add(new character("_errorMsg"), poError.ref().getMessage(iLoop)); |
1562 | 1563 |
oError.ref().add(new character("_errorNum"), poError.ref().getMessageNum(iLoop)); |
1563 | 1564 |
} |