From 2878774ff57b41f290aa886686293cc954789305 Mon Sep 17 00:00:00 2001 From: rcx Date: Sat, 13 May 2017 01:23:27 -0400 Subject: [PATCH] Move resources --- .../bytecode/club/jda/InitialBootScreen.java | 2 +- .../java/the/bytecode/club/jda/Resources.java | 44 +++++++++--------- .../club/jda/gui/dialogs/AboutWindow.java | 4 +- .../club/jda/gui/dialogs/IntroWindow.java | 2 +- src/main/resources/{ => html}/about.html | 0 src/main/resources/{ => html}/intro.html | 0 src/main/resources/{ => images}/1.gif | Bin src/main/resources/{ => images}/bat.png | Bin src/main/resources/{ => images}/busyIcon2.gif | Bin src/main/resources/{ => images}/c#.png | Bin src/main/resources/{ => images}/c++.png | Bin src/main/resources/{ => images}/class.png | Bin src/main/resources/{ => images}/config.png | Bin src/main/resources/{ => images}/decoded.png | Bin src/main/resources/{ => images}/file.png | Bin src/main/resources/{ => images}/folder.png | Bin src/main/resources/{ => images}/icon.png | Bin src/main/resources/{ => images}/image.png | Bin src/main/resources/{ => images}/jar.png | Bin src/main/resources/{ => images}/java.png | Bin src/main/resources/{ => images}/nextIcon.png | Bin src/main/resources/{ => images}/package.png | Bin src/main/resources/{ => images}/prevIcon.png | Bin src/main/resources/{ => images}/sh.png | Bin src/main/resources/{ => images}/text.png | Bin src/main/resources/{ => images}/zip.png | Bin 26 files changed, 26 insertions(+), 26 deletions(-) rename src/main/resources/{ => html}/about.html (100%) rename src/main/resources/{ => html}/intro.html (100%) rename src/main/resources/{ => images}/1.gif (100%) rename src/main/resources/{ => images}/bat.png (100%) rename src/main/resources/{ => images}/busyIcon2.gif (100%) rename src/main/resources/{ => images}/c#.png (100%) rename src/main/resources/{ => images}/c++.png (100%) rename src/main/resources/{ => images}/class.png (100%) rename src/main/resources/{ => images}/config.png (100%) rename src/main/resources/{ => images}/decoded.png (100%) rename src/main/resources/{ => images}/file.png (100%) rename src/main/resources/{ => images}/folder.png (100%) rename src/main/resources/{ => images}/icon.png (100%) rename src/main/resources/{ => images}/image.png (100%) rename src/main/resources/{ => images}/jar.png (100%) rename src/main/resources/{ => images}/java.png (100%) rename src/main/resources/{ => images}/nextIcon.png (100%) rename src/main/resources/{ => images}/package.png (100%) rename src/main/resources/{ => images}/prevIcon.png (100%) rename src/main/resources/{ => images}/sh.png (100%) rename src/main/resources/{ => images}/text.png (100%) rename src/main/resources/{ => images}/zip.png (100%) diff --git a/src/main/java/the/bytecode/club/jda/InitialBootScreen.java b/src/main/java/the/bytecode/club/jda/InitialBootScreen.java index d1a4bbc..44572cd 100644 --- a/src/main/java/the/bytecode/club/jda/InitialBootScreen.java +++ b/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); diff --git a/src/main/java/the/bytecode/club/jda/Resources.java b/src/main/java/the/bytecode/club/jda/Resources.java index 539df39..9f8c2d2 100644 --- a/src/main/java/the/bytecode/club/jda/Resources.java +++ b/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 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(); diff --git a/src/main/java/the/bytecode/club/jda/gui/dialogs/AboutWindow.java b/src/main/java/the/bytecode/club/jda/gui/dialogs/AboutWindow.java index 3276b63..60b3b60 100644 --- a/src/main/java/the/bytecode/club/jda/gui/dialogs/AboutWindow.java +++ b/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:"); diff --git a/src/main/java/the/bytecode/club/jda/gui/dialogs/IntroWindow.java b/src/main/java/the/bytecode/club/jda/gui/dialogs/IntroWindow.java index 19b7208..67d36d1 100644 --- a/src/main/java/the/bytecode/club/jda/gui/dialogs/IntroWindow.java +++ b/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(); diff --git a/src/main/resources/about.html b/src/main/resources/html/about.html similarity index 100% rename from src/main/resources/about.html rename to src/main/resources/html/about.html diff --git a/src/main/resources/intro.html b/src/main/resources/html/intro.html similarity index 100% rename from src/main/resources/intro.html rename to src/main/resources/html/intro.html diff --git a/src/main/resources/1.gif b/src/main/resources/images/1.gif similarity index 100% rename from src/main/resources/1.gif rename to src/main/resources/images/1.gif diff --git a/src/main/resources/bat.png b/src/main/resources/images/bat.png similarity index 100% rename from src/main/resources/bat.png rename to src/main/resources/images/bat.png diff --git a/src/main/resources/busyIcon2.gif b/src/main/resources/images/busyIcon2.gif similarity index 100% rename from src/main/resources/busyIcon2.gif rename to src/main/resources/images/busyIcon2.gif diff --git a/src/main/resources/c#.png b/src/main/resources/images/c#.png similarity index 100% rename from src/main/resources/c#.png rename to src/main/resources/images/c#.png diff --git a/src/main/resources/c++.png b/src/main/resources/images/c++.png similarity index 100% rename from src/main/resources/c++.png rename to src/main/resources/images/c++.png diff --git a/src/main/resources/class.png b/src/main/resources/images/class.png similarity index 100% rename from src/main/resources/class.png rename to src/main/resources/images/class.png diff --git a/src/main/resources/config.png b/src/main/resources/images/config.png similarity index 100% rename from src/main/resources/config.png rename to src/main/resources/images/config.png diff --git a/src/main/resources/decoded.png b/src/main/resources/images/decoded.png similarity index 100% rename from src/main/resources/decoded.png rename to src/main/resources/images/decoded.png diff --git a/src/main/resources/file.png b/src/main/resources/images/file.png similarity index 100% rename from src/main/resources/file.png rename to src/main/resources/images/file.png diff --git a/src/main/resources/folder.png b/src/main/resources/images/folder.png similarity index 100% rename from src/main/resources/folder.png rename to src/main/resources/images/folder.png diff --git a/src/main/resources/icon.png b/src/main/resources/images/icon.png similarity index 100% rename from src/main/resources/icon.png rename to src/main/resources/images/icon.png diff --git a/src/main/resources/image.png b/src/main/resources/images/image.png similarity index 100% rename from src/main/resources/image.png rename to src/main/resources/images/image.png diff --git a/src/main/resources/jar.png b/src/main/resources/images/jar.png similarity index 100% rename from src/main/resources/jar.png rename to src/main/resources/images/jar.png diff --git a/src/main/resources/java.png b/src/main/resources/images/java.png similarity index 100% rename from src/main/resources/java.png rename to src/main/resources/images/java.png diff --git a/src/main/resources/nextIcon.png b/src/main/resources/images/nextIcon.png similarity index 100% rename from src/main/resources/nextIcon.png rename to src/main/resources/images/nextIcon.png diff --git a/src/main/resources/package.png b/src/main/resources/images/package.png similarity index 100% rename from src/main/resources/package.png rename to src/main/resources/images/package.png diff --git a/src/main/resources/prevIcon.png b/src/main/resources/images/prevIcon.png similarity index 100% rename from src/main/resources/prevIcon.png rename to src/main/resources/images/prevIcon.png diff --git a/src/main/resources/sh.png b/src/main/resources/images/sh.png similarity index 100% rename from src/main/resources/sh.png rename to src/main/resources/images/sh.png diff --git a/src/main/resources/text.png b/src/main/resources/images/text.png similarity index 100% rename from src/main/resources/text.png rename to src/main/resources/images/text.png diff --git a/src/main/resources/zip.png b/src/main/resources/images/zip.png similarity index 100% rename from src/main/resources/zip.png rename to src/main/resources/images/zip.png