Simplification

Author: emmanue1

src/main/java/org/jd/core/v1/model/javasyntax/expression/SuperExpression.java

@@ -1,31 +1,26 @@
 /*
- * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
  * This project is distributed under the GPLv3 license.
  * This is a Copyleft license that gives the user the right to use,
  * copy and modify the code freely for non-commercial purposes.
  */
 
 package org.jd.core.v1.model.javasyntax.expression;
 
-import org.jd.core.v1.model.javasyntax.type.ObjectType;
 import org.jd.core.v1.model.javasyntax.type.Type;
 
 public class SuperExpression extends AbstractLineNumberExpression {
-    protected ObjectType type;
+    protected Type type;
 
-    public SuperExpression(ObjectType type) {
+    public SuperExpression(Type type) {
         this.type = type;
     }
 
-    public SuperExpression(int lineNumber, ObjectType type) {
+    public SuperExpression(int lineNumber, Type type) {
         super(lineNumber);
         this.type = type;
     }
 
-    public ObjectType getObjectType() {
-        return type;
-    }
-
     @Override
     public Type getType() {
         return type;

src/main/java/org/jd/core/v1/model/javasyntax/expression/ThisExpression.java

@@ -1,34 +1,29 @@
 /*
- * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
  * This project is distributed under the GPLv3 license.
  * This is a Copyleft license that gives the user the right to use,
  * copy and modify the code freely for non-commercial purposes.
  */
 
 package org.jd.core.v1.model.javasyntax.expression;
 
-import org.jd.core.v1.model.javasyntax.type.ObjectType;
 import org.jd.core.v1.model.javasyntax.type.Type;
 
 public class ThisExpression extends AbstractLineNumberExpression {
-    protected ObjectType type;
+    protected Type type;
     protected boolean explicit;
 
-    public ThisExpression(ObjectType type) {
+    public ThisExpression(Type type) {
         this.type = type;
         this.explicit = true;
     }
 
-    public ThisExpression(int lineNumber, ObjectType type) {
+    public ThisExpression(int lineNumber, Type type) {
         super(lineNumber);
         this.type = type;
         this.explicit = true;
     }
 
-    public ObjectType getObjectType() {
-        return type;
-    }
-
     @Override
     public Type getType() {
         return type;

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/StatementMaker.java

@@ -880,7 +880,7 @@ protected Expression createObjectTypeReferenceDotClassExpression(int lineNumber,
 
         for (ClassFileFieldDeclaration field : bodyDeclaration.getFieldDeclarations()) {
             field.getFieldDeclarators().accept(memberVisitor);
-            if (memberVisitor.isFound()) {
+            if (memberVisitor.found()) {
                 field.setFlags(field.getFlags() | Constants.ACC_SYNTHETIC);
                 break;
             }
@@ -891,7 +891,7 @@ protected Expression createObjectTypeReferenceDotClassExpression(int lineNumber,
 
         for (ClassFileConstructorOrMethodDeclaration member : bodyDeclaration.getMethodDeclarations()) {
             member.accept(memberVisitor);
-            if (memberVisitor.isFound()) {
+            if (memberVisitor.found()) {
                 member.setFlags(member.getFlags() | Constants.ACC_SYNTHETIC);
                 break;
             }
@@ -964,7 +964,7 @@ public void init(String name) {
             this.found = false;
         }
 
-        public boolean isFound() {
+        public boolean found() {
             return found;
         }