Refactor LoopStatementMaker

Author: emmanue1

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/CreateTypeFromTypeArgumentVisitor.java

@@ -0,0 +1,33 @@
+/*
+ * 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.service.converter.classfiletojavasyntax.visitor;
+
+import org.jd.core.v1.model.javasyntax.type.*;
+
+public class CreateTypeFromTypeArgumentVisitor extends AbstractNopTypeVisitor {
+    protected Type type;
+
+    public CreateTypeFromTypeArgumentVisitor() {
+        init();
+    }
+
+    public void init() {
+        type = null;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    @Override public void visit(WildcardExtendsTypeArgument type) { this.type = type.getType(); }
+    @Override public void visit(WildcardSuperTypeArgument type) { this.type = type.getType(); }
+    @Override public void visit(PrimitiveType type) { this.type = type; }
+    @Override public void visit(ObjectType type) { this.type = type; }
+    @Override public void visit(InnerObjectType type) { this.type = type; }
+    @Override public void visit(GenericType type) { this.type = type; }
+}

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/RemoveLastContinueStatementVisitor.java

@@ -0,0 +1,65 @@
+/*
+ * 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.service.converter.classfiletojavasyntax.visitor;
+
+import org.jd.core.v1.model.javasyntax.AbstractJavaSyntaxVisitor;
+import org.jd.core.v1.model.javasyntax.statement.*;
+
+public class RemoveLastContinueStatementVisitor extends AbstractJavaSyntaxVisitor {
+    @Override
+    public void visit(Statements list) {
+        if (! list.isEmpty()) {
+            Statement last = (Statement)list.getLast();
+
+            if (last.getClass() == ContinueStatement.class) {
+                list.removeLast();
+                visit(list);
+            } else {
+                last.accept(this);
+            }
+        }
+    }
+
+    @Override public void visit(IfElseStatement statement) {
+        safeAccept(statement.getStatements());
+        statement.getElseStatements().accept(this);
+    }
+
+    @Override public void visit(TryStatement statement) {
+        statement.getTryStatements().accept(this);
+        safeAcceptListStatement(statement.getCatchClauses());
+        safeAccept(statement.getFinallyStatements());
+    }
+
+    @Override public void visit(SwitchStatement statement) { acceptListStatement(statement.getBlocks()); }
+    @Override public void visit(SwitchStatement.LabelBlock statement) { statement.getStatements().accept(this); }
+    @Override public void visit(SwitchStatement.MultiLabelsBlock statement) { statement.getStatements().accept(this); }
+    @Override public void visit(IfStatement statement) { safeAccept(statement.getStatements()); }
+    @Override public void visit(SynchronizedStatement statement) { safeAccept(statement.getStatements()); }
+    @Override public void visit(TryStatement.CatchClause statement) { safeAccept(statement.getStatements()); }
+
+    @Override public void visit(DoWhileStatement statement) {}
+    @Override public void visit(ForEachStatement statement) {}
+    @Override public void visit(ForStatement statement) {}
+    @Override public void visit(WhileStatement statement) {}
+    @Override public void visit(AssertStatement statement) {}
+    @Override public void visit(BreakStatement statement) {}
+    @Override public void visit(ByteCodeStatement statement) {}
+    @Override public void visit(CommentStatement statement) {}
+    @Override public void visit(ContinueStatement statement) {}
+    @Override public void visit(ExpressionStatement statement) {}
+    @Override public void visit(LabelStatement statement) {}
+    @Override public void visit(LambdaExpressionStatement statement) {}
+    @Override public void visit(LocalVariableDeclarationStatement statement) {}
+    @Override public void visit(ReturnExpressionStatement statement) {}
+    @Override public void visit(ReturnStatement statement) {}
+    @Override public void visit(SwitchStatement.ExpressionLabel statement) {}
+    @Override public void visit(ThrowStatement statement) {}
+    @Override public void visit(TypeDeclarationStatement statement) {}
+    @Override public void visit(TryStatement.Resource statement) {}
+}

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/SearchWildcardTypeArgumentVisitor.java

@@ -0,0 +1,50 @@
+/*
+ * 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.service.converter.classfiletojavasyntax.visitor;
+
+import org.jd.core.v1.model.javasyntax.type.AbstractTypeVisitor;
+import org.jd.core.v1.model.javasyntax.type.WildcardExtendsTypeArgument;
+import org.jd.core.v1.model.javasyntax.type.WildcardSuperTypeArgument;
+import org.jd.core.v1.model.javasyntax.type.WildcardTypeArgument;
+
+public class SearchWildcardTypeArgumentVisitor extends AbstractTypeVisitor {
+    protected boolean wildcardFound;
+    protected boolean wildcardSuperOrExtendsTypeFound;
+
+    public SearchWildcardTypeArgumentVisitor() {
+        init();
+    }
+
+    public void init() {
+        wildcardFound = false;
+        wildcardSuperOrExtendsTypeFound = false;
+    }
+
+    public boolean containsWildcard() {
+        return wildcardFound;
+    }
+
+    public boolean containsWildcardSuperOrExtendsType() {
+        return wildcardSuperOrExtendsTypeFound;
+    }
+
+    @Override
+    public void visit(WildcardTypeArgument type) {
+        wildcardFound = true;
+    }
+
+    @Override
+    public void visit(WildcardExtendsTypeArgument type) {
+        wildcardSuperOrExtendsTypeFound = true;
+    }
+
+    @Override
+    public void visit(WildcardSuperTypeArgument type) {
+        wildcardSuperOrExtendsTypeFound = true;
+    }
+}