keep get_ and set_ for native methods

xpenatan · Jan 27, 2024 · d182093 · d182093
1 parent a178a4e
commit d182093
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/jParser/idl/src/main/java/com/github/xpenatan/jparser/idl/parser/IDLAttributeParser.java b/jParser/idl/src/main/java/com/github/xpenatan/jparser/idl/parser/IDLAttributeParser.java
@@ -22,8 +22,8 @@
 
 public class IDLAttributeParser {
 
-    public static final String ATTRIBUTE_PREFIX_SET = "";
-    public static final String ATTRIBUTE_PREFIX_GET = "";
+    public static final String ATTRIBUTE_PREFIX_SET = "set_";
+    public static final String ATTRIBUTE_PREFIX_GET = "get_";
 
     public static void generateAttribute(IDLDefaultCodeParser idlParser, JParser jParser, CompilationUnit unit, ClassOrInterfaceDeclaration classOrInterfaceDeclaration, IDLClass idlClass, IDLAttribute idlAttribute) {
         if(idlAttribute.skip) {
@@ -94,15 +94,15 @@ public static void generateAttribute(IDLDefaultCodeParser idlParser, JParser jPa
             if(getMethodDeclaration != null) {
                 getMethodDeclaration.remove();
             }
-            String getMethodName = ATTRIBUTE_PREFIX_GET + attributeName;
+            String getMethodName = attributeName;
             getMethodDeclaration = classOrInterfaceDeclaration.addMethod(getMethodName, Modifier.Keyword.PUBLIC);
             getMethodDeclaration.setStatic(idlAttribute.isStatic);
             getMethodDeclaration.setType(type);
             JParserHelper.addMissingImportType(jParser, unit, type);
             IDLDefaultCodeParser.setDefaultReturnValues(jParser, unit, type, getMethodDeclaration);
 
             if(idlParser.generateClass) {
-                setupAttributeMethod(idlParser, jParser, idlAttribute, false, classOrInterfaceDeclaration, getMethodDeclaration);
+                setupAttributeMethod(idlParser, jParser, idlAttribute, false, classOrInterfaceDeclaration, getMethodDeclaration, ATTRIBUTE_PREFIX_GET + getMethodName);
             }
         }
 
@@ -114,27 +114,26 @@ public static void generateAttribute(IDLDefaultCodeParser idlParser, JParser jPa
             if(setMethodDeclaration != null) {
                 setMethodDeclaration.remove();
             }
-            String setMethodName = ATTRIBUTE_PREFIX_SET + attributeName;
+            String setMethodName = attributeName;
             setMethodDeclaration = classOrInterfaceDeclaration.addMethod(setMethodName, Modifier.Keyword.PUBLIC);
             setMethodDeclaration.setStatic(idlAttribute.isStatic);
             Parameter parameter = setMethodDeclaration.addAndGetParameter(type, attributeName);
             Type paramType = parameter.getType();
             JParserHelper.addMissingImportType(jParser, unit, paramType);
 
             if(idlParser.generateClass) {
-                setupAttributeMethod(idlParser, jParser, idlAttribute, true, classOrInterfaceDeclaration, setMethodDeclaration);
+                setupAttributeMethod(idlParser, jParser, idlAttribute, true, classOrInterfaceDeclaration, setMethodDeclaration, ATTRIBUTE_PREFIX_SET + setMethodName);
             }
         }
     }
 
-    private static void setupAttributeMethod(IDLDefaultCodeParser idlParser, JParser jParser, IDLAttribute idlAttribute, boolean isSet, ClassOrInterfaceDeclaration classDeclaration, MethodDeclaration methodDeclaration) {
+    private static void setupAttributeMethod(IDLDefaultCodeParser idlParser, JParser jParser, IDLAttribute idlAttribute, boolean isSet, ClassOrInterfaceDeclaration classDeclaration, MethodDeclaration methodDeclaration, String methodName) {
         boolean isValue = idlAttribute.isValue;
         boolean addCopyParam = false;
         if(isValue && !isSet) {
             //  When it's a get attribute method we pass a temp c++ object to copy to the returned temp c++ object.
         }
         isValue = false;
-        String methodName = methodDeclaration.getNameAsString();
         MethodDeclaration nativeMethod = IDLMethodParser.prepareNativeMethod(idlAttribute.isStatic, isValue, classDeclaration, methodDeclaration, methodName, "");
         if(nativeMethod != null) {
             idlParser.onIDLAttributeGenerated(jParser, idlAttribute, isSet, classDeclaration, methodDeclaration, nativeMethod);
@@ -183,7 +182,7 @@ public static boolean shouldSkipMethod(MethodDeclaration containsMethod) {
     private static MethodDeclaration containsSetMethod(ClassOrInterfaceDeclaration classOrInterfaceDeclaration, IDLAttribute idlAttribute) {
         String[] paramTypes = new String[1];
         paramTypes[0] = idlAttribute.type;
-        String methodName = ATTRIBUTE_PREFIX_SET + idlAttribute.name;
+        String methodName = idlAttribute.name;
         List<MethodDeclaration> methods = classOrInterfaceDeclaration.getMethodsBySignature(methodName, paramTypes);
 
         if(methods.size() > 0) {
@@ -194,7 +193,7 @@ private static MethodDeclaration containsSetMethod(ClassOrInterfaceDeclaration c
 
     private static MethodDeclaration containsGetMethod(ClassOrInterfaceDeclaration classOrInterfaceDeclaration, IDLAttribute idlAttribute) {
         String[] paramTypes = new String[0];
-        String methodName = ATTRIBUTE_PREFIX_GET + idlAttribute.name;
+        String methodName = idlAttribute.name;
         List<MethodDeclaration> methods = classOrInterfaceDeclaration.getMethodsBySignature(methodName, paramTypes);
 
         if(methods.size() > 0) {