diff options
author | Danny van Bruggen <hexagonaal@gmail.com> | 2017-05-19 22:01:15 +0200 |
---|---|---|
committer | Danny van Bruggen <hexagonaal@gmail.com> | 2017-05-19 23:40:38 +0200 |
commit | 60df115568a32a8c4b4b0c0bb4dcb37417e084bc (patch) | |
tree | 7cbb2796687b01228f48cf034a4ab07a0817d053 /javaparser-core-generators/src/main/java | |
parent | 4f564988ffdb4fecd61f6d097bb54b08dfbcedee (diff) | |
download | javaparser-60df115568a32a8c4b4b0c0bb4dcb37417e084bc.tar.gz |
Make everything work again
Diffstat (limited to 'javaparser-core-generators/src/main/java')
2 files changed, 2 insertions, 18 deletions
diff --git a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/node/MainConstructorGenerator.java b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/node/MainConstructorGenerator.java index 480bc95c9..a6941ab0f 100644 --- a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/node/MainConstructorGenerator.java +++ b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/node/MainConstructorGenerator.java @@ -52,24 +52,8 @@ public class MainConstructorGenerator extends NodeGenerator { body.addStatement("customInitialization();"); - ConstructorDeclaration rangeConstructor = constructor.clone(); - rangeConstructor.getParameter(0).setType(Range.class); - - replaceWhenSameSignature(nodeCoid, rangeConstructor, constructor); + replaceWhenSameSignature(nodeCoid, constructor); nodeCu.addImport(TokenRange.class); annotateGenerated(constructor); } - - protected void replaceWhenSameSignature(ClassOrInterfaceDeclaration containingClassOrInterface, CallableDeclaration<?> callableWithSignature, CallableDeclaration<?> callableToReplaceWith) { - final List<CallableDeclaration<?>> existingCallables = containingClassOrInterface.getCallablesWithSignature(callableWithSignature.getSignature()); - if (existingCallables.isEmpty()) { - throw new AssertionError(f("Wanted to regenerate a method with signature %s in %s, but it wasn't there.", callableWithSignature.getSignature(), containingClassOrInterface.getNameAsString())); - } - if (existingCallables.size() > 1) { - throw new AssertionError(f("Wanted to regenerate a method with signature %s in %s, but found more than one.", callableWithSignature.getSignature(), containingClassOrInterface.getNameAsString())); - } - final CallableDeclaration<?> existingCallable = existingCallables.get(0); - callableToReplaceWith.setJavadocComment(callableToReplaceWith.getJavadocComment().orElse(existingCallable.getJavadocComment().orElse(null))); - containingClassOrInterface.getMembers().replace(existingCallable, callableToReplaceWith); - } } diff --git a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/visitor/CloneVisitorGenerator.java b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/visitor/CloneVisitorGenerator.java index 26627d14c..cfd6a983c 100644 --- a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/visitor/CloneVisitorGenerator.java +++ b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/visitor/CloneVisitorGenerator.java @@ -39,7 +39,7 @@ public class CloneVisitorGenerator extends VisitorGenerator { } SeparatedItemStringBuilder builder = new SeparatedItemStringBuilder(f("%s r = new %s(", node.getTypeNameGenerified(), node.getTypeNameGenerified()), ",", ");"); - builder.append("n.getRange().orElse(null)"); + builder.append("n.getTokenRange().orElse(null)"); for (PropertyMetaModel field : node.getConstructorParameters()) { if (field.getName().equals("comment")) { continue; |