Noratrieb/UMLetClassParser
1
0
Fork 0
mirror of https://github.com/Noratrieb/UMLetClassParser.git synced 2026-01-14 16:45:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

abstract method support

Browse source
This commit is contained in:
nora 2020-12-05 14:14:44 +01:00
parent b2ef2883c5
commit 7e703aad33
2 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/Regex.java
View file

@ -24,7 +24,7 @@ public abstract class Regex {
* </ul> * </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> * </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<>]+))?/?");
/** /**

41
src/main/java/UMLMethod.java
View file

@ -13,7 +13,8 @@ public class UMLMethod {
private final ArrayList<String> argsNames = new ArrayList<>(); private final ArrayList<String> argsNames = new ArrayList<>();
private final ArrayList<String> argsTypes = new ArrayList<>(); private final ArrayList<String> argsTypes = new ArrayList<>();
private boolean isConstructor; private final boolean isConstructor;
private final boolean isAbstract;
private UMLManager manager; private UMLManager manager;
@ -29,8 +30,15 @@ public class UMLMethod {
this.manager = manager; 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 formatted = line.replaceAll(Regex.METHOD_FIND_REGEX.pattern(), "$1;$4;$2;$3");
String[] parts = formatted.split(";"); String[] parts = formatted.split(";");
if(!manager.isIgnoreEcapsulation()) { if(!manager.isIgnoreEcapsulation()) {
@ -47,9 +55,7 @@ public class UMLMethod {
this.name = parts[2]; this.name = parts[2];
if(className.equals(name)){ isConstructor = className.equals(name);
isConstructor = true;
}
if (parts[1].equals("") && !isConstructor) { if (parts[1].equals("") && !isConstructor) {
this.returnType = "void "; this.returnType = "void ";
@ -76,6 +82,8 @@ public class UMLMethod {
this.returnType = returnType; this.returnType = returnType;
this.name = name; this.name = name;
this.encapsulation = encapsulation; this.encapsulation = encapsulation;
isConstructor = false;
isAbstract = false;
} }
/** /**
@ -86,7 +94,7 @@ public class UMLMethod {
@Override @Override
public String toString() { public String toString() {
StringBuilder returnString = new StringBuilder(); 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++) { for (int i = 0; i < argsNames.size(); i++) {
returnString.append(argsTypes.get(i)).append(" ").append(argsNames.get(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()){ if(isAbstract){
for (String argsName : argsNames) { returnString.append(";\n\n");
addBodyLine("this." + argsName + " = " + argsName + ";"); } else {
returnString.append(" {\n");
if (isConstructor && manager.isAutoFillConstructor()) {
for (String argsName : argsNames) {
addBodyLine("this." + argsName + " = " + argsName + ";");
}
} }
}
returnString.append(methodBody); returnString.append(methodBody);
returnString.append("\n }\n"); returnString.append("\n }\n");
}
return returnString.toString(); return returnString.toString();
} }