diff --git a/SoundSense/resources/version.properties b/SoundSense/resources/version.properties
new file mode 100644
index 0000000..d62e369
--- /dev/null
+++ b/SoundSense/resources/version.properties
@@ -0,0 +1,4 @@
+# Development version information, replaced at runtime.
+release=1900-0
+buildDate=01-01-1900 00:00:00
+buildNum=0
diff --git a/SoundSense/src/cz/zweistein/df/soundsense/SoundSense.java b/SoundSense/src/cz/zweistein/df/soundsense/SoundSense.java
index 907e8a3..a36badb 100644
--- a/SoundSense/src/cz/zweistein/df/soundsense/SoundSense.java
+++ b/SoundSense/src/cz/zweistein/df/soundsense/SoundSense.java
@@ -1,134 +1,242 @@
-package cz.zweistein.df.soundsense;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.logging.Logger;
-
-import javax.swing.JOptionPane;
-import javax.swing.UIManager;
-
-import org.xml.sax.SAXException;
-
-import cz.zweistein.df.soundsense.config.ConfigurationXML;
-import cz.zweistein.df.soundsense.config.achievement.AchievementsXML;
-import cz.zweistein.df.soundsense.config.executor.ExecutorXML;
-import cz.zweistein.df.soundsense.config.sounds.SoundsXML;
-import cz.zweistein.df.soundsense.glue.Glue;
-import cz.zweistein.df.soundsense.gui.GameLogValidator;
-import cz.zweistein.df.soundsense.gui.Gui;
-import cz.zweistein.df.soundsense.input.file.LogReader;
-import cz.zweistein.df.soundsense.output.Procesor;
-import cz.zweistein.df.soundsense.output.achievements.AchievementsProcesor;
-import cz.zweistein.df.soundsense.output.call.ExecutorProcesor;
-import cz.zweistein.df.soundsense.output.sound.SoundProcesor;
-import cz.zweistein.df.soundsense.util.log.LoggerSource;
-
-public class SoundSense {
- private static final Logger LOGGER = LoggerSource.LOGGER;
-
- public static void main(String[] args) {
-
- setLookAndFeel();
-
- try {
-
- LOGGER.info("SoundSense for Dwarf Fortress is starting...");
- LOGGER.info(getVersionString());
-
- ConfigurationXML configurationXML = new ConfigurationXML("configuration.xml");
- new GameLogValidator(configurationXML).gamelogValidate();
- String gameBaseDir = new File(configurationXML.getGamelogPath()).getParentFile().getPath();
-
- LOGGER.info("Loading theme packs; default directory is " + configurationXML.getSoundpacksPath());
- SoundsXML soundsXML = new SoundsXML(configurationXML.getSoundpacksPath(), true, configurationXML.noWarnAbsolutePath());
- LOGGER.info("Done loading " + soundsXML.toString() + ", loaded " + soundsXML.getSounds().size() + " items.");
-
- LOGGER.info("Loading executors.");
- ExecutorXML executorXML = new ExecutorXML("./executor/");
- LOGGER.info("Done loading executors, loaded " + executorXML.getExecutors().size() + " items.");
-
- LOGGER.info("Loading achievements.");
- AchievementsXML achievementsXML = new AchievementsXML("./achievements/");
- LOGGER.info("Done loading achievements, loaded " + achievementsXML.getAchievementPatterns().size() + " items.");
-
- LOGGER.info("Attempting to listen to " + configurationXML.getGamelogPath());
- LogReader logReader = new LogReader(configurationXML.getGamelogPath(), configurationXML.getGamelogEncoding());
- LOGGER.info("Listening to " + configurationXML.getGamelogPath());
-
- List<Procesor> procesors = new ArrayList<Procesor>(2);
- SoundProcesor sp = new SoundProcesor(soundsXML, configurationXML);
- procesors.add(sp);
- ExecutorProcesor ep = new ExecutorProcesor(executorXML, gameBaseDir);
- procesors.add(ep);
- AchievementsProcesor ap = new AchievementsProcesor(achievementsXML, configurationXML);
- procesors.add(ap);
-
- sp.setGlobalVolume(configurationXML.getVolume());
-
- Glue.glue(logReader, procesors);
-
- for (String supplementalLogPath : configurationXML.getSupplementalLogs()) {
- supplementalLogPath = supplementalLogPath.replace("${gameBaseDir}", gameBaseDir);
- if (new File(supplementalLogPath).exists()) {
- LOGGER.info("Attempting to listen to supplemental " + supplementalLogPath);
- LogReader supplementalLogReader = new LogReader(supplementalLogPath, configurationXML.getGamelogEncoding());
- Glue.glue(supplementalLogReader, procesors);
- } else {
- LOGGER.info("Supplemental log " + supplementalLogPath + " not found. That is okay if you are not using dfhack plugin.");
- }
- }
-
- if (configurationXML.getGui()) {
- Gui gui = Gui.newGui(configurationXML, sp, achievementsXML, ap);
-
- if (soundsXML.getSounds().size() < configurationXML.getExpectedMinimalSoundsCount()) {
- LOGGER.warning("It seems that there are too few sounds defined. Is soundpack installed?");
- int result = JOptionPane.showConfirmDialog(null,
- "It seems that there are too few sounds defined and thus soundpack might not be installed.\n"
- + "Easiest way to solve this issue is to go to tab 'Pack update' and click 'Start update' button.\n"
- + "Should I do that rightaway?", "SoundSense", JOptionPane.WARNING_MESSAGE, JOptionPane.YES_NO_OPTION);
- if (JOptionPane.YES_OPTION == result) {
- gui.triggerSoundPackUpdate();
- }
- }
-
- }
-
- } catch (IOException e) {
- LOGGER.severe("Exception :" + e + ": " + e.toString());
- } catch (SAXException e) {
- LOGGER.severe("Exception :" + e + ": " + e.toString());
- }
-
- }
-
- private static void setLookAndFeel() {
- try {
- UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Constructs human readable information about build and version.
- *
- * @return string with human readable version
- */
- public static String getVersionString() {
- Properties properties = new Properties();
- try {
- properties.load(SoundSense.class.getClassLoader().getResource("version.properties").openStream());
- return "release #" + properties.getProperty("release") + " build #" + properties.getProperty("buildNum") + " date "
- + properties.getProperty("buildDate");
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return "";
- }
-
-}
+package cz.zweistein.df.soundsense;
+
+import java.awt.AWTException;
+import java.awt.Container;
+import java.awt.MenuItem;
+import java.awt.PopupMenu;
+import java.awt.SystemTray;
+import java.awt.TrayIcon;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.swing.ImageIcon;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+import javax.swing.UIManager.LookAndFeelInfo;
+
+import org.xml.sax.SAXException;
+
+import cz.zweistein.df.soundsense.config.ConfigurationXML;
+import cz.zweistein.df.soundsense.config.achievement.AchievementsXML;
+import cz.zweistein.df.soundsense.config.executor.ExecutorXML;
+import cz.zweistein.df.soundsense.config.sounds.SoundsXML;
+import cz.zweistein.df.soundsense.glue.Glue;
+import cz.zweistein.df.soundsense.gui.GameLogValidator;
+import cz.zweistein.df.soundsense.gui.Gui;
+import cz.zweistein.df.soundsense.input.file.LogReader;
+import cz.zweistein.df.soundsense.output.Procesor;
+import cz.zweistein.df.soundsense.output.achievements.AchievementsProcesor;
+import cz.zweistein.df.soundsense.output.call.ExecutorProcesor;
+import cz.zweistein.df.soundsense.output.sound.SoundProcesor;
+import cz.zweistein.df.soundsense.util.log.LoggerSource;
+
+public class SoundSense {
+
+ private static final Logger LOGGER = LoggerSource.LOGGER;
+
+ private static Gui gui;
+
+ public static void main(String[] args) {
+
+ setupLookAndFeel();
+
+ try {
+
+ LOGGER.info("SoundSense for Dwarf Fortress is starting...");
+ LOGGER.info(getVersionString());
+
+ ConfigurationXML configurationXML = new ConfigurationXML("configuration.xml");
+ new GameLogValidator(configurationXML).gamelogValidate();
+ String gameBaseDir = new File(configurationXML.getGamelogPath()).getParentFile().getPath();
+
+ LOGGER.info("Loading theme packs; default directory is " + configurationXML.getSoundpacksPath());
+ SoundsXML soundsXML = new SoundsXML(configurationXML.getSoundpacksPath(), true, configurationXML.noWarnAbsolutePath());
+ LOGGER.info("Done loading " + soundsXML.toString() + ", loaded " + soundsXML.getSounds().size() + " items.");
+
+ LOGGER.info("Loading executors.");
+ ExecutorXML executorXML = new ExecutorXML("./executor/");
+ LOGGER.info("Done loading executors, loaded " + executorXML.getExecutors().size() + " items.");
+
+ LOGGER.info("Loading achievements.");
+ AchievementsXML achievementsXML = new AchievementsXML("./achievements/");
+ LOGGER.info("Done loading achievements, loaded " + achievementsXML.getAchievementPatterns().size() + " items.");
+
+ LOGGER.info("Attempting to listen to " + configurationXML.getGamelogPath());
+ LogReader logReader = new LogReader(configurationXML.getGamelogPath(), configurationXML.getGamelogEncoding());
+ LOGGER.info("Listening to " + configurationXML.getGamelogPath());
+
+ List<Procesor> procesors = new ArrayList<Procesor>(2);
+ SoundProcesor sp = new SoundProcesor(soundsXML, configurationXML);
+ procesors.add(sp);
+ ExecutorProcesor ep = new ExecutorProcesor(executorXML, gameBaseDir);
+ procesors.add(ep);
+ AchievementsProcesor ap = new AchievementsProcesor(achievementsXML, configurationXML);
+ procesors.add(ap);
+
+ sp.setGlobalVolume(configurationXML.getVolume());
+
+ Glue.glue(logReader, procesors);
+
+ for (String supplementalLogPath : configurationXML.getSupplementalLogs()) {
+ supplementalLogPath = supplementalLogPath.replace("${gameBaseDir}", gameBaseDir);
+ if (new File(supplementalLogPath).exists()) {
+ LOGGER.info("Attempting to listen to supplemental " + supplementalLogPath);
+ LogReader supplementalLogReader = new LogReader(supplementalLogPath, configurationXML.getGamelogEncoding());
+ Glue.glue(supplementalLogReader, procesors);
+ } else {
+ LOGGER.info("Supplemental log " + supplementalLogPath + " not found. That is okay if you are not using dfhack plugin.");
+ }
+ }
+
+ // Setting up the system tray icon is done here to allow the preceding
+ // dialogs to do their work without losing focus.
+ setupSystemTray();
+
+ if (configurationXML.getGui()) {
+ gui = Gui.newGui(configurationXML, sp, achievementsXML, ap);
+
+ if (soundsXML.getSounds().size() < configurationXML.getExpectedMinimalSoundsCount()) {
+ LOGGER.warning("It seems that there are too few sounds defined. Is soundpack installed?");
+ int result = JOptionPane.showConfirmDialog(null,
+ "It seems that there are too few sounds defined and thus soundpack might not be installed.\n"
+ + "Easiest way to solve this issue is to go to tab 'Pack update' and click 'Start update' button.\n"
+ + "Should I do that right away?", "SoundSense", JOptionPane.WARNING_MESSAGE, JOptionPane.YES_NO_OPTION);
+ if (JOptionPane.YES_OPTION == result) {
+ gui.triggerSoundPackUpdate();
+ }
+ }
+ }
+
+ } catch (IOException e) {
+ LOGGER.severe("Exception :" + e + ": " + e.toString());
+ } catch (SAXException e) {
+ LOGGER.severe("Exception :" + e + ": " + e.toString());
+ }
+ }
+
+ /**
+ * Constructs human readable information about build and version.
+ *
+ * @return string with human readable version
+ */
+ public static String getVersionString() {
+
+ Properties properties = new Properties();
+ String versionString = "Development";
+ InputStream is = null;
+ try {
+ is = SoundSense.class.getResourceAsStream("version.properties");
+ if (is != null) {
+ properties.load(is);
+ StringBuilder builder = new StringBuilder();
+ builder.append("release #").append(properties.getProperty("release")).append(" build #")
+ .append(properties.getProperty("buildNum")).append(" date ")
+ .append(properties.getProperty("buildDate"));
+ versionString = builder.toString();
+ }
+ } catch (IOException ex) {
+ LOGGER.log(Level.WARNING, "Failed to read version.properties from classpath", ex);
+ } finally {
+ closeStream(is);
+ }
+ return versionString;
+ }
+
+ private static void setupLookAndFeel() {
+ try {
+ // Check if the Nimbus LnF is present and use that if so.
+ for (LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
+ if ("Nimbus".equals(info.getName())) {
+ UIManager.setLookAndFeel(info.getClassName());
+ break;
+ }
+ }
+ } catch (Exception e) {
+ // If Nimbus is not available, fall back to the native LnF.
+ try {
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ } catch (Exception ex) {
+ // Won't occur.
+ }
+ }
+ }
+
+ private static void setupSystemTray() {
+
+ if (!SystemTray.isSupported()) {
+ LOGGER.warning("System tray is not supported");
+ return;
+ }
+
+ final PopupMenu popup = new PopupMenu();
+ final ImageIcon image = new ImageIcon("icons/icon.png");
+ final TrayIcon trayIcon = new TrayIcon(image.getImage(), "SoundSense");
+ final SystemTray tray = SystemTray.getSystemTray();
+
+ MenuItem showHideItem = new MenuItem("Show/Hide");
+ showHideItem.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (gui != null) {
+ JFrame window = getPanelParentFrame(gui);
+ window.setVisible(!window.isVisible());
+ }
+ }
+ });
+ MenuItem exitItem = new MenuItem("Exit");
+ exitItem.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ System.exit(0);
+ }
+ });
+ popup.add(showHideItem);
+ popup.add(exitItem);
+ trayIcon.setPopupMenu(popup);
+ try {
+ tray.add(trayIcon);
+ } catch (AWTException ex) {
+ LOGGER.log(Level.WARNING, "Failed to add system tray support", ex);
+ }
+ }
+
+ /**
+ * Closes a Closeable instance after checking it is a valid reference.
+ *
+ * @param closeable a Closeable instance or <code>null</code>.
+ */
+ private static void closeStream(Closeable closeable) {
+
+ if (closeable != null) {
+ try {
+ closeable.close();
+ } catch (Exception ex) {
+ LOGGER.log(Level.WARNING, "Failed to close stream cleanly", ex);
+ }
+ }
+ }
+
+ private static JFrame getPanelParentFrame(JPanel panel) {
+
+ Container container = panel.getParent();
+ while (container != null) {
+ if (container instanceof JFrame) {
+ return (JFrame) container;
+ } else {
+ container = container.getParent();
+ }
+ }
+ return null;
+ }
+}
Author
Topic: SoundSense: a sound engine for dwarf fortress. (Read 578711 times)