aboutsummaryrefslogtreecommitdiffstats
path: root/javaparser-core
diff options
context:
space:
mode:
authorDanny van Bruggen <hexagonaal@gmail.com>2017-04-23 02:13:23 +0200
committerDanny van Bruggen <hexagonaal@gmail.com>2017-04-23 02:15:40 +0200
commit38362bb84bc612ef0a17ef403ecfb927eb9cf471 (patch)
tree8017b194b978d9994f3c5b105a51afaa638f3154 /javaparser-core
parentc9f2a4fe27453e09a268730cd0ab76a42016475f (diff)
downloadplatform_external_javaparser-38362bb84bc612ef0a17ef403ecfb927eb9cf471.tar.gz
platform_external_javaparser-38362bb84bc612ef0a17ef403ecfb927eb9cf471.tar.bz2
platform_external_javaparser-38362bb84bc612ef0a17ef403ecfb927eb9cf471.zip
Fix generics on CallableDeclaration
Diffstat (limited to 'javaparser-core')
-rw-r--r--javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java6
-rw-r--r--javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java4
2 files changed, 5 insertions, 5 deletions
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java
index 53ad0c3f5..b63283e8f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java
@@ -27,8 +27,8 @@ import com.github.javaparser.ast.Node;
import com.github.javaparser.ast.NodeList;
import com.github.javaparser.ast.expr.AnnotationExpr;
import com.github.javaparser.ast.expr.SimpleName;
-import com.github.javaparser.ast.nodeTypes.NodeWithAnnotations;
-import com.github.javaparser.ast.nodeTypes.NodeWithTypeArguments;
+import com.github.javaparser.ast.nodeTypes.*;
+import com.github.javaparser.ast.nodeTypes.modifiers.*;
import com.github.javaparser.ast.observer.ObservableProperty;
import com.github.javaparser.ast.type.ArrayType;
import com.github.javaparser.ast.type.ReferenceType;
@@ -48,7 +48,7 @@ import javax.annotation.Generated;
/**
* Represents a declaration which is callable eg. a method or a constructor.
*/
-public abstract class CallableDeclaration<T extends Node> extends BodyDeclaration<T> {
+public abstract class CallableDeclaration<T extends Node> extends BodyDeclaration<T> implements NodeWithAccessModifiers<T>, NodeWithDeclaration, NodeWithSimpleName<T>, NodeWithParameters<T>, NodeWithThrownExceptions<T>, NodeWithTypeParameters<T>, NodeWithJavadoc<T>, NodeWithAbstractModifier<T>, NodeWithStaticModifier<T>, NodeWithFinalModifier<T>, NodeWithStrictfpModifier<T> {
private EnumSet<Modifier> modifiers;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java
index 3ec63592a..0f85a021b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java
@@ -181,8 +181,8 @@ public abstract class TypeDeclaration<T extends Node> extends BodyDeclaration<T>
/**
* @return methods or constructors whose signature match the passed signature.
*/
- public List<CallableDeclaration> getCallablesWithSignature(CallableDeclaration.Signature signature) {
- return getMembers().stream().filter(m -> m instanceof CallableDeclaration).map(m -> ((CallableDeclaration) m)).filter(m -> m.getSignature().equals(signature)).collect(toList());
+ public List<CallableDeclaration<?>> getCallablesWithSignature(CallableDeclaration.Signature signature) {
+ return getMembers().stream().filter(m -> m instanceof CallableDeclaration).map(m -> ((CallableDeclaration<?>) m)).filter(m -> m.getSignature().equals(signature)).collect(toList());
}
/**