From 1fac1efba36fae41dbff0e83c64d2bfa643fd295 Mon Sep 17 00:00:00 2001 From: Krazy Date: Tue, 13 Jun 2017 04:34:06 +0000 Subject: [PATCH] Fix bazaar not updating when changing quests --- .../src/main/java/forge/GuiDesktop.java | 42 +++++++------------ .../java/forge/screens/bazaar/CBazaarUI.java | 5 +++ 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java index 48a8defa61d..79d0fd9eb9b 100644 --- a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java +++ b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java @@ -1,26 +1,6 @@ package forge; -import java.awt.Desktop; -import java.awt.Graphics2D; -import java.awt.Toolkit; -import java.awt.datatransfer.StringSelection; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Collection; -import java.util.List; - -import javax.swing.ImageIcon; -import javax.swing.JFileChooser; -import javax.swing.SwingUtilities; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Function; - import forge.assets.FSkinProp; import forge.assets.ISkinImage; import forge.download.GuiDownloadService; @@ -39,11 +19,7 @@ import forge.model.FModel; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.controllers.CEditorQuestCardShop; import forge.screens.match.CMatchUI; -import forge.sound.AltSoundSystem; -import forge.sound.AudioClip; -import forge.sound.AudioMusic; -import forge.sound.IAudioClip; -import forge.sound.IAudioMusic; +import forge.sound.*; import forge.toolbox.FOptionPane; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinImage; @@ -51,6 +27,19 @@ import forge.util.BuildInfo; import forge.util.Callback; import forge.util.FileUtil; import forge.util.OperatingSystem; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import java.awt.*; +import java.awt.datatransfer.StringSelection; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Collection; +import java.util.List; public class GuiDesktop implements IGuiBase { @Override @@ -273,6 +262,7 @@ public class GuiDesktop implements IGuiBase { @Override public void showBazaar() { Singletons.getControl().setCurrentScreen(FScreen.QUEST_BAZAAR); + FScreen.QUEST_BAZAAR.getController().update(); Singletons.getView().getFrame().validate(); } @@ -303,4 +293,4 @@ public class GuiDesktop implements IGuiBase { public void preventSystemSleep(boolean preventSleep) { OperatingSystem.preventSystemSleep(preventSleep); } -} \ No newline at end of file +} diff --git a/forge-gui-desktop/src/main/java/forge/screens/bazaar/CBazaarUI.java b/forge-gui-desktop/src/main/java/forge/screens/bazaar/CBazaarUI.java index 63dd04df846..861e902f012 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/bazaar/CBazaarUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/bazaar/CBazaarUI.java @@ -54,5 +54,10 @@ public enum CBazaarUI implements ICDoc { */ @Override public void update() { + SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { + view.getPnlSingleStall().updateStall(); + } + }); } }