When unable to find deobfuscator jar, show stack trace if there is one.

Log searching directory and which file we loaded from.

Author: Janmm14

src/java/com/javadeobfuscator/deobfuscator/ui/SwingWindow.java

@@ -1335,16 +1335,16 @@ private static void fallbackLoad(String path)
 		{
 			File file = new File(path);
 			if (!file.exists())
-				throw new FallbackException("Loading error", "Path specified does not exist.");
+				throw new FallbackException("Loading error", "Path specified does not exist.", null);
 			try
 			{
 				WrapperFactory.setupJarLoader(file);
 			} catch (IOException e)
 			{
-				throw new FallbackException("Loading error", "IOException while reading file.");
+				throw new FallbackException("Loading error", "IOException while reading file.", e);
 			} catch (InvalidJarException e)
 			{
-				throw new FallbackException("Loading error", "Invaild JAR selected. Note that old versions of deobfuscator are not supported!");
+				throw new FallbackException("Loading error", "Invaild JAR selected. Note that old versions of deobfuscator are not supported!", e);
 			}
 			deob = WrapperFactory.getDeobfuscator();
 			trans = WrapperFactory.getTransformers();

src/java/com/javadeobfuscator/deobfuscator/ui/util/FallbackException.java

@@ -3,20 +3,25 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 
 import javax.swing.JButton;
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
 public class FallbackException extends Exception
 {
 	public String path;
 
-	public FallbackException(String title, String msg)
+	public FallbackException(String title, String msg, Throwable cause)
 	{
+		super(msg, cause);
+		this.printStackTrace();
 		JPanel fallback = new JPanel();
 		fallback.setLayout(new GridBagLayout());
 		GridBagConstraints gbc = new GridBagConstraints();
@@ -25,6 +30,12 @@ public FallbackException(String title, String msg)
 		gbc.gridwidth = GridBagConstraints.REMAINDER;
 		gbc.insets = new Insets(0, 0, 4, 0);
 		fallback.add(new JLabel(msg), gbc);
+		if (cause != null) {
+			gbc.gridy++;
+			JTextArea area = new JTextArea(getStackTrace(cause));
+			area.setEditable(false);
+			fallback.add(area, gbc);
+		}
 		gbc.gridy++;
 		fallback.add(new JLabel("Select deobfuscator.jar to try again:"), gbc);
 		gbc.gridy++;
@@ -53,4 +64,10 @@ public FallbackException(String title, String msg)
 			System.exit(0);
 		path = textField.getText();
 	}
+
+	private static String getStackTrace(Throwable t) {
+		StringWriter sw = new StringWriter();
+		t.printStackTrace(new PrintWriter(sw));
+		return sw.toString();
+	}
 }

src/java/com/javadeobfuscator/deobfuscator/ui/wrap/Deobfuscator.java

@@ -62,7 +62,7 @@ public Config getConfig() throws FallbackException
 				config = new Config(conf.newInstance());
 			} catch (Exception e)
 			{
-				throw new FallbackException("Loading Problem", "Could not create Config instance.");
+				throw new FallbackException("Loading Problem", "Could not create Config instance.", e);
 			}
 		}
 		return config;

src/java/com/javadeobfuscator/deobfuscator/ui/wrap/Transformers.java

@@ -57,7 +57,7 @@ public List<Class<?>> getTransformers() throws FallbackException
 			} catch (Exception e)
 			{
 				transformers.clear();
-				throw new FallbackException("Loading Problem", "Failed to parse transformer list.");
+				throw new FallbackException("Loading Problem", "Failed to parse transformer list.", e);
 			}
 		}
 		return transformers;

src/java/com/javadeobfuscator/deobfuscator/ui/wrap/WrapperFactory.java

@@ -73,6 +73,7 @@ public static void setupJarLoader(boolean recursive)
 	 */
 	private static ByteLoader fromJar(File jar) throws IOException, InvalidJarException
 	{
+		System.out.println("Loading deobfuscator from jar: " + jar.getAbsolutePath());
 		return new ByteLoader(readClasses(jar));
 	}
 
@@ -96,6 +97,7 @@ private static ByteLoader auto(boolean recurse)
 	 */
 	private static ByteLoader iter(File dir, boolean recurse)
 	{
+		System.out.println("Searching for deobfuscator in " + dir.getAbsolutePath());
 		File[] files = dir.listFiles();
 		// return if no files exist in the directory
 		if (files == null)