Branding

Change Java DisAssembler to JDA
Minor changes to window titles
Delete CommandLineInput (will be rewritten)
Delete useless line in SecurityMan
Add "Help" window to display the intro text
Update about window

Author: rcx

src/main/java/the/bytecode/club/jda/Boot.java

@@ -33,7 +33,7 @@ public static void boot() throws Exception
 
     public static void setState(BootSequence s)
     {
-        screen.setTitle("Initialzing Java DisAssembler - " + s.getMessage());
+        screen.setTitle("Initialzing JDA - " + s.getMessage());
         screen.getProgressBar().setValue(s.ordinal());
         System.out.println(s.getMessage());
     }

src/main/java/the/bytecode/club/jda/CommandLineInput.java

@@ -33,7 +33,7 @@ else if (i >= 440)
         else
             setSize(Toolkit.getDefaultToolkit().getScreenSize());
 
-        setTitle("Java DisAssembler Boot Screen - Starting Up");
+        setTitle("JDA - Loading");
         GridBagLayout gridBagLayout = new GridBagLayout();
         gridBagLayout.columnWidths = new int[] { 0, 0 };
         gridBagLayout.rowHeights = new int[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

src/main/java/the/bytecode/club/jda/InitialBootScreen.java

@@ -63,9 +63,8 @@ public static void main(String[] args)
         try
         {
             System.setSecurityManager(sm);
-            System.out.println("Java DisAssembler (BCV Fork) " + version);
-            CommandLineInput input = new CommandLineInput(args);
-            if (previewCopy && !input.containsCommand())
+            System.out.println("JDA (BCV Fork) v" + version);
+            if (previewCopy)
                 showMessage("WARNING: This is a preview/dev copy, you WON'T be alerted when " + version + " is actually out if you use this." + nl +
                         "Make sure to watch the repo: https://github.com/ecx86/jda for " + version + "'s release");
             getJDADirectory();
@@ -74,21 +73,10 @@ public static void main(String[] args)
                 throw new RuntimeException("Could not create recent files file");
             }
             recentFiles.addAll(FileUtils.readLines(filesFile, "UTF-8"));
-            int CLI = input.parseCommandLine();
-            if (CLI == CommandLineInput.STOP)
-                return;
-            if (CLI == CommandLineInput.OPEN_FILE)
-            {
-                Settings.loadGUI();
-                viewer = new MainViewerGUI();
-                Boot.boot();
-                JDA.BOOT(args, false);
-            }
-            else
-            {
-                JDA.BOOT(args, true);
-                input.executeCommandLine();
-            }
+            Settings.loadGUI();
+            viewer = new MainViewerGUI();
+            Boot.boot();
+            JDA.boot(args, false);
         }
         catch (Exception e)
         {
@@ -113,7 +101,7 @@ public void run()
      *
      * @param cli is it running CLI mode or not
      */
-    public static void BOOT(String[] args, boolean cli)
+    public static void boot(String[] args, boolean cli)
     {
         cleanup();
         Runtime.getRuntime().addShutdownHook(new Thread()
@@ -458,7 +446,7 @@ public static void resetWorkSpace(boolean ask)
             JOptionPane pane = new JOptionPane("Are you sure you want to reset the workspace?\n\rIt will also reset your file navigator and search.");
             Object[] options = new String[] { "Yes", "No" };
             pane.setOptions(options);
-            JDialog dialog = pane.createDialog(viewer, "Java DisAssembler - Reset Workspace");
+            JDialog dialog = pane.createDialog(viewer, "JDA - Reset Workspace");
             dialog.setVisible(true);
             Object obj = pane.getValue();
             int result = -1;
@@ -729,7 +717,7 @@ public String getDescription()
                             JOptionPane pane = new JOptionPane("Are you sure you wish to overwrite this existing file?");
                             Object[] options = new String[] { "Yes", "No" };
                             pane.setOptions(options);
-                            JDialog dialog = pane.createDialog(JDA.viewer, "Java DisAssembler - Overwrite File");
+                            JDialog dialog = pane.createDialog(JDA.viewer, "JDA - Overwrite File");
                             dialog.setVisible(true);
                             Object obj = pane.getValue();
                             int result = -1;

src/main/java/the/bytecode/club/jda/JDA.java

@@ -24,8 +24,7 @@ public void stopBlocking()
         if (executedClass.equals("CFRDecompiler") ||
                 executedClass.equals("ProcyonDecompiler") ||
                 executedClass.equals("FernFlowerDecompiler") ||
-                executedClass.equals("JDA") ||
-                executedClass.equals("the.bytecode.club.bytecodeviewer.compilers.JavaCompiler"))
+                executedClass.equals("JDA"))
         {
             blocking = false;
         }

src/main/java/the/bytecode/club/jda/SecurityMan.java

@@ -57,7 +57,7 @@ private void setup(Throwable e, String author)
     {
         this.setIconImages(Resources.iconList);
         setSize(new Dimension(600, 400));
-        setTitle("Java DisAssembler " + JDA.version + " - Stack Trace - Send this to " + author);
+        setTitle("JDA v" + JDA.version + " - Stack Trace - Send this to " + author);
         getContentPane().setLayout(new CardLayout(0, 0));
 
         JTextArea txtrBytecodeViewerIs = new JTextArea();
@@ -68,7 +68,7 @@ private void setup(Throwable e, String author)
         e.printStackTrace(new PrintWriter(sw));
         e.printStackTrace();
 
-        txtrBytecodeViewerIs.setText("Java DisAssembler Version: " + JDA.version +
+        txtrBytecodeViewerIs.setText("JDA v" + JDA.version +
                 ", Preview Copy: " + JDA.previewCopy +
                 JDA.nl + JDA.nl + sw.toString());
         this.setLocationRelativeTo(null);
@@ -79,7 +79,7 @@ private void setup(String e, String author)
     {
         this.setIconImages(Resources.iconList);
         setSize(new Dimension(600, 400));
-        setTitle("Java DisAssembler " + JDA.version + " - Stack Trace - Send this to " + author);
+        setTitle("JDA v" + JDA.version + " - Stack Trace - Send this to " + author);
         getContentPane().setLayout(new CardLayout(0, 0));
 
         JTextArea txtrBytecodeViewerIs = new JTextArea();

src/main/java/the/bytecode/club/jda/api/ExceptionUI.java

@@ -79,7 +79,7 @@ protected String parseException(Throwable e)
         StringWriter sw = new StringWriter();
         e.printStackTrace(new PrintWriter(sw));
         e.printStackTrace();
-        String exception = "Java DisAssembler Version: " + JDA.version + JDA.nl + JDA.nl + sw.toString();
+        String exception = "JDA v" + JDA.version + JDA.nl + JDA.nl + sw.toString();
         return getName() + " encountered a problem! Send the stacktrace to https://github.com/ecx86/jda/issues" + JDA.nl +
                 JDA.nl +
                 "Suggested Fix: Click refresh class, if it fails again try another decompiler." + JDA.nl +

src/main/java/the/bytecode/club/jda/decompilers/Decompiler.java

@@ -1,6 +1,7 @@
 package the.bytecode.club.jda.gui;
 
 import org.apache.commons.io.IOUtils;
+import the.bytecode.club.jda.JDA;
 import the.bytecode.club.jda.Resources;
 
 import javax.swing.*;
@@ -21,24 +22,26 @@ public class AboutWindow extends JFrame
     public AboutWindow()
     {
         this.setIconImages(Resources.iconList);
-        setSize(new Dimension(800, 800));
+        setSize(new Dimension(400, 400));
         setType(Type.UTILITY);
-        setTitle("Java DisAssembler - About - https://the.bytecode.club");
+        setTitle("JDA - About");
         getContentPane().setLayout(new CardLayout(0, 0));
         this.setResizable(false);
         this.setLocationRelativeTo(null);
 
         JScrollPane scrollPane = new JScrollPane();
         scrollPane.setHorizontalScrollBar(null);
 
-        getContentPane().add(scrollPane, "name_322439757638784");
+        getContentPane().add(scrollPane);
         editorPane = new JEditorPane();
         editorPane.setEditorKit(new HTMLEditorKit());
         editorPane.setContentType("text/html");
         editorPane.setEditable(false);
         try
         {
-            editorPane.setText(IOUtils.toString(Resources.class.getResourceAsStream("/intro.html"), "UTF-8"));
+            String text = IOUtils.toString(Resources.class.getResourceAsStream("/about.html"), "UTF-8");
+            text = text.replace("$JDA_VERSION$", JDA.version + (JDA.previewCopy ? " (preview)" : ""));
+            editorPane.setText(text);
         }
         catch (IOException e)
         {