Fix decompilation of innerclasses, improve th support of cfr

Author: moacirrf

src/main/java/com/mrf/javadecompiler/decompiler/cfr/DecompilerClassImpl.java

@@ -20,18 +20,12 @@
 import static com.machinezoo.noexception.Exceptions.wrap;
 import com.mrf.javadecompiler.exception.ExceptionHandler;
 import com.mrf.javadecompiler.filesystems.FileSystemHelper;
-import static com.mrf.javadecompiler.filesystems.TempDir.getTempDir;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.Map;
 import org.benf.cfr.reader.Main;
 import org.benf.cfr.reader.apiunreleased.ClassFileSource2;
-import org.benf.cfr.reader.state.ClassFileSourceImpl;
 import org.benf.cfr.reader.state.DCCommonState;
-import org.benf.cfr.reader.util.AnalysisType;
 import org.benf.cfr.reader.util.getopt.Options;
 import org.benf.cfr.reader.util.getopt.OptionsImpl;
-import org.benf.cfr.reader.util.output.DumperFactory;
 import org.openide.filesystems.FileObject;
 
 /**
@@ -40,55 +34,28 @@
  */
 public final class DecompilerClassImpl implements Decompiler<String, FileObject> {
 
-    public static final String HEADER_COMMENT = "// Source code recreated by Apache Netbeans\n";
+    public static final String HEADER_COMMENT = "// Source code recreated by Apache Netbeans (NB Java Decompiler) \n";
 
     private final Options options;
-    private final ClassFileSource2 classFileSource;
-    private final DCCommonState dcCommonState;
 
     public DecompilerClassImpl() {
-        options = new OptionsImpl(Map.of("comments", "false"));
-        classFileSource = new ClassFileSourceImpl(options);
-        classFileSource.informAnalysisRelativePathDetail(null, null);
-        dcCommonState = new DCCommonState(options, classFileSource);
+        options = new OptionsImpl(Map.of("comments", "false", "innerclasses", "true"));
     }
 
     @Override
     public String decompile(FileObject file) {
         return wrap(ExceptionHandler::handleException).get(() -> {
 
+            String className = FileSystemHelper.extractName(file);
             FileSystemHelper helper = FileSystemHelper.of(file);
-            FileObject fileObject = helper.findResource(FileSystemHelper.extractName(file));
 
-            //copy class file to temp before decompile
-            Path classFile = getTempDir().resolve(fileObject.getName() + fileObject.getExt());
-            Files.write(classFile, fileObject.asBytes());
+            ClassFileSource2 classFileSource = new NetbeansClassFileSourceImpl(helper);
 
-            String decompiledClass = HEADER_COMMENT + decompile(classFile.toString());
-            
-            //remove class file after decompile
-            Files.delete(classFile);
+            StringBuilder out = new StringBuilder(HEADER_COMMENT);
+            Main.doClass(new DCCommonState(options, classFileSource), className, false, new PluginDumperFactory(out, options));
 
-            return decompiledClass;
+            return out.toString();
         });
     }
 
-    private String decompile(String classPath) {
-
-        StringBuilder out = new StringBuilder();
-
-        DumperFactory dumperFactory = new PluginDumperFactory(out, options);
-
-        AnalysisType type = options.getOption(OptionsImpl.ANALYSE_AS);
-
-        if (type == null || type == AnalysisType.DETECT) {
-            type = dcCommonState.detectClsJar(classPath);
-        }
-
-        if (type == AnalysisType.CLASS) {
-            Main.doClass(dcCommonState, classPath, false, dumperFactory);
-        }
-        return out.toString();
-    }
-
 }

src/main/java/com/mrf/javadecompiler/decompiler/cfr/NetbeansClassFileSourceImpl.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2022 moacirrf
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.mrf.javadecompiler.decompiler.cfr;
+
+import com.mrf.javadecompiler.filesystems.FileSystemHelper;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import static java.util.Objects.isNull;
+import org.benf.cfr.reader.apiunreleased.ClassFileSource2;
+import org.benf.cfr.reader.apiunreleased.JarContent;
+import org.benf.cfr.reader.bytecode.analysis.parse.utils.Pair;
+import org.benf.cfr.reader.util.AnalysisType;
+import org.openide.filesystems.FileObject;
+
+/**
+ *
+ * @author moacirrf
+ */
+public class NetbeansClassFileSourceImpl implements ClassFileSource2 {
+
+    private final FileSystemHelper helper;
+
+    public NetbeansClassFileSourceImpl(FileSystemHelper helper) {
+        this.helper = helper;
+    }
+
+    @Override
+    public JarContent addJarContent(String jarPath, AnalysisType analysisType) {
+        //we dont decompile complete jars
+        return null;
+    }
+
+    @Override
+    public void informAnalysisRelativePathDetail(String usePath, String classFilePath) {
+        // not used
+    }
+
+    @Override
+    public Collection<String> addJar(String jarPath) {
+         // not used
+        return List.of();
+    }
+
+    @Override
+    public String getPossiblyRenamedPath(String path) {
+        return path;
+    }
+
+    @Override
+    public Pair<byte[], String> getClassFileContent(String path) throws IOException {
+        FileObject fileObj = helper.findResource(path);
+        if (isNull(fileObj)) {
+            return null;
+        }
+
+        return Pair.make(fileObj.asBytes(), path);
+    }
+
+}

src/main/java/com/mrf/javadecompiler/decompiler/cfr/PluginDumperFactory.java

@@ -32,6 +32,9 @@
 import org.benf.cfr.reader.util.output.StringStreamDumper;
 import org.benf.cfr.reader.util.output.SummaryDumper;
 
+/*
+* Class entirely copied from cfr.jar 
+ */
 public class PluginDumperFactory implements DumperFactory {
 
     private final IllegalIdentifierDump illegalIdentifierDump = new IllegalIdentifierDump.Nop();