refactor: more readable

Author: GaoYushanTw

src/main/java/org/jd/core/v1/ClassFileToJavaSourceDecompiler.java

@@ -13,12 +13,14 @@
 import org.jd.core.v1.model.classfile.ClassFile;
 import org.jd.core.v1.model.javasyntax.CompilationUnit;
 import org.jd.core.v1.model.message.DecompileContext;
+import org.jd.core.v1.model.token.Token;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.ClassFileToJavaSyntaxProcessor;
 import org.jd.core.v1.service.deserializer.classfile.ClassFileDeserializer;
 import org.jd.core.v1.service.fragmenter.javasyntaxtojavafragment.JavaSyntaxToJavaFragmentProcessor;
 import org.jd.core.v1.service.layouter.LayoutFragmentProcessor;
 import org.jd.core.v1.service.tokenizer.javafragmenttotoken.JavaFragmentToTokenProcessor;
 import org.jd.core.v1.service.writer.WriteTokenProcessor;
+import org.jd.core.v1.util.DefaultList;
 
 import java.util.Map;
 
@@ -59,7 +61,8 @@ protected void decompile(DecompileContext decompileContext) throws Exception {
         CompilationUnit compilationUnit = this.converter.process(decompileContext);
         this.fragmenter.process(compilationUnit, decompileContext);
         this.layouter.process(decompileContext);
-        this.tokenizer.process(decompileContext);
+        DefaultList<Token> tokens = this.tokenizer.process(decompileContext.getBody());
+        decompileContext.setTokens(tokens);
         this.writer.process(decompileContext);
     }
 }

src/main/java/org/jd/core/v1/service/tokenizer/javafragmenttotoken/JavaFragmentToTokenProcessor.java

@@ -8,8 +8,9 @@
 package org.jd.core.v1.service.tokenizer.javafragmenttotoken;
 
 import org.jd.core.v1.model.javafragment.JavaFragment;
-import org.jd.core.v1.model.message.DecompileContext;
+import org.jd.core.v1.model.token.Token;
 import org.jd.core.v1.service.tokenizer.javafragmenttotoken.visitor.TokenizeJavaFragmentVisitor;
+import org.jd.core.v1.util.DefaultList;
 
 import java.util.List;
 
