Included Fernflower as alternative to CFR

Author: moacirrf

src/main/java/io/github/moacirrf/javadecompiler/DecompileCfrAction.java

@@ -1,14 +1,17 @@
 package io.github.moacirrf.javadecompiler;
 
 import static com.machinezoo.noexception.Exceptions.wrap;
+
 import static java.util.Objects.nonNull;
+
 import io.github.moacirrf.javadecompiler.files.TempDir;
 import io.github.moacirrf.javadecompiler.validator.FileValidator;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+
 import org.netbeans.api.java.source.UiUtils;
 import org.openide.loaders.DataObject;
 import org.openide.awt.ActionID;
@@ -17,21 +20,21 @@
 import org.openide.awt.ActionRegistration;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle.Messages;
 
 @ActionID(
 	category = "Tools",
 	id = "io.github.moacirrf.javadecompiler.DecompileCfrAction"
 )
 @ActionRegistration(
-	displayName = "#CTL_DecompileWithCFR"
+	displayName = "#CTL_DecompileWithCFR",
+	iconInMenu = false
 )
 @ActionReferences({
-    @ActionReference(path = "Editors/Popup", position = 200),
-    @ActionReference(path = "UI/ToolActions", position = 200)
+    @ActionReference(path = "Editors/Popup/Decompile"),
+    @ActionReference(path = "UI/ToolActions/Decompile", position = 1)
 })
-@Messages("CTL_DecompileWithCFR=Decompile with CFR")
+@Messages("CTL_DecompileWithCFR=Decompile With CFR")
 public final class DecompileCfrAction implements ActionListener {
 
     private static final String DECOMPILER = "cfr";

src/main/java/io/github/moacirrf/javadecompiler/DecompileFernflowerAction.java

@@ -17,14 +17,17 @@
 package io.github.moacirrf.javadecompiler;
 
 import static com.machinezoo.noexception.Exceptions.wrap;
+
 import static java.util.Objects.nonNull;
+
 import io.github.moacirrf.javadecompiler.files.TempDir;
 import io.github.moacirrf.javadecompiler.validator.FileValidator;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+
 import org.netbeans.api.java.source.UiUtils;
 import org.openide.loaders.DataObject;
 import org.openide.awt.ActionID;
@@ -33,22 +36,22 @@
 import org.openide.awt.ActionRegistration;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle.Messages;
 
 @ActionID(
 	category = "Tools",
 	id = "io.github.moacirrf.javadecompiler.DecompileFernflowerAction"
 )
 @ActionRegistration(
-	displayName = "#CTL_DecompileWithFernflower"
+	displayName = "#CTL_DecompileWithFernflower",
+	iconInMenu = false
 )
 @ActionReferences({
-    @ActionReference(path = "Editors/Popup", position = 100),
-    @ActionReference(path = "UI/ToolActions", position = 100)
+    @ActionReference(path = "Editors/Popup/Decompile"),
+    @ActionReference(path = "UI/ToolActions/Decompile", position = 2)
 })
 @Messages({
-    "CTL_DecompileWithFernflower=Decompile with Fernflower"
+    "CTL_DecompileWithFernflower=Decompile With Fernflower"
 })
 public final class DecompileFernflowerAction implements ActionListener {
 

src/main/java/io/github/moacirrf/javadecompiler/fernflower/DecompilerClassImpl.java

@@ -76,6 +76,9 @@ private String decompileInternal(FileObject file) throws Exception {
 	IResultSaver saver = new StringResultSaver();
 
 	BaseDecompiler decompiler = new BaseDecompiler(provider, saver, options, logger);
+	if (!className.endsWith(".class")) {
+	    className = className + ".class";
+	}
 	decompiler.addSource(new java.io.File(className));
 	decompiler.decompileContext();