From 36615fc70b97b24b103c40db72898dc5209a03df Mon Sep 17 00:00:00 2001 From: Seth Morabito Date: Sun, 10 Aug 2014 15:19:59 -0700 Subject: [PATCH] Move images to resources --- .../com/loomcom/symon/ui/StatusPanel.java | 30 ++++++++++-------- .../symon/ui/images => resources}/B_off.png | Bin .../symon/ui/images => resources}/B_on.png | Bin .../symon/ui/images => resources}/C_off.png | Bin .../symon/ui/images => resources}/C_on.png | Bin .../symon/ui/images => resources}/D_off.png | Bin .../symon/ui/images => resources}/D_on.png | Bin .../symon/ui/images => resources}/I_off.png | Bin .../symon/ui/images => resources}/I_on.png | Bin .../symon/ui/images => resources}/N_off.png | Bin .../symon/ui/images => resources}/N_on.png | Bin .../symon/ui/images => resources}/O_off.png | Bin .../symon/ui/images => resources}/O_on.png | Bin .../symon/ui/images => resources}/Z_off.png | Bin .../symon/ui/images => resources}/Z_on.png | Bin 15 files changed, 16 insertions(+), 14 deletions(-) rename src/main/{java/com/loomcom/symon/ui/images => resources}/B_off.png (100%) rename src/main/{java/com/loomcom/symon/ui/images => resources}/B_on.png (100%) rename src/main/{java/com/loomcom/symon/ui/images => resources}/C_off.png (100%) rename src/main/{java/com/loomcom/symon/ui/images => resources}/C_on.png (100%) rename src/main/{java/com/loomcom/symon/ui/images => resources}/D_off.png (100%) rename src/main/{java/com/loomcom/symon/ui/images => resources}/D_on.png (100%) rename src/main/{java/com/loomcom/symon/ui/images => resources}/I_off.png (100%) rename src/main/{java/com/loomcom/symon/ui/images => resources}/I_on.png (100%) rename src/main/{java/com/loomcom/symon/ui/images => resources}/N_off.png (100%) rename src/main/{java/com/loomcom/symon/ui/images => resources}/N_on.png (100%) rename src/main/{java/com/loomcom/symon/ui/images => resources}/O_off.png (100%) rename src/main/{java/com/loomcom/symon/ui/images => resources}/O_on.png (100%) rename src/main/{java/com/loomcom/symon/ui/images => resources}/Z_off.png (100%) rename src/main/{java/com/loomcom/symon/ui/images => resources}/Z_on.png (100%) diff --git a/src/main/java/com/loomcom/symon/ui/StatusPanel.java b/src/main/java/com/loomcom/symon/ui/StatusPanel.java index 1cbc377..983d8a2 100644 --- a/src/main/java/com/loomcom/symon/ui/StatusPanel.java +++ b/src/main/java/com/loomcom/symon/ui/StatusPanel.java @@ -32,6 +32,8 @@ import javax.swing.border.EtchedBorder; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.logging.Level; +import java.util.logging.Logger; import java.util.regex.Pattern; /** @@ -106,20 +108,20 @@ public class StatusPanel extends JPanel { JPanel statusFlagsPanel = new JPanel(); statusFlagsPanel.setAlignmentX(LEFT_ALIGNMENT); - carryOn = new ImageIcon(this.getClass().getResource("images/C_on.png")); - carryOff = new ImageIcon(this.getClass().getResource("images/C_off.png")); - zeroOn = new ImageIcon(this.getClass().getResource("images/Z_on.png")); - zeroOff = new ImageIcon(this.getClass().getResource("images/Z_off.png")); - irqOn = new ImageIcon(this.getClass().getResource("images/I_on.png")); - irqOff = new ImageIcon(this.getClass().getResource("images/I_off.png")); - decimalOn = new ImageIcon(this.getClass().getResource("images/D_on.png")); - decimalOff = new ImageIcon(this.getClass().getResource("images/D_off.png")); - breakOn = new ImageIcon(this.getClass().getResource("images/B_on.png")); - breakOff = new ImageIcon(this.getClass().getResource("images/B_off.png")); - overflowOn = new ImageIcon(this.getClass().getResource("images/O_on.png")); - overflowOff = new ImageIcon(this.getClass().getResource("images/O_off.png")); - negativeOn = new ImageIcon(this.getClass().getResource("images/N_on.png")); - negativeOff = new ImageIcon(this.getClass().getResource("images/N_off.png")); + carryOn = new ImageIcon(this.getClass().getResource("/C_on.png")); + carryOff = new ImageIcon(this.getClass().getResource("/C_off.png")); + zeroOn = new ImageIcon(this.getClass().getResource("/Z_on.png")); + zeroOff = new ImageIcon(this.getClass().getResource("/Z_off.png")); + irqOn = new ImageIcon(this.getClass().getResource("/I_on.png")); + irqOff = new ImageIcon(this.getClass().getResource("/I_off.png")); + decimalOn = new ImageIcon(this.getClass().getResource("/D_on.png")); + decimalOff = new ImageIcon(this.getClass().getResource("/D_off.png")); + breakOn = new ImageIcon(this.getClass().getResource("/B_on.png")); + breakOff = new ImageIcon(this.getClass().getResource("/B_off.png")); + overflowOn = new ImageIcon(this.getClass().getResource("/O_on.png")); + overflowOff = new ImageIcon(this.getClass().getResource("/O_off.png")); + negativeOn = new ImageIcon(this.getClass().getResource("/N_on.png")); + negativeOff = new ImageIcon(this.getClass().getResource("/N_off.png")); // Initialize all to off carryFlagLabel = new JLabel(carryOff, JLabel.CENTER); diff --git a/src/main/java/com/loomcom/symon/ui/images/B_off.png b/src/main/resources/B_off.png similarity index 100% rename from src/main/java/com/loomcom/symon/ui/images/B_off.png rename to src/main/resources/B_off.png diff --git a/src/main/java/com/loomcom/symon/ui/images/B_on.png b/src/main/resources/B_on.png similarity index 100% rename from src/main/java/com/loomcom/symon/ui/images/B_on.png rename to src/main/resources/B_on.png diff --git a/src/main/java/com/loomcom/symon/ui/images/C_off.png b/src/main/resources/C_off.png similarity index 100% rename from src/main/java/com/loomcom/symon/ui/images/C_off.png rename to src/main/resources/C_off.png diff --git a/src/main/java/com/loomcom/symon/ui/images/C_on.png b/src/main/resources/C_on.png similarity index 100% rename from src/main/java/com/loomcom/symon/ui/images/C_on.png rename to src/main/resources/C_on.png diff --git a/src/main/java/com/loomcom/symon/ui/images/D_off.png b/src/main/resources/D_off.png similarity index 100% rename from src/main/java/com/loomcom/symon/ui/images/D_off.png rename to src/main/resources/D_off.png diff --git a/src/main/java/com/loomcom/symon/ui/images/D_on.png b/src/main/resources/D_on.png similarity index 100% rename from src/main/java/com/loomcom/symon/ui/images/D_on.png rename to src/main/resources/D_on.png diff --git a/src/main/java/com/loomcom/symon/ui/images/I_off.png b/src/main/resources/I_off.png similarity index 100% rename from src/main/java/com/loomcom/symon/ui/images/I_off.png rename to src/main/resources/I_off.png diff --git a/src/main/java/com/loomcom/symon/ui/images/I_on.png b/src/main/resources/I_on.png similarity index 100% rename from src/main/java/com/loomcom/symon/ui/images/I_on.png rename to src/main/resources/I_on.png diff --git a/src/main/java/com/loomcom/symon/ui/images/N_off.png b/src/main/resources/N_off.png similarity index 100% rename from src/main/java/com/loomcom/symon/ui/images/N_off.png rename to src/main/resources/N_off.png diff --git a/src/main/java/com/loomcom/symon/ui/images/N_on.png b/src/main/resources/N_on.png similarity index 100% rename from src/main/java/com/loomcom/symon/ui/images/N_on.png rename to src/main/resources/N_on.png diff --git a/src/main/java/com/loomcom/symon/ui/images/O_off.png b/src/main/resources/O_off.png similarity index 100% rename from src/main/java/com/loomcom/symon/ui/images/O_off.png rename to src/main/resources/O_off.png diff --git a/src/main/java/com/loomcom/symon/ui/images/O_on.png b/src/main/resources/O_on.png similarity index 100% rename from src/main/java/com/loomcom/symon/ui/images/O_on.png rename to src/main/resources/O_on.png diff --git a/src/main/java/com/loomcom/symon/ui/images/Z_off.png b/src/main/resources/Z_off.png similarity index 100% rename from src/main/java/com/loomcom/symon/ui/images/Z_off.png rename to src/main/resources/Z_off.png diff --git a/src/main/java/com/loomcom/symon/ui/images/Z_on.png b/src/main/resources/Z_on.png similarity index 100% rename from src/main/java/com/loomcom/symon/ui/images/Z_on.png rename to src/main/resources/Z_on.png