Future Proof the build.xml / Update Procyon to 0.4.3

ReadMe.md

@@ -6,12 +6,8 @@ Decompiler Gui for Procyon<br>
 ## Screenshot
 ![Screen](http://puu.sh/3Ak9r.jpg)
 
-### Download
+### Downloads
 [Releases](https://github.com/deathmarine/Luyten/releases)<br>
-Windows<br>
-[Download](https://github.com/deathmarine/Luyten/releases/download/v0.3/Luyten.exe)<br>
-Linux/Mac OS<br>
-[Download](https://github.com/deathmarine/Luyten/releases/download/v0.3/Luyten.jar)<br>
 
 ### Bugs/Suggestions
 [Issues](https://github.com/deathmarine/Luyten/issues)<br>

build.xml

@@ -8,7 +8,9 @@
 
 	<path id="Model.classpath">
 		<pathelement location="bin" />
-		<pathelement location="lib/procyon-decompiler-0.4.2.jar" />
+		<fileset dir="lib">
+	    	<include name="**/*.jar"/>
+	    </fileset>
 	</path>
 
 	<taskdef name="launch4j"
@@ -86,7 +88,7 @@
 		</jar>
 		<zip destfile="dist/${ant.project.name}.jar">
 			<zipgroupfileset dir="lib"
-				includes="procyon-decompiler-0.4.2.jar" />
+				includes="*.jar" />
 			<zipgroupfileset dir="dist" includes="temp.jar" />
 		</zip>
 		<delete file="dist/temp.jar" />

src/com/modcrafting/luyten/Model.java

@@ -97,12 +97,12 @@ public class Model extends JFrame implements WindowListener {
     JCheckBox showSyntheticMembers;
     JCheckBox showNestedTypes;
     JCheckBox retainRedundantCasts;
+    JCheckBox showDebugInfo;
     JRadioButtonMenuItem java;
     JRadioButtonMenuItem bytecode;
     JRadioButtonMenuItem bytecodeAST;
     JProgressBar bar;
     JLabel label;
-    JMenu debugLanguagesMenu;
     HashSet<OpenFile> hmap = new HashSet<OpenFile>();
     boolean open = false;
     public static final String JENKINS_BUILD = "JENKINSBUILDNUMBER";
@@ -317,6 +317,10 @@ public void actionPerformed(ActionEvent arg0) {
         fileMenu.add(showSyntheticMembers);
         retainRedundantCasts = new JCheckBox("Retain Redundant Casts");
         fileMenu.add(retainRedundantCasts);
+        JMenu debugSettingsMenu = new JMenu("Debug Settings");
+        showDebugInfo = new JCheckBox("Include Error Diagnostics");
+        debugSettingsMenu.add(showDebugInfo);
+        fileMenu.add(debugSettingsMenu);
         fileMenu.addSeparator();
 
         languageLookup.put(Languages.java().getName(), Languages.java());
@@ -338,7 +342,7 @@ public void actionPerformed(ActionEvent arg0) {
         languagesGroup.add(bytecodeAST);
         fileMenu.add(bytecodeAST);
 
-        debugLanguagesMenu = new JMenu("Debug Languages");
+        JMenu debugLanguagesMenu = new JMenu("Debug Languages");
         for (final Language language : Languages.debug()) {
             final JRadioButtonMenuItem m = new JRadioButtonMenuItem(language.getName());
             m.getModel().setActionCommand(language.getName());
@@ -381,9 +385,9 @@ public void actionPerformed(ActionEvent event) {
             @Override
             public void actionPerformed(ActionEvent event) {
                 JOptionPane.showMessageDialog(null, 
-                		"Luyten Gui v0.4 Build#" + JENKINS_BUILD + "\n" +
+                		"Luyten Gui Build#" + JENKINS_BUILD + "\n" +
                 		"by Deathmarine\n\n" +
-                        "Powered By\nProcyon v0.4\n" +
+                        "Powered By\nProcyon\n" +
                         "(c) 2013 Mike Strobel\n\n" +
                         "RSyntaxTextArea\n" +
                         "(c) 2012 Robert Futrell\n" +
@@ -508,7 +512,7 @@ public void mouseClicked(MouseEvent event) {
                         settings.setShowNestedTypes(showNestedTypes.isSelected());
                         settings.setForceExplicitTypeArguments(forceExplicitTypes.isSelected());
                         settings.setRetainRedundantCasts(retainRedundantCasts.isSelected());
-
+                        settings.setIncludeErrorDiagnostics(showDebugInfo.isSelected());
                         //
                         // Note: You shouldn't ever need to set this.  It's only for languages that support catch
                         //       blocks without an exception variable.  Java doesn't allow this.  I think Scala does.
@@ -951,6 +955,7 @@ public void run() {
 		                    out.close();
 		                } catch (Exception e1) {
 		                    JOptionPane.showMessageDialog(null, e1.toString(), "Error!", JOptionPane.ERROR_MESSAGE);
+		                    e1.printStackTrace();
 		                }
 		                label.setText("Complete");
 		                bar.setVisible(false);