From f8ee314a0ab042b108d3fe50c6869707e92fd964 Mon Sep 17 00:00:00 2001 From: depryf Date: Tue, 5 Jul 2016 16:01:13 -0400 Subject: [PATCH] Move GUI resources into a GUI package. --- .gitignore | 2 +- .../java/com/imsweb/naaccrxml/gui/Standalone.java | 8 ++++---- src/main/resources/{ => gui}/help/help.html | 0 .../resources/{ => gui}/icons/configure_active.png | Bin .../{ => gui}/icons/configure_inactive.png | Bin .../resources/{ => gui}/icons/dictionary_active.png | Bin .../{ => gui}/icons/dictionary_inactive.png | Bin src/main/resources/{ => gui}/icons/edit_active.png | Bin .../resources/{ => gui}/icons/edit_inactive.png | Bin .../{ => gui}/icons/flat_to_xml_active.png | Bin .../{ => gui}/icons/flat_to_xml_inactive.png | Bin src/main/resources/{ => gui}/icons/readme.txt | 2 +- .../resources/{ => gui}/icons/samples_active.png | Bin .../resources/{ => gui}/icons/samples_inactive.png | Bin .../resources/{ => gui}/icons/validate_active.png | Bin .../resources/{ => gui}/icons/validate_inactive.png | Bin .../{ => gui}/icons/xml_to_flat_active.png | Bin .../{ => gui}/icons/xml_to_flat_inactive.png | Bin 18 files changed, 6 insertions(+), 6 deletions(-) rename src/main/resources/{ => gui}/help/help.html (100%) rename src/main/resources/{ => gui}/icons/configure_active.png (100%) rename src/main/resources/{ => gui}/icons/configure_inactive.png (100%) rename src/main/resources/{ => gui}/icons/dictionary_active.png (100%) rename src/main/resources/{ => gui}/icons/dictionary_inactive.png (100%) rename src/main/resources/{ => gui}/icons/edit_active.png (100%) rename src/main/resources/{ => gui}/icons/edit_inactive.png (100%) rename src/main/resources/{ => gui}/icons/flat_to_xml_active.png (100%) rename src/main/resources/{ => gui}/icons/flat_to_xml_inactive.png (100%) rename src/main/resources/{ => gui}/icons/readme.txt (69%) rename src/main/resources/{ => gui}/icons/samples_active.png (100%) rename src/main/resources/{ => gui}/icons/samples_inactive.png (100%) rename src/main/resources/{ => gui}/icons/validate_active.png (100%) rename src/main/resources/{ => gui}/icons/validate_inactive.png (100%) rename src/main/resources/{ => gui}/icons/xml_to_flat_active.png (100%) rename src/main/resources/{ => gui}/icons/xml_to_flat_inactive.png (100%) diff --git a/.gitignore b/.gitignore index abb64b9c..fd6f334f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ *.war *.ear -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +# virtual machine crash logs, see http://www.java.com/en/download/gui.help/error_hotspot.xml hs_err_pid* # generic diff --git a/src/main/java/com/imsweb/naaccrxml/gui/Standalone.java b/src/main/java/com/imsweb/naaccrxml/gui/Standalone.java index f2b1a3f8..fb85b23a 100644 --- a/src/main/java/com/imsweb/naaccrxml/gui/Standalone.java +++ b/src/main/java/com/imsweb/naaccrxml/gui/Standalone.java @@ -181,7 +181,7 @@ private static String getVersion() { @SuppressWarnings("ConstantConditions") private JButton createToolbarButton(final String text, final String pageId, final String description) { JButton btn = new JButton(); - btn.setIcon(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("icons/" + pageId + "_inactive.png"))); + btn.setIcon(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("gui/icons/" + pageId + "_inactive.png"))); btn.setOpaque(false); btn.setFocusPainted(false); btn.setFocusable(false); @@ -199,11 +199,11 @@ public void actionPerformed(ActionEvent e) { _layout.show(_centerPnl, pageId); for (JButton btn : _buttons) { if (btn.getActionCommand().equals(pageId)) { - btn.setIcon(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("icons/" + btn.getActionCommand() + "_active.png"))); + btn.setIcon(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("gui/icons/" + btn.getActionCommand() + "_active.png"))); btn.setForeground(Color.BLACK); } else { - btn.setIcon(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("icons/" + btn.getActionCommand() + "_inactive.png"))); + btn.setIcon(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("gui/icons/" + btn.getActionCommand() + "_inactive.png"))); btn.setForeground(Color.GRAY); } } @@ -222,7 +222,7 @@ else if ("menu-help".equals(cmd)) { try { File targetFile = File.createTempFile("naaccr-xml-help", ".html"); targetFile.deleteOnExit(); - InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("help/help.html"); + InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("gui/help/help.html"); OutputStream os = new FileOutputStream(targetFile); IOUtils.copy(is, os); is.close(); diff --git a/src/main/resources/help/help.html b/src/main/resources/gui/help/help.html similarity index 100% rename from src/main/resources/help/help.html rename to src/main/resources/gui/help/help.html diff --git a/src/main/resources/icons/configure_active.png b/src/main/resources/gui/icons/configure_active.png similarity index 100% rename from src/main/resources/icons/configure_active.png rename to src/main/resources/gui/icons/configure_active.png diff --git a/src/main/resources/icons/configure_inactive.png b/src/main/resources/gui/icons/configure_inactive.png similarity index 100% rename from src/main/resources/icons/configure_inactive.png rename to src/main/resources/gui/icons/configure_inactive.png diff --git a/src/main/resources/icons/dictionary_active.png b/src/main/resources/gui/icons/dictionary_active.png similarity index 100% rename from src/main/resources/icons/dictionary_active.png rename to src/main/resources/gui/icons/dictionary_active.png diff --git a/src/main/resources/icons/dictionary_inactive.png b/src/main/resources/gui/icons/dictionary_inactive.png similarity index 100% rename from src/main/resources/icons/dictionary_inactive.png rename to src/main/resources/gui/icons/dictionary_inactive.png diff --git a/src/main/resources/icons/edit_active.png b/src/main/resources/gui/icons/edit_active.png similarity index 100% rename from src/main/resources/icons/edit_active.png rename to src/main/resources/gui/icons/edit_active.png diff --git a/src/main/resources/icons/edit_inactive.png b/src/main/resources/gui/icons/edit_inactive.png similarity index 100% rename from src/main/resources/icons/edit_inactive.png rename to src/main/resources/gui/icons/edit_inactive.png diff --git a/src/main/resources/icons/flat_to_xml_active.png b/src/main/resources/gui/icons/flat_to_xml_active.png similarity index 100% rename from src/main/resources/icons/flat_to_xml_active.png rename to src/main/resources/gui/icons/flat_to_xml_active.png diff --git a/src/main/resources/icons/flat_to_xml_inactive.png b/src/main/resources/gui/icons/flat_to_xml_inactive.png similarity index 100% rename from src/main/resources/icons/flat_to_xml_inactive.png rename to src/main/resources/gui/icons/flat_to_xml_inactive.png diff --git a/src/main/resources/icons/readme.txt b/src/main/resources/gui/icons/readme.txt similarity index 69% rename from src/main/resources/icons/readme.txt rename to src/main/resources/gui/icons/readme.txt index 2b09c7ad..a42e1938 100644 --- a/src/main/resources/icons/readme.txt +++ b/src/main/resources/gui/icons/readme.txt @@ -1,4 +1,4 @@ -Free icons set: https://www.iconfinder.com/iconsets/ellegant +Free gui.icons set: https://www.iconfinder.com/iconsets/ellegant Downloaded PNG transparent ones. diff --git a/src/main/resources/icons/samples_active.png b/src/main/resources/gui/icons/samples_active.png similarity index 100% rename from src/main/resources/icons/samples_active.png rename to src/main/resources/gui/icons/samples_active.png diff --git a/src/main/resources/icons/samples_inactive.png b/src/main/resources/gui/icons/samples_inactive.png similarity index 100% rename from src/main/resources/icons/samples_inactive.png rename to src/main/resources/gui/icons/samples_inactive.png diff --git a/src/main/resources/icons/validate_active.png b/src/main/resources/gui/icons/validate_active.png similarity index 100% rename from src/main/resources/icons/validate_active.png rename to src/main/resources/gui/icons/validate_active.png diff --git a/src/main/resources/icons/validate_inactive.png b/src/main/resources/gui/icons/validate_inactive.png similarity index 100% rename from src/main/resources/icons/validate_inactive.png rename to src/main/resources/gui/icons/validate_inactive.png diff --git a/src/main/resources/icons/xml_to_flat_active.png b/src/main/resources/gui/icons/xml_to_flat_active.png similarity index 100% rename from src/main/resources/icons/xml_to_flat_active.png rename to src/main/resources/gui/icons/xml_to_flat_active.png diff --git a/src/main/resources/icons/xml_to_flat_inactive.png b/src/main/resources/gui/icons/xml_to_flat_inactive.png similarity index 100% rename from src/main/resources/icons/xml_to_flat_inactive.png rename to src/main/resources/gui/icons/xml_to_flat_inactive.png