@@ -21,15 +22,14 @@
  */
 public class JavaFragmentToTokenProcessor {
 
-    public void process(DecompileContext decompileContext) throws Exception {
-        List<JavaFragment> fragments = decompileContext.getBody();
+    public DefaultList<Token> process(List<JavaFragment> fragments) throws Exception {
         TokenizeJavaFragmentVisitor visitor = new TokenizeJavaFragmentVisitor(fragments.size() * 3);
 
         // Create tokens
         for (JavaFragment fragment : fragments) {
             fragment.accept(visitor);
         }
 
-        decompileContext.setTokens(visitor.getTokens());
+        return visitor.getTokens();
     }
 }

src/test/java/org/jd/core/v1/AbstractJdTest.java

@@ -6,12 +6,14 @@
 import org.jd.core.v1.model.classfile.ClassFile;
 import org.jd.core.v1.model.javasyntax.CompilationUnit;
 import org.jd.core.v1.model.message.DecompileContext;
+import org.jd.core.v1.model.token.Token;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.ClassFileToJavaSyntaxProcessor;
 import org.jd.core.v1.service.deserializer.classfile.ClassFileDeserializer;
 import org.jd.core.v1.service.fragmenter.javasyntaxtojavafragment.JavaSyntaxToJavaFragmentProcessor;
 import org.jd.core.v1.service.layouter.LayoutFragmentProcessor;
 import org.jd.core.v1.service.tokenizer.javafragmenttotoken.JavaFragmentToTokenProcessor;
 import org.jd.core.v1.service.writer.WriteTokenProcessor;
+import org.jd.core.v1.util.DefaultList;
 
 import java.util.Collections;
 import java.util.Map;
@@ -37,7 +39,8 @@ protected String decompile(Loader loader, Printer printer, String internalTypeNa
         CompilationUnit compilationUnit = converter.process(decompileContext);
         fragmenter.process(compilationUnit, decompileContext);
         layouter.process(decompileContext);
-        tokenizer.process(decompileContext);
+        DefaultList<Token> tokens = tokenizer.process(decompileContext.getBody());
+        decompileContext.setTokens(tokens);
         writer.process(decompileContext);
 
         String source = printer.toString();

src/test/java/org/jd/core/v1/JarFileToJavaSourceTest.java

@@ -13,6 +13,7 @@
 import org.jd.core.v1.model.classfile.ClassFile;
 import org.jd.core.v1.model.javasyntax.CompilationUnit;
 import org.jd.core.v1.model.message.DecompileContext;
+import org.jd.core.v1.model.token.Token;
 import org.jd.core.v1.printer.PlainTextPrinter;
 import org.jd.core.v1.util.DefaultList;
 import org.junit.Test;
@@ -162,7 +163,8 @@ protected void test(InputStream inputStream) throws Exception {
                         CompilationUnit compilationUnit = converter.process(decompileContext);
                         fragmenter.process(compilationUnit, decompileContext);
                         layouter.process(decompileContext);
-                        tokenizer.process(decompileContext);
+                        DefaultList<Token> tokens = tokenizer.process(decompileContext.getBody());
+                        decompileContext.setTokens(tokens);
                         writer.process(decompileContext);
                     } catch (AssertionError e) {
                         String msg = (e.getMessage() == null) ? "<?>" : e.getMessage();

src/test/java/org/jd/core/v1/JavaSyntaxToJavaSourceTest.java

@@ -18,11 +18,13 @@
 import org.jd.core.v1.model.javasyntax.type.Type;
 import org.jd.core.v1.model.javasyntax.type.Types;
 import org.jd.core.v1.model.message.DecompileContext;
+import org.jd.core.v1.model.token.Token;
 import org.jd.core.v1.printer.PlainTextMetaPrinter;
 import org.jd.core.v1.service.fragmenter.javasyntaxtojavafragment.JavaSyntaxToJavaFragmentProcessor;
 import org.jd.core.v1.service.layouter.LayoutFragmentProcessor;
 import org.jd.core.v1.service.tokenizer.javafragmenttotoken.JavaFragmentToTokenProcessor;
 import org.jd.core.v1.service.writer.WriteTokenProcessor;
+import org.jd.core.v1.util.DefaultList;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -153,7 +155,8 @@ public void testClassDeclaration() throws Exception {
 
         fragmenter.process(compilationUnit, decompileContext);
         layouter.process(decompileContext);
-        tokenizer.process(decompileContext);
+        DefaultList<Token> tokens = tokenizer.process(decompileContext.getBody());
+        decompileContext.setTokens(tokens);
         writer.process(decompileContext);
 
         String source = printer.toString();
@@ -194,7 +197,9 @@ public void testInterfaceDeclaration() throws Exception {
 
         fragmenter.process(compilationUnit, decompileContext);
         layouter.process(decompileContext);
-        tokenizer.process(decompileContext);
+        DefaultList<Token> tokens = tokenizer.process(decompileContext.getBody());
+        decompileContext.setTokens(tokens);
+
         writer.process(decompileContext);
 
         String source = printer.toString();
@@ -245,7 +250,9 @@ public void testEnumDayDeclaration() throws Exception {
 
         fragmenter.process(compilationUnit, decompileContext);
         layouter.process(decompileContext);
-        tokenizer.process(decompileContext);
+        DefaultList<Token> tokens = tokenizer.process(decompileContext.getBody());
+        decompileContext.setTokens(tokens);
+
         writer.process(decompileContext);
 
         String source = printer.toString();
@@ -529,9 +536,11 @@ public void testEnumPlanetDeclaration() throws Exception {
         decompileContext.setMinorVersion(0);
 
         fragmenter.process(compilationUnit, decompileContext);
-        layouter.process(decompileContext);
+        DefaultList<Token> tokens = tokenizer.process(decompileContext.getBody());
+        decompileContext.setTokens(tokens);
+
         //tokenizer.process(message);
-        new JavaFragmentToTokenProcessor().process(decompileContext);
+        tokens = new JavaFragmentToTokenProcessor().process(decompileContext.getBody());
         writer.process(decompileContext);
 
         String source = printer.toString();
@@ -600,7 +609,9 @@ public void testSwitch() throws Exception {
 
         fragmenter.process(compilationUnit, decompileContext);
         layouter.process(decompileContext);
-        tokenizer.process(decompileContext);
+        DefaultList<Token> tokens = tokenizer.process(decompileContext.getBody());
+        decompileContext.setTokens(tokens);
+
         writer.process(decompileContext);
 
         String source = printer.toString();
@@ -657,7 +668,9 @@ public void testBridgeAndSyntheticAttributes() throws Exception {
 
         fragmenter.process(compilationUnit, decompileContext);
         layouter.process(decompileContext);
-        tokenizer.process(decompileContext);
+        DefaultList<Token> tokens = tokenizer.process(decompileContext.getBody());
+        decompileContext.setTokens(tokens);
+
         writer.process(decompileContext);
 
         String source = printer.toString();