Move resources

Author: rcx

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

@@ -53,7 +53,7 @@ else if (i >= 440)
         JEditorPane editorPane = new JEditorPane();
         editorPane.setEditorKit(new HTMLEditorKit());
         editorPane.setEditable(false);
-        editorPane.setText(IOUtils.toString(Resources.class.getResourceAsStream("/intro.html"), "UTF-8"));
+        editorPane.setText(IOUtils.toString(Resources.class.getResourceAsStream("/html/intro.html"), "UTF-8"));
 
         scrollPane.setViewportView(editorPane);
 

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

@@ -15,34 +15,34 @@
  */
 
 public class Resources {
-    public static ImageIcon nextIcon = new ImageIcon(Resources.class.getClass().getResource("/nextIcon.png"));
-    public static ImageIcon prevIcon = new ImageIcon(Resources.class.getClass().getResource("/prevIcon.png"));
-    public static ImageIcon busyIcon = new ImageIcon(Resources.class.getClass().getResource("/1.gif"));
-    public static ImageIcon busyB64Icon = new ImageIcon(Resources.class.getClass().getResource("/busyIcon2.gif"));
-    public static ImageIcon batIcon = new ImageIcon(Resources.class.getClass().getResource("/bat.png"));
-    public static ImageIcon shIcon = new ImageIcon(Resources.class.getClass().getResource("/sh.png"));
-    public static ImageIcon csharpIcon = new ImageIcon(Resources.class.getClass().getResource("/c#.png"));
-    public static ImageIcon cplusplusIcon = new ImageIcon(Resources.class.getClass().getResource("/c++.png"));
-    public static ImageIcon configIcon = new ImageIcon(Resources.class.getClass().getResource("/config.png"));
-    public static ImageIcon jarIcon = new ImageIcon(Resources.class.getClass().getResource("/jar.png"));
-    public static ImageIcon zipIcon = new ImageIcon(Resources.class.getClass().getResource("/zip.png"));
-    public static ImageIcon packagesIcon = new ImageIcon(Resources.class.getClass().getResource("/package.png"));
-    public static ImageIcon folderIcon = new ImageIcon(Resources.class.getClass().getResource("/folder.png"));
-    public static ImageIcon fileIcon = new ImageIcon(Resources.class.getClass().getResource("/file.png"));
-    public static ImageIcon textIcon = new ImageIcon(Resources.class.getClass().getResource("/text.png"));
-    public static ImageIcon classIcon = new ImageIcon(Resources.class.getClass().getResource("/class.png"));
-    public static ImageIcon imageIcon = new ImageIcon(Resources.class.getClass().getResource("/image.png"));
-    public static ImageIcon decodedIcon = new ImageIcon(Resources.class.getClass().getResource("/decoded.png"));
-    public static ImageIcon javaIcon = new ImageIcon(Resources.class.getClass().getResource("/java.png"));
-
-    public static ImageIcon fileNavigatorIcon = new ImageIcon(Resources.class.getClass().getResource("/icon.png"));
+    public static ImageIcon nextIcon = new ImageIcon(Resources.class.getClass().getResource("/images/nextIcon.png"));
+    public static ImageIcon prevIcon = new ImageIcon(Resources.class.getClass().getResource("/images/prevIcon.png"));
+    public static ImageIcon busyIcon = new ImageIcon(Resources.class.getClass().getResource("/images/1.gif"));
+    public static ImageIcon busyB64Icon = new ImageIcon(Resources.class.getClass().getResource("/images/busyIcon2.gif"));
+    public static ImageIcon batIcon = new ImageIcon(Resources.class.getClass().getResource("/images/bat.png"));
+    public static ImageIcon shIcon = new ImageIcon(Resources.class.getClass().getResource("/images/sh.png"));
+    public static ImageIcon csharpIcon = new ImageIcon(Resources.class.getClass().getResource("/images/c#.png"));
+    public static ImageIcon cplusplusIcon = new ImageIcon(Resources.class.getClass().getResource("/images/c++.png"));
+    public static ImageIcon configIcon = new ImageIcon(Resources.class.getClass().getResource("/images/config.png"));
+    public static ImageIcon jarIcon = new ImageIcon(Resources.class.getClass().getResource("/images/jar.png"));
+    public static ImageIcon zipIcon = new ImageIcon(Resources.class.getClass().getResource("/images/zip.png"));
+    public static ImageIcon packagesIcon = new ImageIcon(Resources.class.getClass().getResource("/images/package.png"));
+    public static ImageIcon folderIcon = new ImageIcon(Resources.class.getClass().getResource("/images/folder.png"));
+    public static ImageIcon fileIcon = new ImageIcon(Resources.class.getClass().getResource("/images/file.png"));
+    public static ImageIcon textIcon = new ImageIcon(Resources.class.getClass().getResource("/images/text.png"));
+    public static ImageIcon classIcon = new ImageIcon(Resources.class.getClass().getResource("/images/class.png"));
+    public static ImageIcon imageIcon = new ImageIcon(Resources.class.getClass().getResource("/images/image.png"));
+    public static ImageIcon decodedIcon = new ImageIcon(Resources.class.getClass().getResource("/images/decoded.png"));
+    public static ImageIcon javaIcon = new ImageIcon(Resources.class.getClass().getResource("/images/java.png"));
+
+    public static ImageIcon fileNavigatorIcon = new ImageIcon(Resources.class.getClass().getResource("/images/icon.png"));
 
     public static ArrayList<BufferedImage> iconList;
     public static BufferedImage icon;
 
     static {
         try {
-            icon = ImageIO.read(Resources.class.getClass().getResourceAsStream("/icon.png"));
+            icon = ImageIO.read(Resources.class.getClass().getResourceAsStream("/images/icon.png"));
         } catch (IOException e) {
             System.err.println("Failed to load program icon:");
             e.printStackTrace();

src/main/java/the/bytecode/club/jda/gui/dialogs/AboutWindow.java

@@ -36,9 +36,9 @@ public AboutWindow() {
         editorPane.setContentType("text/html");
         editorPane.setEditable(false);
         try {
-            String text = IOUtils.toString(Resources.class.getResourceAsStream("/about.html"), "UTF-8");
+            String text = IOUtils.toString(Resources.class.getResourceAsStream("/html/about.html"), "UTF-8");
             text = text.replace("$JDA_VERSION$", JDA.version + (JDA.previewCopy ? " (preview)" : ""));
-            text = text.replace("$JDA_ICON$", Resources.class.getClass().getResource("/icon.png").toString());
+            text = text.replace("$JDA_ICON$", Resources.class.getClass().getResource("/images/icon.png").toString());
             editorPane.setText(text);
         } catch (IOException e) {
             System.err.println("Couldn't load about html:");

src/main/java/the/bytecode/club/jda/gui/dialogs/IntroWindow.java

@@ -30,7 +30,7 @@ public IntroWindow() {
         editorPane.setContentType("text/html");
         editorPane.setEditable(false);
         try {
-            editorPane.setText(IOUtils.toString(Resources.class.getResourceAsStream("/intro.html"), "UTF-8"));
+            editorPane.setText(IOUtils.toString(Resources.class.getResourceAsStream("/html/intro.html"), "UTF-8"));
         } catch (IOException e) {
             System.err.println("Couldn't load intro html:");
             e.printStackTrace();