Merge remote-tracking branch 'origin/issue_1304_generate_token_kind_enum' into issue_1304_generate_token_kind_enum

3 files changed, 12 insertions, 1 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/ImportDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/ImportDeclaration.java
index 408295cb8..b07872295 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/ImportDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/ImportDeclaration.java
@@ -20,11 +20,15 @@
  */
 package com.github.javaparser.ast;
 
+import com.github.javaparser.JavaParser;
 import com.github.javaparser.ast.expr.Name;
+import com.github.javaparser.ast.expr.SimpleName;
 import com.github.javaparser.ast.nodeTypes.NodeWithName;
 import com.github.javaparser.ast.observer.ObservableProperty;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
+
+import static com.github.javaparser.JavaParser.*;
 import static com.github.javaparser.utils.Utils.assertNotNull;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.visitor.CloneVisitor;
@@ -56,6 +60,10 @@ public final class ImportDeclaration extends Node implements NodeWithName<Import
         this(null, new Name(), false, false);
     }
 
+    public ImportDeclaration(String name, boolean isStatic, boolean isAsterisk) {
+        this(null, parseName(name), isStatic, isAsterisk);
+    }
+
     @AllFieldsConstructor
     public ImportDeclaration(Name name, boolean isStatic, boolean isAsterisk) {
         this(null, name, isStatic, isAsterisk);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java
index 8946e84bc..37eb18939 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java
@@ -39,6 +39,9 @@ import java.util.Optional;
  * An assignment expression. It supports the operators that are found the the AssignExpr.Operator enum.
  * <br/><code>a=5</code>
  * <br/><code>time+=500</code>
+ * <br/><code>watch.time+=500</code>
+ * <br/><code>(((time)))=100*60</code>
+ * <br/><code>peanut[a]=true</code>
  *
  * @author Julio Vilmar Gesser
  */
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java
index 5989a684a..c6b9e0a94 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java
@@ -144,7 +144,7 @@ public final class FieldAccessExpr extends Expression implements NodeWithSimpleN
     /**
      * Sets the scope
      *
-     * @param scope the scope, can be null
+     * @param scope the scope, can not be null
      * @return this, the FieldAccessExpr
      */
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")