From a97ded530a3b1ffa32cc6ea5cd12c13a70ae8053 Mon Sep 17 00:00:00 2001 From: drdev Date: Thu, 10 Apr 2014 00:21:53 +0000 Subject: [PATCH] Update install file references --- .../src/main/java/forge/menus/HelpMenu.java | 9 +++++---- .../screens/home/settings/CSubmenuReleaseNotes.java | 5 ++--- .../forge/screens/home/settings/VSubmenuDownloaders.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/menus/HelpMenu.java b/forge-gui-desktop/src/main/java/forge/menus/HelpMenu.java index 260f2851ad5..b121abb0b8d 100644 --- a/forge-gui-desktop/src/main/java/forge/menus/HelpMenu.java +++ b/forge-gui-desktop/src/main/java/forge/menus/HelpMenu.java @@ -1,5 +1,6 @@ package forge.menus; +import forge.properties.ForgeConstants; import forge.toolbox.FOptionPane; import forge.util.BuildInfo; import forge.util.FileUtil; @@ -73,25 +74,25 @@ public final class HelpMenu { private static JMenuItem getMenuItem_HowToPlayFile() { JMenuItem menuItem = new JMenuItem("How to Play"); - menuItem.addActionListener(getOpenFileAction(getFile("res\\howto.txt"))); + menuItem.addActionListener(getOpenFileAction(getFile(ForgeConstants.HOWTO_FILE))); return menuItem; } private static JMenuItem getMenuItem_ReadMeFile() { JMenuItem menuItem = new JMenuItem("README.txt"); - menuItem.addActionListener(getOpenFileAction(getFile("README.txt"))); + menuItem.addActionListener(getOpenFileAction(getFile(ForgeConstants.README_FILE))); return menuItem; } private static JMenuItem getMenuItem_License() { JMenuItem menuItem = new JMenuItem("Forge License"); - menuItem.addActionListener(getOpenFileAction(getFile("LICENSE.txt"))); + menuItem.addActionListener(getOpenFileAction(getFile(ForgeConstants.LICENSE_FILE))); return menuItem; } private static JMenuItem getMenuItem_ReleaseNotes() { JMenuItem menuItem = new JMenuItem("Release Notes"); - menuItem.addActionListener(getOpenFileAction(getFile("CHANGES.txt"))); + menuItem.addActionListener(getOpenFileAction(getFile(ForgeConstants.CHANGES_FILE))); return menuItem; } diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java index 6bfa71ab623..6878779b3e1 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java @@ -20,6 +20,7 @@ package forge.screens.home.settings; import forge.UiCommand; import forge.gui.framework.ICDoc; +import forge.properties.ForgeConstants; import forge.util.FileUtil; /** @@ -74,9 +75,8 @@ public enum CSubmenuReleaseNotes implements ICDoc { * Returns content of CHANGES.txt. */ private String getReleaseNotes() { - // !! Linux is case-sensitive so file name and extension need to match exactly !! - String filename = "CHANGES.txt"; + String filename = ForgeConstants.CHANGES_FILE; String filePath = FileUtil.pathCombine(System.getProperty("user.dir"), filename); String notes; @@ -88,5 +88,4 @@ public enum CSubmenuReleaseNotes implements ICDoc { return notes; } - } diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java index 47c42c7eaca..b1879909bc9 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java @@ -163,7 +163,7 @@ public enum VSubmenuDownloaders implements IVSubmenu { } public void showHowToPlay() { - FTextArea directions = new FTextArea(FileUtil.readFileToString(ForgeConstants.TEXT_HOWTO_FILE)); + FTextArea directions = new FTextArea(FileUtil.readFileToString(ForgeConstants.HOWTO_FILE)); final FScrollPane scr = new FScrollPane(directions, false, ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);