From 7e703aad33010ba86e410329acb4416c3de3381a Mon Sep 17 00:00:00 2001
From: Nilstrieb <nils.heydecker@gmx.ch>
Date: Sat, 5 Dec 2020 14:14:44 +0100
Subject: [PATCH] abstract method support

---
 src/main/java/Regex.java     |  4 ++--
 src/main/java/UMLMethod.java | 41 ++++++++++++++++++++++++------------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/main/java/Regex.java b/src/main/java/Regex.java
index 49452ce..ecff949 100644
--- a/src/main/java/Regex.java
+++ b/src/main/java/Regex.java
@@ -24,7 +24,7 @@ public abstract class Regex {
      *  </ul>
      *
      */
-    public static final Pattern METHOD_FIND_REGEX = Pattern.compile(" *(?<capsule>[+\\-~#])? *(?<name>\\w+) *\\( *(?<args>(?: *\\w+ *: *[\\w<>]+ *,? *)*) *\\) *(?:: *(?<return>[\\w<>]+))?");
+    public static final Pattern METHOD_FIND_REGEX = Pattern.compile("/? *(?<capsule>[+\\-~#])? *(?<name>\\w+) *\\( *(?<args>(?: *\\w+ *: *[\\w<>]+ *,? *)*) *\\) *(?:: *(?<return>[\\w<>]+))?/?");
 
 
     /**
@@ -46,7 +46,7 @@ public abstract class Regex {
      *  </ul>
      *
      */
-    public static final Pattern METHOD_FIND_REGEX_FORCE_ENCAPSULATION = Pattern.compile(" *(?<capsule>[+\\-~#]) *(?<name>\\w+) *\\( *(?<args>(?: *\\w+ *: *[\\w<>]+ *,? *)*) *\\) *(?:: *(?<return>[\\w<>]+))?");
+    public static final Pattern METHOD_FIND_REGEX_FORCE_ENCAPSULATION = Pattern.compile("/? *(?<capsule>[+\\-~#]) *(?<name>\\w+) *\\( *(?<args>(?: *\\w+ *: *[\\w<>]+ *,? *)*) *\\) *(?:: *(?<return>[\\w<>]+))?/?");
 
 
     /**
diff --git a/src/main/java/UMLMethod.java b/src/main/java/UMLMethod.java
index 0a8c542..083a4d2 100644
--- a/src/main/java/UMLMethod.java
+++ b/src/main/java/UMLMethod.java
@@ -13,7 +13,8 @@ public class UMLMethod {
     private final ArrayList<String> argsNames = new ArrayList<>();
     private final ArrayList<String> argsTypes = new ArrayList<>();
 
-    private boolean isConstructor;
+    private final boolean isConstructor;
+    private final boolean isAbstract;
 
     private UMLManager manager;
 
@@ -29,8 +30,15 @@ public class UMLMethod {
 
         this.manager = manager;
 
-        //First, format it nicely
+        //check whether it's abstract
+        if(line.matches("/.+/")){
+            isAbstract = true;
+            line = line.replaceAll("/(.+)/", "$1");
+        } else {
+            isAbstract = false;
+        }
 
+        //First, format it nicely
         String formatted = line.replaceAll(Regex.METHOD_FIND_REGEX.pattern(), "$1;$4;$2;$3");
         String[] parts = formatted.split(";");
         if(!manager.isIgnoreEcapsulation()) {
@@ -47,9 +55,7 @@ public class UMLMethod {
 
         this.name = parts[2];
 
-        if(className.equals(name)){
-            isConstructor = true;
-        }
+        isConstructor = className.equals(name);
 
         if (parts[1].equals("") && !isConstructor) {
             this.returnType = "void ";
@@ -76,6 +82,8 @@ public class UMLMethod {
         this.returnType = returnType;
         this.name = name;
         this.encapsulation = encapsulation;
+        isConstructor = false;
+        isAbstract = false;
     }
 
     /**
@@ -86,7 +94,7 @@ public class UMLMethod {
     @Override
     public String toString() {
         StringBuilder returnString = new StringBuilder();
-        returnString.append("\n   ").append(encapsulation).append(returnType).append(name).append(" (");
+        returnString.append("\n   ").append(encapsulation).append(isAbstract ? "abstract " : "").append(returnType).append(name).append(" (");
 
         for (int i = 0; i < argsNames.size(); i++) {
             returnString.append(argsTypes.get(i)).append(" ").append(argsNames.get(i));
@@ -95,16 +103,23 @@ public class UMLMethod {
             }
         }
 
-        returnString.append(") {\n");
+        returnString.append(")");
 
-        if(isConstructor && manager.isAutoFillConstructor()){
-            for (String argsName : argsNames) {
-                addBodyLine("this." + argsName + " = " + argsName + ";");
+        if(isAbstract){
+            returnString.append(";\n\n");
+        } else {
+
+            returnString.append(" {\n");
+
+            if (isConstructor && manager.isAutoFillConstructor()) {
+                for (String argsName : argsNames) {
+                    addBodyLine("this." + argsName + " = " + argsName + ";");
+                }
             }
-        }
 
-        returnString.append(methodBody);
-        returnString.append("\n   }\n");
+            returnString.append(methodBody);
+            returnString.append("\n   }\n");
+        }
 
         return returnString.toString();
     }