From daa9f63a16ee8355882f6e90771d2d29e0eff78c Mon Sep 17 00:00:00 2001 From: Doublestrike Date: Tue, 21 Feb 2012 12:42:32 +0000 Subject: [PATCH] Fixed bazaar refresh bug. Fixed dialog popup in splash mode. --- .../java/forge/control/ControlHomeUI.java | 6 ++ src/main/java/forge/control/FControl.java | 2 + .../control/home/ControlConstructed.java | 4 -- .../forge/quest/data/QuestEventManager.java | 4 +- .../java/forge/util/FolderStorageReader.java | 2 +- src/main/java/forge/view/Main.java | 61 ++++++++----------- src/main/java/forge/view/ViewHomeUI.java | 5 ++ 7 files changed, 43 insertions(+), 41 deletions(-) diff --git a/src/main/java/forge/control/ControlHomeUI.java b/src/main/java/forge/control/ControlHomeUI.java index 0bab5f87bfb..302724b3664 100644 --- a/src/main/java/forge/control/ControlHomeUI.java +++ b/src/main/java/forge/control/ControlHomeUI.java @@ -2,6 +2,7 @@ package forge.control; import forge.control.home.ControlConstructed; import forge.control.home.ControlDraft; +import forge.control.home.ControlQuest; import forge.control.home.ControlSealed; import forge.control.home.ControlUtilities; import forge.view.ViewHomeUI; @@ -43,6 +44,11 @@ public class ControlHomeUI { return view.getViewSealed().getControl(); } + /** @return ControlQuest */ + public ControlQuest getControlQuest() { + return view.getViewQuest().getControl(); + } + /** @return ControlUtilities */ public ControlUtilities getControlUtilities() { return view.getViewUtilities().getControl(); diff --git a/src/main/java/forge/control/FControl.java b/src/main/java/forge/control/FControl.java index 44045b3ae05..7612c646ad2 100644 --- a/src/main/java/forge/control/FControl.java +++ b/src/main/java/forge/control/FControl.java @@ -82,6 +82,7 @@ public enum FControl { public void windowClosing(final WindowEvent e) { Singletons.getView().setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); changeState(0); + Singletons.getControl().getControlHome().getControlQuest().refreshStats(); Singletons.getView().getViewHome().showQuestMenu(); } }; @@ -98,6 +99,7 @@ public enum FControl { public void initialize() { this.shortcuts = KeyboardShortcuts.attachKeyboardShortcuts(); this.display = Singletons.getView().getLayeredContentPane(); + Singletons.getModel().getQuestEventManager().assembleAllEvents(); // Handles resizing in null layouts of layers in JLayeredPane. Singletons.getView().addComponentListener(new ComponentAdapter() { diff --git a/src/main/java/forge/control/home/ControlConstructed.java b/src/main/java/forge/control/home/ControlConstructed.java index 647e4db384d..35276c371c7 100644 --- a/src/main/java/forge/control/home/ControlConstructed.java +++ b/src/main/java/forge/control/home/ControlConstructed.java @@ -330,10 +330,6 @@ public class ControlConstructed { } private String[] getEventNames() { - // Probably a better place for this, but it's a time consuming method, - // and must be completed before UI is built, and a better spot is hard to find. - Singletons.getModel().getQuestEventManager().assembleAllEvents(); - final List eventNames = new ArrayList(); eventNames.clear(); diff --git a/src/main/java/forge/quest/data/QuestEventManager.java b/src/main/java/forge/quest/data/QuestEventManager.java index 621484e8553..33f2ecb97f4 100644 --- a/src/main/java/forge/quest/data/QuestEventManager.java +++ b/src/main/java/forge/quest/data/QuestEventManager.java @@ -82,7 +82,7 @@ public class QuestEventManager { for (final File f : allFiles) { Map> contents = SectionUtil.parseSections(FileUtil.readFile(f)); - + if (contents.containsKey("quest")) { tempEvent = readChallenge(contents.get("quest")); this.allChallenges.add((QuestChallenge) tempEvent); @@ -163,7 +163,7 @@ public class QuestEventManager { int eqpos; String key, value; - final QuestChallenge qc = new QuestChallenge(); + final QuestChallenge qc = new QuestChallenge(); // Unique properties for (final String s : contents) { if (StringUtils.isBlank(s)) { diff --git a/src/main/java/forge/util/FolderStorageReader.java b/src/main/java/forge/util/FolderStorageReader.java index 7dbf76a25dc..0f3d990997a 100644 --- a/src/main/java/forge/util/FolderStorageReader.java +++ b/src/main/java/forge/util/FolderStorageReader.java @@ -90,7 +90,7 @@ public abstract class FolderStorageReader implements IItemRe if (null == newDeck) { String msg = "An object stored in " + file.getPath() + " failed to load.\nPlease submit this as a bug with the mentioned file/directory attached."; - // JOptionPane.showMessageDialog(null, msg); -- This becomes bugged if uncommented, but i need these messages to debug other peoples decks // Max Mtg + JOptionPane.showMessageDialog(null, msg); //-- This becomes bugged if uncommented, but i need these messages to debug other peoples decks // Max Mtg continue; } result.put(newDeck.getName(), newDeck); diff --git a/src/main/java/forge/view/Main.java b/src/main/java/forge/view/Main.java index 5d3deecc6b8..6cf95ecfa7b 100644 --- a/src/main/java/forge/view/Main.java +++ b/src/main/java/forge/view/Main.java @@ -17,8 +17,6 @@ */ package forge.view; -import javax.swing.SwingUtilities; - import forge.Singletons; import forge.control.FControl; import forge.error.ErrorViewer; @@ -61,39 +59,34 @@ public final class Main { // Open previous menu on first run, or constructed. // Focus is reset when the frame becomes visible, // so the call to show the menu must happen here. - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - final ForgePreferences.HomeMenus lastMenu = - ForgePreferences.HomeMenus.valueOf(Singletons.getModel().getPreferences().getPref(FPref.UI_HOMEMENU)); + final ForgePreferences.HomeMenus lastMenu = + ForgePreferences.HomeMenus.valueOf(Singletons.getModel().getPreferences().getPref(FPref.UI_HOMEMENU)); - switch(lastMenu) { - case draft: - Singletons.getView().getViewHome().getBtnDraft().grabFocus(); - Singletons.getView().getViewHome().showDraftMenu(); - break; - case sealed: - Singletons.getView().getViewHome().getBtnSealed().grabFocus(); - Singletons.getView().getViewHome().showSealedMenu(); - break; - case quest: - Singletons.getView().getViewHome().getBtnQuest().grabFocus(); - Singletons.getView().getViewHome().showQuestMenu(); - break; - case settings: - Singletons.getView().getViewHome().getBtnSettings().grabFocus(); - Singletons.getView().getViewHome().showSettingsMenu(); - break; - case utilities: - Singletons.getView().getViewHome().getBtnUtilities().grabFocus(); - Singletons.getView().getViewHome().showUtilitiesMenu(); - break; - default: - Singletons.getView().getViewHome().getBtnConstructed().grabFocus(); - Singletons.getView().getViewHome().showConstructedMenu(); - } - } - }); + switch(lastMenu) { + case draft: + Singletons.getView().getViewHome().getBtnDraft().grabFocus(); + Singletons.getView().getViewHome().showDraftMenu(); + break; + case sealed: + Singletons.getView().getViewHome().getBtnSealed().grabFocus(); + Singletons.getView().getViewHome().showSealedMenu(); + break; + case quest: + Singletons.getView().getViewHome().getBtnQuest().grabFocus(); + Singletons.getView().getViewHome().showQuestMenu(); + break; + case settings: + Singletons.getView().getViewHome().getBtnSettings().grabFocus(); + Singletons.getView().getViewHome().showSettingsMenu(); + break; + case utilities: + Singletons.getView().getViewHome().getBtnUtilities().grabFocus(); + Singletons.getView().getViewHome().showUtilitiesMenu(); + break; + default: + Singletons.getView().getViewHome().getBtnConstructed().grabFocus(); + Singletons.getView().getViewHome().showConstructedMenu(); + } } catch (final Throwable exn) { ErrorViewer.showError(exn); } diff --git a/src/main/java/forge/view/ViewHomeUI.java b/src/main/java/forge/view/ViewHomeUI.java index 77c674e125a..a9c2366752f 100644 --- a/src/main/java/forge/view/ViewHomeUI.java +++ b/src/main/java/forge/view/ViewHomeUI.java @@ -307,6 +307,11 @@ public class ViewHomeUI extends FPanel { return this.sealed; } + /** @return {@link forge.view.home.ViewQuest} */ + public ViewQuest getViewQuest() { + return this.quest; + } + /** @return {@link forge.view.home.ViewSettings} */ public ViewSettings getViewSettings() { return this.settings;