### Eclipse Workspace Patch 1.0
#P goldencode-fwd
diff --git rules/convert/variable_definitions.rules rules/convert/variable_definitions.rules
index 2fad2dd..4807a79 100644
--- rules/convert/variable_definitions.rules
+++ rules/convert/variable_definitions.rules
@@ -332,6 +332,7 @@
+
@@ -424,6 +425,7 @@
isIface = descendant(prog.interface_def, 1)
isOO = descendant(prog.class_def, 1) or isIface
ooplist = create("java.util.LinkedList")
+ imptype = false
@@ -536,6 +538,28 @@
handled differently -->
lastid = getSectionAnchor(java.cs_instance_vars).id
+
+ tempid = createJavaAst(java.annotation, "LegacySignature", lastid, -1)
+
+ imptype = true
+
+ type == prog.define_property
+
+ execLib("add_annotation_setting", "type", java.reference, "Type.PROPERTY", tempid)
+
+
+ execLib("add_annotation_setting", "type", java.reference, "Type.VARIABLE", tempid)
+
+
+
+
+ execLib("add_annotation_setting",
+ "name",
+ java.string,
+ getNoteString("name"),
+ tempid)
+
+
type == prog.define_parameter and !(isAbstract or isIface)
@@ -1874,6 +1898,9 @@
secimp
help.createImport("com.goldencode.p2j.security.*")
+ imptype
+ createStaticImport("com.goldencode.p2j.util.InternalEntry.Type")
+
diff --git src/com/goldencode/p2j/util/InternalEntry.java src/com/goldencode/p2j/util/InternalEntry.java
index d46ce63..d0cf038 100644
--- src/com/goldencode/p2j/util/InternalEntry.java
+++ src/com/goldencode/p2j/util/InternalEntry.java
@@ -148,7 +148,14 @@
EXTERN("EXTERN"),
/** Main procedure */
- MAIN("MAIN");
+ MAIN("MAIN"),
+
+ /** Object variable */
+ VARIABLE("VARIABLE"),
+
+ /** Object property */
+ PROPERTY("PROPERTY"),
+ ;
/** Map of Progress entry names to enum values */
private static Map map = new HashMap<>(8);