Merge remote-tracking branch 'javaparser/master' into issue_547_null_range

# Conflicts:
#	javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/Node.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/imports/ImportDeclaration.java
#	javaparser-core/src/main/javacc/java_1_8.jj
#	javaparser-testing/src/test/java/com/github/javaparser/ast/imports/ImportDeclarationTest.java

1 files changed, 5 insertions, 3 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java
index 3977d1e86..37b29ba52 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java
@@ -23,6 +23,7 @@ package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
 import com.github.javaparser.ast.nodeTypes.NodeWithType;
+import com.github.javaparser.ast.observing.ObservableProperty;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.type.Type;
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -38,7 +39,7 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
  */
 public final class ClassExpr extends Expression implements NodeWithType<ClassExpr, Type<?>> {
 
-    private Type type;
+    private Type<?> type;
 
     public ClassExpr() {
         this(null, new ClassOrInterfaceType());
@@ -64,12 +65,13 @@ public final class ClassExpr extends Expression implements NodeWithType<ClassExp
     }
 
     @Override
-    public Type getType() {
+    public Type<?> getType() {
         return type;
     }
 
     @Override
-    public ClassExpr setType(Type type) {
+    public ClassExpr setType(Type<?> type) {
+        notifyPropertyChange(ObservableProperty.TYPE, this.type, type);
         this.type = type;
 		setAsParentNodeOf(this.type);
         return this;