Skip to content

Commit

Permalink
Name#qualifier Optional
Browse files Browse the repository at this point in the history
  • Loading branch information
@DeepSnowNeeL
DeepSnowNeeL committed Nov 30, 2016
1 parent 2834877 commit aabc552
Show file tree
Hide file tree
Showing 6 changed files with 120 additions and 26 deletions.
7 changes: 4 additions & 3 deletions javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java
View file
Expand Up @@ -30,6 +30,8 @@

import static com.github.javaparser.utils.Utils.assertNotNull;

import java.util.Optional;

/**
* A name that may consist of multiple identifiers.
* In other words: it.may.contain.dots.
Expand All @@ -44,7 +46,6 @@
*/
public class Name extends Node implements NodeWithIdentifier<Name> {
private String identifier;
// TODO nullable
private Name qualifier;

public Name() {
Expand Down Expand Up @@ -111,8 +112,8 @@ public String asString() {
return identifier;
}

public Name getQualifier() {
return qualifier;
public Optional<Name> getQualifier() {
return Optional.ofNullable(qualifier);
}

public Name setQualifier(final Name qualifier) {
Expand Down
2 changes: 1 addition & 1 deletion javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java
View file
Expand Up @@ -1087,7 +1087,7 @@ public Boolean visit(VoidType n1, Visitable arg) {
@Override public Boolean visit(final Name n1, final Visitable arg) {
final Name n2 = (Name) arg;

if (!nodeEquals(n1.getQualifier(), n2.getQualifier())) {
if (!nodeEquals(n1.getQualifier().orElse(null), n2.getQualifier().orElse(null))) {
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
View file
Expand Up @@ -1245,8 +1245,8 @@ public R visit(final PrimitiveType n, final A arg) {
@Override
public R visit(final Name n, final A arg) {
visitComment(n, arg);
if (n.getQualifier() != null) {
R result = n.getQualifier().accept(this, arg);
if (n.getQualifier().isPresent()) {
R result = n.getQualifier().get().accept(this, arg);
if (result != null) {
return result;
}
Expand Down
4 changes: 2 additions & 2 deletions javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
View file
Expand Up @@ -661,8 +661,8 @@ public Visitable visit(final Parameter n, final A arg) {
@Override
public Visitable visit(final Name n, final A arg) {
visitComment(n, arg);
if (n.getQualifier() != null) {
n.setQualifier((Name) n.getQualifier().accept(this, arg));
if (n.getQualifier().isPresent()) {
n.setQualifier((Name) n.getQualifier().get().accept(this, arg));
}
return n;
}
Expand Down
4 changes: 2 additions & 2 deletions javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
View file
Expand Up @@ -666,8 +666,8 @@ public void visit(final PrimitiveType n, final A arg) {
@Override
public void visit(final Name n, final A arg) {
visitComment(n.getComment(), arg);
if (n.getQualifier() != null) {
n.getQualifier().accept(this, arg);
if (n.getQualifier().isPresent()) {
n.getQualifier().get().accept(this, arg);
}
}

Expand Down
125 changes: 109 additions & 16 deletions javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
View file
Expand Up @@ -21,27 +21,120 @@

package com.github.javaparser.printer;

import com.github.javaparser.ast.*;
import com.github.javaparser.ast.body.*;
import com.github.javaparser.ast.comments.BlockComment;
import com.github.javaparser.ast.comments.Comment;
import com.github.javaparser.ast.comments.JavadocComment;
import com.github.javaparser.ast.comments.LineComment;
import com.github.javaparser.ast.expr.*;
import com.github.javaparser.ast.imports.*;
import com.github.javaparser.ast.nodeTypes.NodeWithTypeArguments;
import com.github.javaparser.ast.stmt.*;
import com.github.javaparser.ast.type.*;
import com.github.javaparser.ast.visitor.VoidVisitor;
import static com.github.javaparser.utils.PositionUtils.sortByBeginPosition;
import static com.github.javaparser.utils.Utils.isNullOrEmpty;

import java.util.EnumSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;

import static com.github.javaparser.utils.PositionUtils.sortByBeginPosition;
import static com.github.javaparser.utils.Utils.isNullOrEmpty;
import com.github.javaparser.ast.ArrayBracketPair;
import com.github.javaparser.ast.ArrayCreationLevel;
import com.github.javaparser.ast.CompilationUnit;
import com.github.javaparser.ast.Modifier;
import com.github.javaparser.ast.Node;
import com.github.javaparser.ast.NodeList;
import com.github.javaparser.ast.PackageDeclaration;
import com.github.javaparser.ast.body.AnnotationDeclaration;
import com.github.javaparser.ast.body.AnnotationMemberDeclaration;
import com.github.javaparser.ast.body.BodyDeclaration;
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
import com.github.javaparser.ast.body.ConstructorDeclaration;
import com.github.javaparser.ast.body.EmptyMemberDeclaration;
import com.github.javaparser.ast.body.EmptyTypeDeclaration;
import com.github.javaparser.ast.body.EnumConstantDeclaration;
import com.github.javaparser.ast.body.EnumDeclaration;
import com.github.javaparser.ast.body.FieldDeclaration;
import com.github.javaparser.ast.body.InitializerDeclaration;
import com.github.javaparser.ast.body.MethodDeclaration;
import com.github.javaparser.ast.body.Parameter;
import com.github.javaparser.ast.body.TypeDeclaration;
import com.github.javaparser.ast.body.VariableDeclarator;
import com.github.javaparser.ast.body.VariableDeclaratorId;
import com.github.javaparser.ast.comments.BlockComment;
import com.github.javaparser.ast.comments.Comment;
import com.github.javaparser.ast.comments.JavadocComment;
import com.github.javaparser.ast.comments.LineComment;
import com.github.javaparser.ast.expr.AnnotationExpr;
import com.github.javaparser.ast.expr.ArrayAccessExpr;
import com.github.javaparser.ast.expr.ArrayCreationExpr;
import com.github.javaparser.ast.expr.ArrayInitializerExpr;
import com.github.javaparser.ast.expr.AssignExpr;
import com.github.javaparser.ast.expr.BinaryExpr;
import com.github.javaparser.ast.expr.BooleanLiteralExpr;
import com.github.javaparser.ast.expr.CastExpr;
import com.github.javaparser.ast.expr.CharLiteralExpr;
import com.github.javaparser.ast.expr.ClassExpr;
import com.github.javaparser.ast.expr.ConditionalExpr;
import com.github.javaparser.ast.expr.DoubleLiteralExpr;
import com.github.javaparser.ast.expr.EnclosedExpr;
import com.github.javaparser.ast.expr.Expression;
import com.github.javaparser.ast.expr.FieldAccessExpr;
import com.github.javaparser.ast.expr.InstanceOfExpr;
import com.github.javaparser.ast.expr.IntegerLiteralExpr;
import com.github.javaparser.ast.expr.IntegerLiteralMinValueExpr;
import com.github.javaparser.ast.expr.LambdaExpr;
import com.github.javaparser.ast.expr.LongLiteralExpr;
import com.github.javaparser.ast.expr.LongLiteralMinValueExpr;
import com.github.javaparser.ast.expr.MarkerAnnotationExpr;
import com.github.javaparser.ast.expr.MemberValuePair;
import com.github.javaparser.ast.expr.MethodCallExpr;
import com.github.javaparser.ast.expr.MethodReferenceExpr;
import com.github.javaparser.ast.expr.Name;
import com.github.javaparser.ast.expr.NameExpr;
import com.github.javaparser.ast.expr.NormalAnnotationExpr;
import com.github.javaparser.ast.expr.NullLiteralExpr;
import com.github.javaparser.ast.expr.ObjectCreationExpr;
import com.github.javaparser.ast.expr.SimpleName;
import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr;
import com.github.javaparser.ast.expr.StringLiteralExpr;
import com.github.javaparser.ast.expr.SuperExpr;
import com.github.javaparser.ast.expr.ThisExpr;
import com.github.javaparser.ast.expr.TypeExpr;
import com.github.javaparser.ast.expr.UnaryExpr;
import com.github.javaparser.ast.expr.VariableDeclarationExpr;
import com.github.javaparser.ast.imports.EmptyImportDeclaration;
import com.github.javaparser.ast.imports.SingleStaticImportDeclaration;
import com.github.javaparser.ast.imports.SingleTypeImportDeclaration;
import com.github.javaparser.ast.imports.StaticImportOnDemandDeclaration;
import com.github.javaparser.ast.imports.TypeImportOnDemandDeclaration;
import com.github.javaparser.ast.nodeTypes.NodeWithTypeArguments;
import com.github.javaparser.ast.stmt.AssertStmt;
import com.github.javaparser.ast.stmt.BlockStmt;
import com.github.javaparser.ast.stmt.BreakStmt;
import com.github.javaparser.ast.stmt.CatchClause;
import com.github.javaparser.ast.stmt.ContinueStmt;
import com.github.javaparser.ast.stmt.DoStmt;
import com.github.javaparser.ast.stmt.EmptyStmt;
import com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt;
import com.github.javaparser.ast.stmt.ExpressionStmt;
import com.github.javaparser.ast.stmt.ForStmt;
import com.github.javaparser.ast.stmt.ForeachStmt;
import com.github.javaparser.ast.stmt.IfStmt;
import com.github.javaparser.ast.stmt.LabeledStmt;
import com.github.javaparser.ast.stmt.ReturnStmt;
import com.github.javaparser.ast.stmt.Statement;
import com.github.javaparser.ast.stmt.SwitchEntryStmt;
import com.github.javaparser.ast.stmt.SwitchStmt;
import com.github.javaparser.ast.stmt.SynchronizedStmt;
import com.github.javaparser.ast.stmt.ThrowStmt;
import com.github.javaparser.ast.stmt.TryStmt;
import com.github.javaparser.ast.stmt.TypeDeclarationStmt;
import com.github.javaparser.ast.stmt.WhileStmt;
import com.github.javaparser.ast.type.ArrayType;
import com.github.javaparser.ast.type.ClassOrInterfaceType;
import com.github.javaparser.ast.type.IntersectionType;
import com.github.javaparser.ast.type.PrimitiveType;
import com.github.javaparser.ast.type.ReferenceType;
import com.github.javaparser.ast.type.Type;
import com.github.javaparser.ast.type.TypeParameter;
import com.github.javaparser.ast.type.UnionType;
import com.github.javaparser.ast.type.UnknownType;
import com.github.javaparser.ast.type.VoidType;
import com.github.javaparser.ast.type.WildcardType;
import com.github.javaparser.ast.visitor.VoidVisitor;

/**
* Outputs the AST as formatted Java source code.
Expand Down Expand Up @@ -195,8 +288,8 @@ public void visit(final NameExpr n, final Void arg) {
@Override
public void visit(final Name n, final Void arg) {
printJavaComment(n.getComment(), arg);
if(n.getQualifier()!=null) {
n.getQualifier().accept(this, arg);
if (n.getQualifier().isPresent()) {
n.getQualifier().get().accept(this, arg);
printer.print(".");
}
printer.print(n.getIdentifier());
Expand Down

0 comments on commit aabc552

Please sign in to comment.