Move resources

LLVM-but-worse · May 13, 2017 · 2878774 · 2878774
1 parent 156ab9d
commit 2878774
Show file tree

Hide file tree

Showing 26 changed files with 26 additions and 26 deletions.
diff --git 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
@@ -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();

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
@@ -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
@@ -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 → src/main/resources/html/about.html b/src/main/resources/about.html → src/main/resources/html/about.html
diff --git a/src/main/resources/intro.html → src/main/resources/html/intro.html b/src/main/resources/intro.html → src/main/resources/html/intro.html
diff --git a/src/main/resources/1.gif → src/main/resources/images/1.gif b/src/main/resources/1.gif → src/main/resources/images/1.gif
diff --git a/src/main/resources/bat.png → src/main/resources/images/bat.png b/src/main/resources/bat.png → src/main/resources/images/bat.png
diff --git a/src/main/resources/busyIcon2.gif → src/main/resources/images/busyIcon2.gif b/src/main/resources/busyIcon2.gif → src/main/resources/images/busyIcon2.gif
diff --git a/src/main/resources/c#.png → src/main/resources/images/c#.png b/src/main/resources/c#.png → src/main/resources/images/c#.png
diff --git a/src/main/resources/c++.png → src/main/resources/images/c++.png b/src/main/resources/c++.png → src/main/resources/images/c++.png
diff --git a/src/main/resources/class.png → src/main/resources/images/class.png b/src/main/resources/class.png → src/main/resources/images/class.png
diff --git a/src/main/resources/config.png → src/main/resources/images/config.png b/src/main/resources/config.png → src/main/resources/images/config.png
diff --git a/src/main/resources/decoded.png → src/main/resources/images/decoded.png b/src/main/resources/decoded.png → src/main/resources/images/decoded.png
diff --git a/src/main/resources/file.png → src/main/resources/images/file.png b/src/main/resources/file.png → src/main/resources/images/file.png
diff --git a/src/main/resources/folder.png → src/main/resources/images/folder.png b/src/main/resources/folder.png → src/main/resources/images/folder.png
diff --git a/src/main/resources/icon.png → src/main/resources/images/icon.png b/src/main/resources/icon.png → src/main/resources/images/icon.png
diff --git a/src/main/resources/image.png → src/main/resources/images/image.png b/src/main/resources/image.png → src/main/resources/images/image.png
diff --git a/src/main/resources/jar.png → src/main/resources/images/jar.png b/src/main/resources/jar.png → src/main/resources/images/jar.png
diff --git a/src/main/resources/java.png → src/main/resources/images/java.png b/src/main/resources/java.png → src/main/resources/images/java.png
diff --git a/src/main/resources/nextIcon.png → src/main/resources/images/nextIcon.png b/src/main/resources/nextIcon.png → src/main/resources/images/nextIcon.png
diff --git a/src/main/resources/package.png → src/main/resources/images/package.png b/src/main/resources/package.png → src/main/resources/images/package.png
diff --git a/src/main/resources/prevIcon.png → src/main/resources/images/prevIcon.png b/src/main/resources/prevIcon.png → src/main/resources/images/prevIcon.png
diff --git a/src/main/resources/sh.png → src/main/resources/images/sh.png b/src/main/resources/sh.png → src/main/resources/images/sh.png
diff --git a/src/main/resources/text.png → src/main/resources/images/text.png b/src/main/resources/text.png → src/main/resources/images/text.png
diff --git a/src/main/resources/zip.png → src/main/resources/images/zip.png b/src/main/resources/zip.png → src/main/resources/images/zip.png