From 81934e32e35c807f6ca5b518a491c5f87fb935af Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 25 Jun 2015 01:07:34 +0200 Subject: [PATCH] * Revealing the top card of the library is now also shown by an extra window (no longer hiding life). Now Iconyfying and deiconifying does not change the postion of the reveal window. Iconifyed window width was a bit raised to be able to read more of the title in that state. --- .../src/main/java/mage/client/MageFrame.java | 127 ++-- .../main/java/mage/client/cards/Cards.java | 118 ++-- .../client/components/MageDesktopManager.java | 64 ++ .../client/dialog/CardInfoWindowDialog.java | 98 ++-- .../main/java/mage/client/game/GamePanel.java | 549 +++++++++--------- .../java/mage/client/game/PlayerPanelExt.java | 498 ++++++++-------- .../mage/client/util/gui/GuiDisplayUtil.java | 117 ++-- 7 files changed, 833 insertions(+), 738 deletions(-) create mode 100644 Mage.Client/src/main/java/mage/client/components/MageDesktopManager.java diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index 3848dc7941e..73b71ead8b3 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -1,30 +1,30 @@ /* -* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. -* -* Redistribution and use in source and binary forms, with or without modification, are -* permitted provided that the following conditions are met: -* -* 1. Redistributions of source code must retain the above copyright notice, this list of -* conditions and the following disclaimer. -* -* 2. Redistributions in binary form must reproduce the above copyright notice, this list -* of conditions and the following disclaimer in the documentation and/or other materials -* provided with the distribution. -* -* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED -* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR -* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* The views and conclusions contained in the software and documentation are those of the -* authors and should not be interpreted as representing official policies, either expressed -* or implied, of BetaSteward_at_googlemail.com. -*/ + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ package mage.client; import java.awt.AlphaComposite; @@ -85,6 +85,7 @@ import mage.cards.repository.CardRepository; import mage.client.cards.BigCard; import mage.client.chat.ChatPanel; import mage.client.components.MageComponents; +import mage.client.components.MageDesktopManager; import mage.client.components.MageJDesktop; import mage.client.components.MageRoundPane; import mage.client.components.MageUI; @@ -156,7 +157,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { private static final Preferences prefs = Preferences.userNodeForPackage(MageFrame.class); private JLabel title; private Rectangle titleRectangle; - private static final MageVersion version = new MageVersion(MageVersion.MAGE_VERSION_MAJOR, MageVersion.MAGE_VERSION_MINOR, MageVersion.MAGE_VERSION_PATCH, MageVersion.MAGE_VERSION_MINOR_PATCH, MageVersion.MAGE_VERSION_INFO); + private static final MageVersion version = new MageVersion(MageVersion.MAGE_VERSION_MAJOR, MageVersion.MAGE_VERSION_MINOR, MageVersion.MAGE_VERSION_PATCH, MageVersion.MAGE_VERSION_MINOR_PATCH, MageVersion.MAGE_VERSION_INFO); private UUID clientId; private static MagePane activeFrame; private static boolean liteMode = false; @@ -211,7 +212,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { */ public MageFrame() { setWindowTitle(); - + clientId = UUID.randomUUID(); EDTExceptionHandler.registerExceptionHandler(); addWindowListener(new WindowAdapter() { @@ -236,6 +237,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { Plugins.getInstance().loadPlugins(); initComponents(); + + desktopPane.setDesktopManager(new MageDesktopManager()); + setSize(1024, 768); SettingsManager.getInstance().setScreenWidthAndHeight(1024, 768); DialogManager.updateParams(768, 1024, false); @@ -366,9 +370,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { } public void setWindowTitle() { - setTitle(TITLE_NAME + " Client: " + setTitle(TITLE_NAME + " Client: " + version == null ? "" : version.toString() + " Server: " - + ((session != null && session.isConnected()) ? session.getVersionInfo():"")); + + ((session != null && session.isConnected()) ? session.getVersionInfo() : "")); } private void addTooltipContainer() { @@ -585,7 +589,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { if (frame instanceof GamePane) { ArrowBuilder.getBuilder().showPanel(((GamePane) frame).getGameId()); MusicPlayer.playBGM(); - }else{ + } else { MusicPlayer.stopBGM(); } } @@ -596,7 +600,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { if (activeFrame != frame) { frame.deactivated(); } - + } private static MagePane getTopMost(MagePane exclude) { @@ -618,11 +622,11 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { return topmost; } - /** + /** * Shows a game for a player of the game - * + * * @param gameId - * @param playerId + * @param playerId */ public void showGame(UUID gameId, UUID playerId) { try { @@ -638,7 +642,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { public void watchGame(UUID gameId) { try { - for(Component component :desktopPane.getComponents()) { + for (Component component : desktopPane.getComponents()) { if (component instanceof GamePane && ((GamePane) component).getGameId().equals(gameId)) { setActive((GamePane) component); @@ -678,7 +682,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { } catch (PropertyVetoException ex) { } } - + public void endDraft(UUID draftId) { // inform all open draft panes about for (JInternalFrame window : desktopPane.getAllFramesInLayer(JLayeredPane.DEFAULT_LAYER)) { @@ -688,12 +692,12 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { } } } - + public void showTournament(UUID tournamentId) { try { - for(Component component :desktopPane.getComponents()) { - if (component instanceof TournamentPane && - ((TournamentPane) component).getTournamentId().equals(tournamentId)) { + for (Component component : desktopPane.getComponents()) { + if (component instanceof TournamentPane + && ((TournamentPane) component).getTournamentId().equals(tournamentId)) { setActive((TournamentPane) component); return; } @@ -759,12 +763,12 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { connection.setProxyPort(proxyPort); connection.setProxyUsername(proxyUsername); connection.setProxyPassword(proxyPassword); - + setUserPrefsToConnection(connection); - + logger.debug("connecting (auto): " + proxyType + " " + proxyServer + " " + proxyPort + " " + proxyUsername); - if (MageFrame.connect(connection)) { - showGames(false); + if (MageFrame.connect(connection)) { + showGames(false); return true; } else { showMessage("Unable to connect to server"); @@ -778,12 +782,11 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { public void setUserPrefsToConnection(Connection connection) { connection.setUserData(PreferencesDialog.getUserData()); } - + /** - * This method is called from within the constructor to - * initialize the form. - * WARNING: Do NOT modify this code. The content of this method is - * always regenerated by the Form Editor. + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. */ @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents @@ -957,7 +960,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { session.disconnect(false); tablesPane.clearChat(); setWindowTitle(); - showMessage("You have disconnected"); + showMessage("You have disconnected"); } } else { connectDialog.showDialog(); @@ -1005,7 +1008,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { } } CardRepository.instance.closeDB(); - tablesPane.cleanUp(); + tablesPane.cleanUp(); Plugins.getInstance().shutdown(); dispose(); System.exit(0); @@ -1029,7 +1032,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { this.tablesPane.hideTables(); } - public void showGames(boolean setActive) { + public void showGames(boolean setActive) { MagePane topPanebefore = getTopMost(tablesPane); if (!tablesPane.isVisible()) { this.tablesPane.setVisible(true); @@ -1042,9 +1045,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { if (topPanebefore != null) { setActive(topPanebefore); } - } + } } - + public void hideGames() { JInternalFrame[] windows = desktopPane.getAllFramesInLayer(JLayeredPane.DEFAULT_LAYER); for (JInternalFrame window : windows) { @@ -1063,8 +1066,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { // close & remove sideboarding or construction pane if open if (window instanceof DeckEditorPane) { DeckEditorPane deckEditorPane = (DeckEditorPane) window; - if (deckEditorPane.getDeckEditorMode().equals(DeckEditorMode.LIMITED_BUILDING) - || deckEditorPane.getDeckEditorMode().equals(DeckEditorMode.SIDEBOARDING)){ + if (deckEditorPane.getDeckEditorMode().equals(DeckEditorMode.LIMITED_BUILDING) + || deckEditorPane.getDeckEditorMode().equals(DeckEditorMode.SIDEBOARDING)) { deckEditorPane.removeFrame(); } } @@ -1091,7 +1094,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { } } } - + try { DeckEditorPane deckEditorPane = new DeckEditorPane(); desktopPane.add(deckEditorPane, JLayeredPane.DEFAULT_LAYER); @@ -1167,7 +1170,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { * @param args the command line arguments */ public static void main(final String args[]) { - // Workaround for #451 + // Workaround for #451 System.setProperty("java.util.Arrays.useLegacyMergeSort", "true"); logger.info("Starting MAGE client version " + version); logger.info("Logging level: " + logger.getEffectiveLevel()); @@ -1205,7 +1208,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { } instance = new MageFrame(); instance.setVisible(true); - + } }); } @@ -1269,7 +1272,6 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { public static void removeGame(UUID gameId) { games.remove(gameId); } - public static DraftPanel getDraft(UUID draftId) { return drafts.get(draftId); @@ -1280,7 +1282,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { if (draftPanel != null) { drafts.remove(draftId); draftPanel.hideDraft(); - } + } } public static void addDraft(UUID draftId, DraftPanel draftPanel) { @@ -1368,6 +1370,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { } class MagePaneMenuItem extends JCheckBoxMenuItem { + private final MagePane frame; public MagePaneMenuItem(MagePane frame) { diff --git a/Mage.Client/src/main/java/mage/client/cards/Cards.java b/Mage.Client/src/main/java/mage/client/cards/Cards.java index 14c7109b1bc..abe5da510c6 100644 --- a/Mage.Client/src/main/java/mage/client/cards/Cards.java +++ b/Mage.Client/src/main/java/mage/client/cards/Cards.java @@ -1,37 +1,36 @@ /* -* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. -* -* Redistribution and use in source and binary forms, with or without modification, are -* permitted provided that the following conditions are met: -* -* 1. Redistributions of source code must retain the above copyright notice, this list of -* conditions and the following disclaimer. -* -* 2. Redistributions in binary form must reproduce the above copyright notice, this list -* of conditions and the following disclaimer in the documentation and/or other materials -* provided with the distribution. -* -* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED -* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR -* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* The views and conclusions contained in the software and documentation are those of the -* authors and should not be interpreted as representing official policies, either expressed -* or implied, of BetaSteward_at_googlemail.com. -*/ + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ /* * Cards.java * * Created on Dec 18, 2009, 10:40:12 AM */ - package mage.client.cards; import java.awt.Color; @@ -72,19 +71,21 @@ public class Cards extends javax.swing.JPanel { private static final int GAP_X = 5; // needed for marking cards with coloured fram (e.g. on hand) private String zone; - private static final Border emptyBorder = new EmptyBorder(0,0,0,0); + private static final Border emptyBorder = new EmptyBorder(0, 0, 0, 0); private int minOffsetY = 0; /** - * Defines whether component should be visible whenever there is no objects within. - * True by default. + * Defines whether component should be visible whenever there is no objects + * within. True by default. */ private boolean isVisibleIfEmpty = true; private Dimension cardDimension; - /** Creates new form Cards */ + /** + * Creates new form Cards + */ public Cards() { this(false); } @@ -93,7 +94,7 @@ public class Cards extends javax.swing.JPanel { initComponents(skipAddingScrollPane); setOpaque(false); //cardArea.setOpaque(false); - setBackgroundColor(new Color(0,0,0,100)); + setBackgroundColor(new Color(0, 0, 0, 100)); if (!skipAddingScrollPane) { jScrollPane1.setOpaque(false); jScrollPane1.getViewport().setOpaque(false); @@ -105,10 +106,12 @@ public class Cards extends javax.swing.JPanel { cardArea.setBorder(emptyBorder); } - public void cleanUp() {} + public void cleanUp() { + } /** * Sets components background color + * * @param color */ public void setBackgroundColor(Color color) { @@ -151,14 +154,14 @@ public class Cards extends javax.swing.JPanel { if (cardsView.size() == 0 && countCards() > 0) { // problem happens with transformable cards logger.fatal("Card object on the cards panel was not removed"); - for (Component comp: cardArea.getComponents()) { + for (Component comp : cardArea.getComponents()) { if (comp instanceof Card) { - Card card = (Card)comp; + Card card = (Card) comp; logger.fatal("Card name:" + card.getName() + " type:" + card.getType(null)); } else if (comp instanceof MageCard) { - MageCard mageCard = (MageCard)comp; + MageCard mageCard = (MageCard) comp; logger.fatal("MageCard name:" + mageCard.getName() + " toolTiptext:" + mageCard.getToolTipText()); - } else { + } else { logger.fatal("Unknown object:" + comp.getName() + " className:" + comp.getClass().getName()); } cardArea.remove(comp); @@ -167,24 +170,24 @@ public class Cards extends javax.swing.JPanel { // order objects for display java.util.List orderedList = new ArrayList<>(); - for (CardView card: cardsView.values()) { + for (CardView card : cardsView.values()) { orderedList.add(0, card); } // add objects to the panel - for (CardView card: orderedList) { + for (CardView card : orderedList) { if (dontDisplayTapped) { if (card instanceof PermanentView) { - ((PermanentView)card).overrideTapped(false); + ((PermanentView) card).overrideTapped(false); } } if (card instanceof StackAbilityView) { - CardView tmp = ((StackAbilityView)card).getSourceCard(); + CardView tmp = ((StackAbilityView) card).getSourceCard(); tmp.overrideRules(card.getRules()); tmp.setIsAbility(true); tmp.overrideTargets(card.getTargets()); tmp.overrideId(card.getId()); - tmp.setAbilityType(((StackAbilityView)card).getAbilityType()); + tmp.setAbilityType(((StackAbilityView) card).getAbilityType()); card = tmp; } else { card.setAbilityType(null); @@ -212,11 +215,15 @@ public class Cards extends javax.swing.JPanel { } public void sizeCards(Dimension cardDimension) { - cardArea.setPreferredSize(new Dimension((int)((cards.size()) * (cardDimension.getWidth() + GAP_X)) + 20, (int)(cardDimension.getHeight()) + 20)); + cardArea.setPreferredSize(new Dimension((int) ((cards.size()) * (cardDimension.getWidth() + GAP_X)) + 20, (int) (cardDimension.getHeight()) + 20)); cardArea.revalidate(); cardArea.repaint(); } + public int getNumberOfCards() { + return cards.size(); + } + private Dimension getCardDimension() { if (cardDimension == null) { cardDimension = new Dimension(Config.dimensions.frameWidth, Config.dimensions.frameHeight); @@ -237,23 +244,23 @@ public class Cards extends javax.swing.JPanel { private void definePosition(MageCard card) { int dx = 0; - for (Component comp: cardArea.getComponents()) { + for (Component comp : cardArea.getComponents()) { if (!comp.equals(card)) { - dx = Math.max(dx, (int)comp.getLocation().getX()); + dx = Math.max(dx, (int) comp.getLocation().getX()); } } - dx += ((CardPanel)card).getCardWidth() + GAP_X; - card.setLocation(dx, (int)card.getLocation().getY()); + dx += ((CardPanel) card).getCardWidth() + GAP_X; + card.setLocation(dx, (int) card.getLocation().getY()); } private void removeCard(UUID cardId) { - for (Component comp: cardArea.getComponents()) { + for (Component comp : cardArea.getComponents()) { if (comp instanceof Card) { - if (((Card)comp).getCardId().equals(cardId)) { + if (((Card) comp).getCardId().equals(cardId)) { cardArea.remove(comp); } } else if (comp instanceof MageCard) { - if (((MageCard)comp).getOriginal().getId().equals(cardId)) { + if (((MageCard) comp).getOriginal().getId().equals(cardId)) { cardArea.remove(comp); } } @@ -264,10 +271,10 @@ public class Cards extends javax.swing.JPanel { return cardArea.getComponentCount(); } - /** This method is called from within the constructor to - * initialize the form. - * WARNING: Do NOT modify this code. The content of this method is - * always regenerated by the Form Editor. + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. */ @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents @@ -288,7 +295,6 @@ public class Cards extends javax.swing.JPanel { } }// //GEN-END:initComponents - // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JPanel cardArea; private javax.swing.JScrollPane jScrollPane1; @@ -320,7 +326,7 @@ public class Cards extends javax.swing.JPanel { for (Component component : cardArea.getComponents()) { if (component instanceof CardPanel) { - cards.add((CardPanel)component); + cards.add((CardPanel) component); } } Collections.sort(cards, new Comparator() { diff --git a/Mage.Client/src/main/java/mage/client/components/MageDesktopManager.java b/Mage.Client/src/main/java/mage/client/components/MageDesktopManager.java new file mode 100644 index 00000000000..89ec52318f6 --- /dev/null +++ b/Mage.Client/src/main/java/mage/client/components/MageDesktopManager.java @@ -0,0 +1,64 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package mage.client.components; + +import java.awt.BorderLayout; +import javax.swing.DefaultDesktopManager; +import javax.swing.DesktopManager; +import javax.swing.JDesktopPane; +import javax.swing.JFrame; +import javax.swing.JInternalFrame; +import javax.swing.SwingUtilities; +import mage.client.dialog.CardInfoWindowDialog; + +/** + * + * @author LevelX2 + */ +public class MageDesktopManager extends DefaultDesktopManager { + + static final int DESKTOP_ICON_WIDTH = 250; + + @Override + public void iconifyFrame(JInternalFrame f) { + super.iconifyFrame(f); + if (f instanceof CardInfoWindowDialog) { + JInternalFrame.JDesktopIcon icon = f.getDesktopIcon(); + icon.setBounds(f.getX() + (f.getWidth() - DESKTOP_ICON_WIDTH), f.getY(), DESKTOP_ICON_WIDTH, icon.getHeight()); + } + } + + @Override + public void deiconifyFrame(JInternalFrame f) { + super.deiconifyFrame(f); + if (f instanceof CardInfoWindowDialog) { + JInternalFrame.JDesktopIcon icon = f.getDesktopIcon(); + f.setBounds(icon.getX() + (DESKTOP_ICON_WIDTH - f.getWidth()), icon.getY(), f.getWidth(), f.getHeight()); + } + } + + public static void main(String args[]) { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + JFrame frame = new JFrame(); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + + JDesktopPane desktopPane = new JDesktopPane(); + DesktopManager dm = new MageDesktopManager(); + desktopPane.setDesktopManager(dm); + JInternalFrame internalFrame = new JInternalFrame("Test Internal Frame", true, false, true, true); + internalFrame.setSize(200, 150); + internalFrame.setVisible(true); + desktopPane.add(internalFrame); + + frame.add(desktopPane, BorderLayout.CENTER); + frame.setSize(800, 600); + frame.setVisible(true); + } + }); + } +} diff --git a/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java b/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java index 3d7eb809835..a0abd01fbf6 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java @@ -1,42 +1,39 @@ /* -* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. -* -* Redistribution and use in source and binary forms, with or without modification, are -* permitted provided that the following conditions are met: -* -* 1. Redistributions of source code must retain the above copyright notice, this list of -* conditions and the following disclaimer. -* -* 2. Redistributions in binary form must reproduce the above copyright notice, this list -* of conditions and the following disclaimer in the documentation and/or other materials -* provided with the distribution. -* -* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED -* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR -* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* The views and conclusions contained in the software and documentation are those of the -* authors and should not be interpreted as representing official policies, either expressed -* or implied, of BetaSteward_at_googlemail.com. -*/ + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ /* * CardInfoWindowDialog.java * * Created on Feb 1, 2010, 3:00:35 PM */ - package mage.client.dialog; import java.awt.Point; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.beans.PropertyVetoException; import java.util.UUID; import java.util.logging.Level; @@ -61,7 +58,10 @@ import org.mage.plugins.card.utils.impl.ImageManagerImpl; */ public class CardInfoWindowDialog extends MageDialog { - public static enum ShowType { REVEAL, LOOKED_AT, EXILE, GRAVEYARD, OTHER }; + public static enum ShowType { + + REVEAL, REVEAL_TOP_LIBRARY, LOOKED_AT, EXILE, GRAVEYARD, OTHER + }; private ShowType showType; private boolean positioned; @@ -75,7 +75,7 @@ public class CardInfoWindowDialog extends MageDialog { initComponents(); this.setModal(false); - switch(this.showType) { + switch (this.showType) { case LOOKED_AT: this.setFrameIcon(new ImageIcon(ImageManagerImpl.getInstance().getLookedAtImage())); this.setClosable(true); @@ -84,9 +84,12 @@ public class CardInfoWindowDialog extends MageDialog { this.setFrameIcon(new ImageIcon(ImageManagerImpl.getInstance().getRevealedImage())); this.setClosable(true); break; + case REVEAL_TOP_LIBRARY: + this.setFrameIcon(new ImageIcon(ImageHelper.getImageFromResources("/info/library.png"))); + this.setClosable(true); + break; case GRAVEYARD: this.setFrameIcon(new ImageIcon(ImageHelper.getImageFromResources("/info/grave.png"))); - this.setIconifiable(false); this.setClosable(true); this.setDefaultCloseOperation(HIDE_ON_CLOSE); addInternalFrameListener(new InternalFrameAdapter() { @@ -100,7 +103,7 @@ public class CardInfoWindowDialog extends MageDialog { this.setFrameIcon(new ImageIcon(ImageManagerImpl.getInstance().getExileImage())); break; default: - // no icon yet + // no icon yet } this.setTitelBarToolTip(name); } @@ -123,6 +126,19 @@ public class CardInfoWindowDialog extends MageDialog { showAndPositionWindow(); } + @Override + public void show() { + if (showType.equals(ShowType.EXILE)) { + if (cards == null || cards.getNumberOfCards() == 0) { + return; + } + } + super.show(); + if (positioned) { // check if in frame rectangle + showAndPositionWindow(); + } + } + private void showAndPositionWindow() { SwingUtilities.invokeLater(new Runnable() { @Override @@ -132,13 +148,13 @@ public class CardInfoWindowDialog extends MageDialog { if (width > 0 && height > 0) { Point centered = SettingsManager.getInstance().getComponentPosition(width, height); if (!positioned) { - positioned = true; int xPos = centered.x / 2; int yPos = centered.y / 2; CardInfoWindowDialog.this.setLocation(xPos, yPos); show(); + positioned = true; } - GuiDisplayUtil.keepComponentInsideScreen(centered.x, centered.y, CardInfoWindowDialog.this); + GuiDisplayUtil.keepComponentInsideFrame(centered.x, centered.y, CardInfoWindowDialog.this); } } }); @@ -155,16 +171,15 @@ public class CardInfoWindowDialog extends MageDialog { Logger.getLogger(CardInfoWindowDialog.class.getName()).log(Level.SEVERE, null, ex); } } - } - else { + } else { this.hideDialog(); } } - /** This method is called from within the constructor to - * initialize the form. - * WARNING: Do NOT modify this code. The content of this method is - * always regenerated by the Form Editor. + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. */ @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents @@ -191,7 +206,6 @@ public class CardInfoWindowDialog extends MageDialog { pack(); }// //GEN-END:initComponents - // Variables declaration - do not modify//GEN-BEGIN:variables private mage.client.cards.Cards cards; // End of variables declaration//GEN-END:variables diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index ade062dacb9..fea201e9fa4 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -1,30 +1,30 @@ /* -* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. -* -* Redistribution and use in source and binary forms, with or without modification, are -* permitted provided that the following conditions are met: -* -* 1. Redistributions of source code must retain the above copyright notice, this list of -* conditions and the following disclaimer. -* -* 2. Redistributions in binary form must reproduce the above copyright notice, this list -* of conditions and the following disclaimer in the documentation and/or other materials -* provided with the distribution. -* -* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED -* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR -* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* The views and conclusions contained in the software and documentation are those of the -* authors and should not be interpreted as representing official policies, either expressed -* or implied, of BetaSteward_at_googlemail.com. -*/ + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ package mage.client.game; import java.awt.BorderLayout; @@ -133,7 +133,6 @@ import mage.view.SimpleCardsView; import org.apache.log4j.Logger; import org.mage.plugins.card.utils.impl.ImageManagerImpl; - /** * * @author BetaSteward_at_googlemail.com, nantuko8 @@ -145,14 +144,14 @@ public final class GamePanel extends javax.swing.JPanel { private static final int X_PHASE_WIDTH = 55; private static final int STACK_MIN_CARDS_OFFSET_Y = 7; private final Map players = new HashMap<>(); - + // non modal frames private final Map exiles = new HashMap<>(); private final Map revealed = new HashMap<>(); private final Map lookedAt = new HashMap<>(); private final Map graveyardWindows = new HashMap<>(); private final Map graveyards = new HashMap<>(); - + private final ArrayList pickTarget = new ArrayList<>(); private UUID gameId; private UUID playerId; // playerId of the player @@ -164,15 +163,15 @@ public final class GamePanel extends javax.swing.JPanel { private String chosenHandKey = "You"; private boolean smallMode = false; private boolean initialized = false; - + private boolean menuNameSet = false; private boolean handCardsOfOpponentAvailable = false; - + private Map loadedCards = new HashMap<>(); - private int storedHeight; + private int storedHeight; private Map hoverButtons; - + private MageDialogState choiceWindowState; public GamePanel() { @@ -248,37 +247,37 @@ public final class GamePanel extends javax.swing.JPanel { this.handContainer.cleanUp(); this.stack.cleanUp(); - for(Map.Entry playAreaPanelEntry: players.entrySet()) { + for (Map.Entry playAreaPanelEntry : players.entrySet()) { playAreaPanelEntry.getValue().CleanUp(); } this.players.clear(); - + jLayeredPane.remove(abilityPicker); this.abilityPicker.cleanUp(); jLayeredPane.remove(DialogManager.getManager(gameId)); DialogManager.removeGame(gameId); - + if (pickNumber != null) { pickNumber.removeDialog(); } - for (CardInfoWindowDialog exileDialog: exiles.values()) { + for (CardInfoWindowDialog exileDialog : exiles.values()) { exileDialog.cleanUp(); exileDialog.removeDialog(); } - for (CardInfoWindowDialog graveyardDialog: graveyardWindows.values()) { + for (CardInfoWindowDialog graveyardDialog : graveyardWindows.values()) { graveyardDialog.cleanUp(); graveyardDialog.removeDialog(); } - for (CardInfoWindowDialog revealDialog: revealed.values()) { + for (CardInfoWindowDialog revealDialog : revealed.values()) { revealDialog.cleanUp(); revealDialog.removeDialog(); } - for (CardInfoWindowDialog lookedAtDialog: lookedAt.values()) { + for (CardInfoWindowDialog lookedAtDialog : lookedAt.values()) { lookedAtDialog.cleanUp(); lookedAtDialog.removeDialog(); } - for (ShowCardsDialog pickTargetDialog: pickTarget) { + for (ShowCardsDialog pickTargetDialog : pickTarget) { pickTargetDialog.cleanUp(); pickTargetDialog.removeDialog(); } @@ -290,7 +289,7 @@ public final class GamePanel extends javax.swing.JPanel { logger.fatal("popupContainer error:", ex); } jPanel2.remove(bigCard); - this.bigCard = null; + this.bigCard = null; } private void saveDividerLocations() { @@ -340,12 +339,11 @@ public final class GamePanel extends javax.swing.JPanel { pnlShortCuts.revalidate(); pnlShortCuts.repaint(); //this.handContainer.sizeHand(0.8, smallMode); - for (PlayAreaPanel p: players.values()) { + for (PlayAreaPanel p : players.values()) { p.sizePlayer(smallMode); } } - } - else { + } else { if (smallMode) { smallMode = false; Dimension bbDimension = new Dimension(256, 367); @@ -355,7 +353,7 @@ public final class GamePanel extends javax.swing.JPanel { pnlShortCuts.revalidate(); pnlShortCuts.repaint(); this.handContainer.sizeHand(1, smallMode); - for (PlayAreaPanel p: players.values()) { + for (PlayAreaPanel p : players.values()) { p.sizePlayer(smallMode); } } @@ -388,14 +386,14 @@ public final class GamePanel extends javax.swing.JPanel { this.btnSkipToNextMain.setVisible(true); this.btnSkipStack.setVisible(true); this.btnSkipToYourTurn.setVisible(true); - + this.pnlReplay.setVisible(false); - + this.gameChatPanel.clear(); this.gameChatPanel.connect(session.getGameChatId(gameId)); if (!session.joinGame(gameId)) { removeGame(); - } else { + } else { // play start sound AudioManager.playYourGameStarted(); } @@ -410,7 +408,6 @@ public final class GamePanel extends javax.swing.JPanel { this.feedbackPanel.init(gameId); this.feedbackPanel.clear(); - this.btnConcede.setVisible(false); this.btnStopWatching.setVisible(true); this.btnSwitchHands.setVisible(false); @@ -421,8 +418,8 @@ public final class GamePanel extends javax.swing.JPanel { this.btnSkipToEndTurn.setVisible(false); this.btnSkipToNextMain.setVisible(false); this.btnSkipStack.setVisible(false); - this.btnSkipToYourTurn.setVisible(false); - + this.btnSkipToYourTurn.setVisible(false); + this.pnlReplay.setVisible(false); this.gameChatPanel.clear(); this.gameChatPanel.connect(session.getGameChatId(gameId)); @@ -464,7 +461,7 @@ public final class GamePanel extends javax.swing.JPanel { c = c.getParent(); } if (c != null) { - ((GamePane)c).removeGame(); + ((GamePane) c).removeGame(); } } @@ -489,7 +486,7 @@ public final class GamePanel extends javax.swing.JPanel { int row = 1; int playerSeat = 0; if (playerId != null) { - for (PlayerView player: game.getPlayers()) { + for (PlayerView player : game.getPlayers()) { if (playerId.equals(player.getPlayerId())) { break; } @@ -497,7 +494,7 @@ public final class GamePanel extends javax.swing.JPanel { } } PlayerView player = game.getPlayers().get(playerSeat); - PlayAreaPanel sessionPlayer = new PlayAreaPanel(player, bigCard, gameId, game.getPriorityTime(), this, + PlayAreaPanel sessionPlayer = new PlayAreaPanel(player, bigCard, gameId, game.getPriorityTime(), this, new PlayAreaPanelOptions(game.isPlayer(), true, game.isRollbackTurnsAllowed())); players.put(player.getPlayerId(), sessionPlayer); GridBagConstraints c = new GridBagConstraints(); @@ -521,8 +518,7 @@ public final class GamePanel extends javax.swing.JPanel { while (true) { if (row == 1) { col++; - } - else { + } else { col--; } if (col >= numColumns) { @@ -549,7 +545,7 @@ public final class GamePanel extends javax.swing.JPanel { break; } } - for (PlayAreaPanel p: players.values()) { + for (PlayAreaPanel p : players.values()) { p.sizePlayer(smallMode); } } @@ -565,7 +561,7 @@ public final class GamePanel extends javax.swing.JPanel { this.handContainer.setVisible(true); handCards.clear(); if (game.getWatchedHands() != null) { - for (Map.Entry hand: game.getWatchedHands().entrySet()) { + for (Map.Entry hand : game.getWatchedHands().entrySet()) { handCards.put(hand.getKey(), CardsViewUtil.convertSimple(hand.getValue(), loadedCards)); } } @@ -581,7 +577,7 @@ public final class GamePanel extends javax.swing.JPanel { } // Get opponents hand cards if available (only possible for players) if (game.getOpponentHands() != null) { - for (Map.Entry hand: game.getOpponentHands().entrySet()) { + for (Map.Entry hand : game.getOpponentHands().entrySet()) { handCards.put(hand.getKey(), CardsViewUtil.convertSimple(hand.getValue(), loadedCards)); } } @@ -597,11 +593,10 @@ public final class GamePanel extends javax.swing.JPanel { hideAll(); - if (playerId != null) { // set visible only if we have any other hand visible than ours btnSwitchHands.setVisible(handCards.size() > 1); - boolean change = (handCardsOfOpponentAvailable != (game.getOpponentHands() != null)); + boolean change = (handCardsOfOpponentAvailable != (game.getOpponentHands() != null)); if (change) { handCardsOfOpponentAvailable = !handCardsOfOpponentAvailable; if (handCardsOfOpponentAvailable) { @@ -620,7 +615,7 @@ public final class GamePanel extends javax.swing.JPanel { } else { this.txtPhase.setText(""); } - + if (game.getStep() != null) { updatePhases(game.getStep()); this.txtStep.setText(game.getStep().toString()); @@ -646,7 +641,7 @@ public final class GamePanel extends javax.swing.JPanel { } } - for (PlayerView player: game.getPlayers()) { + for (PlayerView player : game.getPlayers()) { if (players.containsKey(player.getPlayerId())) { if (!possibleAttackers.isEmpty()) { for (UUID permanentId : possibleAttackers) { @@ -660,7 +655,6 @@ public final class GamePanel extends javax.swing.JPanel { updateSkipButtons(player.isPassedTurn(), player.isPassedUntilEndOfTurn(), player.isPassedUntilNextMain(), player.isPassedAllTurns(), player.isPassedUntilStackResolved()); } // update open or remove closed graveyard windows - graveyards.put(player.getName(), player.getGraveyard()); if (graveyardWindows.containsKey(player.getName())) { CardInfoWindowDialog cardInfoWindowDialog = graveyardWindows.get(player.getName()); @@ -670,12 +664,18 @@ public final class GamePanel extends javax.swing.JPanel { cardInfoWindowDialog.loadCards(player.getGraveyard(), bigCard, gameId); } } + // show top card window + if (player.getTopCard() != null) { + CardsView cardsView = new CardsView(); + cardsView.put(player.getTopCard().getId(), player.getTopCard()); + handleGameInfoWindow(revealed, ShowType.REVEAL_TOP_LIBRARY, player.getName() + "'s top library card", cardsView); + } } else { logger.warn("Couldn't find player."); logger.warn(" uuid:" + player.getPlayerId()); logger.warn(" players:"); for (PlayAreaPanel p : players.values()) { - logger.warn(""+p); + logger.warn("" + p); } } } @@ -687,7 +687,7 @@ public final class GamePanel extends javax.swing.JPanel { sb.append("Playing: "); } boolean first = true; - for (PlayerView player: game.getPlayers()) { + for (PlayerView player : game.getPlayers()) { if (first) { first = false; } else { @@ -702,7 +702,7 @@ public final class GamePanel extends javax.swing.JPanel { GameManager.getInstance().setStackSize(game.getStack().size()); displayStack(game, bigCard, feedbackPanel, gameId); - for (ExileView exile: game.getExile()) { + for (ExileView exile : game.getExile()) { if (!exiles.containsKey(exile.getId())) { CardInfoWindowDialog newExile = new CardInfoWindowDialog(ShowType.EXILE, exile.getName()); exiles.put(exile.getId(), newExile); @@ -711,7 +711,7 @@ public final class GamePanel extends javax.swing.JPanel { } exiles.get(exile.getId()).loadCards(exile, bigCard, gameId); } - + showRevealed(game); showLookedAt(game); if (game.getCombat().size() > 0) { @@ -725,49 +725,50 @@ public final class GamePanel extends javax.swing.JPanel { this.revalidate(); this.repaint(); } - + static final int BORDER_SIZE = 2; private void updateSkipButtons(boolean turn, boolean endOfTurn, boolean nextMain, boolean allTurns, boolean stack) { if (turn) { //F4 btnSkipToNextTurn.setBorder(new LineBorder(Color.red, BORDER_SIZE)); } else { - btnSkipToNextTurn.setBorder(new EmptyBorder(BORDER_SIZE,BORDER_SIZE,BORDER_SIZE,BORDER_SIZE)); + btnSkipToNextTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); } if (endOfTurn) { // F5 btnSkipToEndTurn.setBorder(new LineBorder(Color.red, BORDER_SIZE)); } else { - btnSkipToEndTurn.setBorder(new EmptyBorder(BORDER_SIZE,BORDER_SIZE,BORDER_SIZE,BORDER_SIZE)); + btnSkipToEndTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); } if (nextMain) { // F7 btnSkipToNextMain.setBorder(new LineBorder(Color.red, BORDER_SIZE)); } else { - btnSkipToNextMain.setBorder(new EmptyBorder(BORDER_SIZE,BORDER_SIZE,BORDER_SIZE,BORDER_SIZE)); + btnSkipToNextMain.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); } if (stack) { // F8 btnSkipStack.setBorder(new LineBorder(Color.red, BORDER_SIZE)); } else { - btnSkipStack.setBorder(new EmptyBorder(BORDER_SIZE,BORDER_SIZE,BORDER_SIZE,BORDER_SIZE)); + btnSkipStack.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); } if (allTurns) { // F9 btnSkipToYourTurn.setBorder(new LineBorder(Color.red, BORDER_SIZE)); } else { - btnSkipToYourTurn.setBorder(new EmptyBorder(BORDER_SIZE,BORDER_SIZE,BORDER_SIZE,BORDER_SIZE)); + btnSkipToYourTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); } } /** * Set the same state for menu selections to all player areas. - * @param manaPoolAutomatic - * @param manaPoolAutomaticRestricted + * + * @param manaPoolAutomatic + * @param manaPoolAutomaticRestricted */ public void setMenuStates(boolean manaPoolAutomatic, boolean manaPoolAutomaticRestricted) { - for(PlayAreaPanel playAreaPanel: players.values()) { - playAreaPanel.setMenuStates(manaPoolAutomatic, manaPoolAutomaticRestricted); - } + for (PlayAreaPanel playAreaPanel : players.values()) { + playAreaPanel.setMenuStates(manaPoolAutomatic, manaPoolAutomaticRestricted); + } } - + private void displayStack(GameView game, BigCard bigCard, FeedbackPanel feedbackPanel, UUID gameId) { this.stack.loadCards(game.getStack(), bigCard, gameId, null); } @@ -828,43 +829,43 @@ public final class GamePanel extends javax.swing.JPanel { currentStep.setLocation(prevPoint.x - 15, prevPoint.y); } } - + // Called if the game frame is deactivated because the tabled the deck editor or other frames go to foreground public void deactivated() { // hide the non modal windows (because otherwise they are shown on top of the new active pane) - for (CardInfoWindowDialog exileDialog: exiles.values()) { + for (CardInfoWindowDialog exileDialog : exiles.values()) { exileDialog.hideDialog(); } - for (CardInfoWindowDialog graveyardDialog: graveyardWindows.values()) { + for (CardInfoWindowDialog graveyardDialog : graveyardWindows.values()) { graveyardDialog.hideDialog(); } - for (CardInfoWindowDialog revealDialog: revealed.values()) { + for (CardInfoWindowDialog revealDialog : revealed.values()) { revealDialog.hideDialog(); } - for (CardInfoWindowDialog lookedAtDialog: lookedAt.values()) { + for (CardInfoWindowDialog lookedAtDialog : lookedAt.values()) { lookedAtDialog.hideDialog(); - } + } } - + // Called if the game frame comes to front again public void activated() { // hide the non modal windows (because otherwise they are shown on top of the new active pane) - for (CardInfoWindowDialog exileDialog: exiles.values()) { + for (CardInfoWindowDialog exileDialog : exiles.values()) { exileDialog.show(); } - for (CardInfoWindowDialog graveyardDialog: graveyardWindows.values()) { + for (CardInfoWindowDialog graveyardDialog : graveyardWindows.values()) { graveyardDialog.show(); } - for (CardInfoWindowDialog revealDialog: revealed.values()) { + for (CardInfoWindowDialog revealDialog : revealed.values()) { revealDialog.show(); } - for (CardInfoWindowDialog lookedAtDialog: lookedAt.values()) { + for (CardInfoWindowDialog lookedAtDialog : lookedAt.values()) { lookedAtDialog.show(); - } - } - + } + } + public void openGraveyardWindow(String playerName) { - if(graveyardWindows.containsKey(playerName)) { + if (graveyardWindows.containsKey(playerName)) { CardInfoWindowDialog cardInfoWindowDialog = graveyardWindows.get(playerName); if (cardInfoWindowDialog.isVisible()) { cardInfoWindowDialog.hideDialog(); @@ -878,21 +879,33 @@ public final class GamePanel extends javax.swing.JPanel { MageFrame.getDesktop().add(newGraveyard, JLayeredPane.MODAL_LAYER); newGraveyard.loadCards(graveyards.get(playerName), bigCard, gameId); } - + + public void openTopLibraryWindow(String playerName) { + String title = playerName + "'s top library card"; + if (revealed.containsKey(title)) { + CardInfoWindowDialog cardInfoWindowDialog = revealed.get(title); + if (cardInfoWindowDialog.isVisible()) { + cardInfoWindowDialog.hideDialog(); + } else { + cardInfoWindowDialog.show(); + } + } + } + private void showRevealed(GameView game) { - for (RevealedView revealView: game.getRevealed()) { + for (RevealedView revealView : game.getRevealed()) { handleGameInfoWindow(revealed, ShowType.REVEAL, revealView.getName(), revealView.getCards()); } removeClosedCardInfoWindows(revealed); } private void showLookedAt(GameView game) { - for (LookedAtView lookedAtView: game.getLookedAt()) { + for (LookedAtView lookedAtView : game.getLookedAt()) { handleGameInfoWindow(lookedAt, ShowType.LOOKED_AT, lookedAtView.getName(), lookedAtView.getCards()); } removeClosedCardInfoWindows(lookedAt); } - + private void handleGameInfoWindow(Map windowMap, ShowType showType, String name, LinkedHashMap cardsView) { CardInfoWindowDialog cardInfoWindowDialog; if (!windowMap.containsKey(name)) { @@ -904,8 +917,9 @@ public final class GamePanel extends javax.swing.JPanel { } if (cardInfoWindowDialog != null && !cardInfoWindowDialog.isClosed()) { - switch(showType) { + switch (showType) { case REVEAL: + case REVEAL_TOP_LIBRARY: cardInfoWindowDialog.loadCards((CardsView) cardsView, bigCard, gameId); break; case LOOKED_AT: @@ -914,31 +928,33 @@ public final class GamePanel extends javax.swing.JPanel { } } } - + private void removeClosedCardInfoWindows(Map windowMap) { // Remove closed window objects from the maps for (Iterator> iterator = windowMap.entrySet().iterator(); iterator.hasNext();) { Map.Entry entry = iterator.next(); if (entry.getValue().isClosed()) { iterator.remove(); - } - } + } + } } - + public void ask(String question, GameView gameView, int messageId) { updateGame(gameView); this.feedbackPanel.getFeedback(FeedbackMode.QUESTION, question, false, null, messageId); } + /** - * Shows a pick target dialog and allows the player to pick a target (e.g. the pick triggered ability) - * + * Shows a pick target dialog and allows the player to pick a target (e.g. + * the pick triggered ability) + * * @param message * @param cardView * @param gameView * @param targets * @param required * @param options - * @param messageId + * @param messageId */ public void pickTarget(String message, CardsView cardView, GameView gameView, Set targets, boolean required, Map options, int messageId) { ShowCardsDialog dialog = null; @@ -948,7 +964,7 @@ public final class GamePanel extends javax.swing.JPanel { if (options.containsKey("chosen")) { choosen = (List) options.get("chosen"); } - for(CardView card: gameView.getHand().values()) { + for (CardView card : gameView.getHand().values()) { if (targets == null || targets.isEmpty()) { card.setPlayable(false); card.setChoosable(true); @@ -968,7 +984,7 @@ public final class GamePanel extends javax.swing.JPanel { dialog = showCards(message, cardView, required, options0); options0.put("dialog", dialog); } - this.feedbackPanel.getFeedback(required?FeedbackMode.INFORM:FeedbackMode.CANCEL, message, gameView.getSpecial(), options0, messageId); + this.feedbackPanel.getFeedback(required ? FeedbackMode.INFORM : FeedbackMode.CANCEL, message, gameView.getSpecial(), options0, messageId); if (dialog != null) { this.pickTarget.add(dialog); } @@ -1009,13 +1025,13 @@ public final class GamePanel extends javax.swing.JPanel { if (gameView.getActivePlayerId().equals(playerId)) { activePlayerText = "Your turn"; } else { - activePlayerText = gameView.getActivePlayerName() +"'s turn"; + activePlayerText = gameView.getActivePlayerName() + "'s turn"; } String priorityPlayerText = ""; if (controllingPlayer) { priorityPlayerText = " / priority " + gameView.getPriorityPlayerName(); } - String messageToDisplay = message + "
" + activePlayerText +" / " + gameView.getStep().toString() + priorityPlayerText + "
"; + String messageToDisplay = message + "
" + activePlayerText + " / " + gameView.getStep().toString() + priorityPlayerText + "
"; this.feedbackPanel.getFeedback(FeedbackMode.SELECT, messageToDisplay, gameView.getSpecial(), panelOptions, messageId); } @@ -1044,7 +1060,7 @@ public final class GamePanel extends javax.swing.JPanel { private void hideAll() { ActionCallback callback = Plugins.getInstance().getActionCallback(); - ((MageActionCallback)callback).hideGameUpdate(gameId); + ((MageActionCallback) callback).hideGameUpdate(gameId); } private ShowCardsDialog showCards(String title, CardsView cards, boolean required, Map options) { @@ -1058,8 +1074,7 @@ public final class GamePanel extends javax.swing.JPanel { pickNumber.showDialog(min, max, message); if (pickNumber.isCancel()) { session.sendPlayerBoolean(gameId, false); - } - else { + } else { session.sendPlayerInteger(gameId, pickNumber.getAmount()); } } @@ -1067,7 +1082,7 @@ public final class GamePanel extends javax.swing.JPanel { public void getChoice(Choice choice, UUID objectId) { hideAll(); PickChoiceDialog pickChoice = new PickChoiceDialog(); - pickChoice.showDialog(choice, objectId,choiceWindowState); + pickChoice.showDialog(choice, objectId, choiceWindowState); if (choice.isKeyChoice()) { if (pickChoice.isAutoSelect()) { session.sendPlayerString(gameId, "#" + choice.getChoiceKey()); @@ -1077,7 +1092,7 @@ public final class GamePanel extends javax.swing.JPanel { } else { session.sendPlayerString(gameId, choice.getChoice()); } - choiceWindowState = new MageDialogState(pickChoice); + choiceWindowState = new MageDialogState(pickChoice); pickChoice.removeDialog(); } @@ -1116,15 +1131,15 @@ public final class GamePanel extends javax.swing.JPanel { feedbackPanel = new mage.client.game.FeedbackPanel(); txtSpellsCast = new javax.swing.JLabel(); - Font font = new Font("SansSerif", Font.BOLD,12); + Font font = new Font("SansSerif", Font.BOLD, 12); txtSpellsCast.setFont(font); - Border paddingBorder = BorderFactory.createEmptyBorder(4,4,4,4); - Border border = BorderFactory.createLineBorder(Color.DARK_GRAY,2); - txtSpellsCast.setBorder(BorderFactory.createCompoundBorder(border,paddingBorder)); + Border paddingBorder = BorderFactory.createEmptyBorder(4, 4, 4, 4); + Border border = BorderFactory.createLineBorder(Color.DARK_GRAY, 2); + txtSpellsCast.setBorder(BorderFactory.createCompoundBorder(border, paddingBorder)); txtSpellsCast.setBackground(Color.LIGHT_GRAY); txtSpellsCast.setOpaque(true); txtSpellsCast.setToolTipText("spells cast during the current turn"); - + btnCancelSkip = new javax.swing.JButton(); // F3 btnSkipToNextTurn = new javax.swing.JButton(); // F4 btnSkipToEndTurn = new javax.swing.JButton(); // F5 @@ -1135,7 +1150,7 @@ public final class GamePanel extends javax.swing.JPanel { btnConcede = new javax.swing.JButton(); btnSwitchHands = new javax.swing.JButton(); btnStopWatching = new javax.swing.JButton(); - + bigCard = new mage.client.cards.BigCard(); stack = new mage.client.cards.Cards(); pnlReplay = new javax.swing.JPanel(); @@ -1190,7 +1205,7 @@ public final class GamePanel extends javax.swing.JPanel { lblTurn.setLabelFor(txtTurn); lblTurn.setText("Turn:"); - + txtTurn.setText("Turn"); txtTurn.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(153, 153, 153), 1, true)); txtTurn.setMinimumSize(new java.awt.Dimension(0, 16)); @@ -1209,14 +1224,14 @@ public final class GamePanel extends javax.swing.JPanel { lblPriority.setLabelFor(txtPriority); lblPriority.setText("Priority Player:"); - feedbackPanel.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(150, 50, 50),2)); + feedbackPanel.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(150, 50, 50), 2)); feedbackPanel.setMaximumSize(new java.awt.Dimension(208, 121)); feedbackPanel.setMinimumSize(new java.awt.Dimension(208, 121)); bigCard.setBorder(new LineBorder(Color.black, 1, true)); - + int c = JComponent.WHEN_IN_FOCUSED_WINDOW; - + KeyStroke ks3 = KeyStroke.getKeyStroke(KeyEvent.VK_F3, 0); this.getInputMap(c).put(ks3, "F3_PRESS"); this.getActionMap().put("F3_PRESS", new AbstractAction() { @@ -1225,9 +1240,9 @@ public final class GamePanel extends javax.swing.JPanel { restorePriorityActionPerformed(actionEvent); } }); - + btnCancelSkip.setContentAreaFilled(false); - btnCancelSkip.setBorder(new EmptyBorder(BORDER_SIZE,BORDER_SIZE,BORDER_SIZE, BORDER_SIZE)); + btnCancelSkip.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); btnCancelSkip.setIcon(new ImageIcon(ImageManagerImpl.getInstance().getCancelSkipButtonImage())); btnCancelSkip.setToolTipText("Cancel all skip actions (F3)."); btnCancelSkip.setFocusable(false); @@ -1241,7 +1256,7 @@ public final class GamePanel extends javax.swing.JPanel { }); btnSkipToNextTurn.setContentAreaFilled(false); - btnSkipToNextTurn.setBorder(new EmptyBorder(BORDER_SIZE,BORDER_SIZE,BORDER_SIZE, BORDER_SIZE)); + btnSkipToNextTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); btnSkipToNextTurn.setIcon(new ImageIcon(ImageManagerImpl.getInstance().getSkipNextTurnButtonImage())); btnSkipToNextTurn.setToolTipText("Skip to next turn (F4)."); btnSkipToNextTurn.setFocusable(false); @@ -1264,7 +1279,7 @@ public final class GamePanel extends javax.swing.JPanel { }); btnSkipToEndTurn.setContentAreaFilled(false); - btnSkipToEndTurn.setBorder(new EmptyBorder(BORDER_SIZE,BORDER_SIZE,BORDER_SIZE, BORDER_SIZE)); + btnSkipToEndTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); btnSkipToEndTurn.setIcon(new ImageIcon(ImageManagerImpl.getInstance().getSkipEndTurnButtonImage())); btnSkipToEndTurn.setToolTipText("Skip to (opponents/next) end of turn step (F5) - adjust using preferences."); btnSkipToEndTurn.setFocusable(false); @@ -1287,7 +1302,7 @@ public final class GamePanel extends javax.swing.JPanel { }); btnSkipToNextMain.setContentAreaFilled(false); - btnSkipToNextMain.setBorder(new EmptyBorder(BORDER_SIZE,BORDER_SIZE,BORDER_SIZE, BORDER_SIZE)); + btnSkipToNextMain.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); btnSkipToNextMain.setIcon(new ImageIcon(ImageManagerImpl.getInstance().getSkipMainButtonImage())); btnSkipToNextMain.setToolTipText("Skip to (your) next main phase (F7) - adjust using preferences."); btnSkipToNextMain.setFocusable(false); @@ -1310,7 +1325,7 @@ public final class GamePanel extends javax.swing.JPanel { }); btnSkipToYourTurn.setContentAreaFilled(false); - btnSkipToYourTurn.setBorder(new EmptyBorder(BORDER_SIZE,BORDER_SIZE,BORDER_SIZE, BORDER_SIZE)); + btnSkipToYourTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); btnSkipToYourTurn.setIcon(new ImageIcon(ImageManagerImpl.getInstance().getSkipYourNextTurnButtonImage())); btnSkipToYourTurn.setToolTipText("Skip to your next turn (F9)."); btnSkipToYourTurn.setFocusable(false); @@ -1333,7 +1348,7 @@ public final class GamePanel extends javax.swing.JPanel { }); btnSkipStack.setContentAreaFilled(false); - btnSkipStack.setBorder(new EmptyBorder(BORDER_SIZE,BORDER_SIZE,BORDER_SIZE, BORDER_SIZE)); + btnSkipStack.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); btnSkipStack.setIcon(new ImageIcon(ImageManagerImpl.getInstance().getSkipStackButtonImage())); btnSkipStack.setToolTipText("Skip until stack is resolved (F10)."); btnSkipStack.setFocusable(false); @@ -1356,7 +1371,7 @@ public final class GamePanel extends javax.swing.JPanel { }); btnConcede.setContentAreaFilled(false); - btnConcede.setBorder(new EmptyBorder(BORDER_SIZE,BORDER_SIZE,BORDER_SIZE, BORDER_SIZE)); + btnConcede.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); btnConcede.setIcon(new ImageIcon(ImageManagerImpl.getInstance().getConcedeButtonImage())); btnConcede.setToolTipText("Concede the current game."); btnConcede.setFocusable(false); @@ -1369,7 +1384,6 @@ public final class GamePanel extends javax.swing.JPanel { } }); - KeyStroke ks2 = KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0); this.getInputMap(c).put(ks2, "F2_PRESS"); this.getActionMap().put("F2_PRESS", new AbstractAction() { @@ -1387,7 +1401,7 @@ public final class GamePanel extends javax.swing.JPanel { @Override public void actionPerformed(ActionEvent actionEvent) { ActionCallback callback = Plugins.getInstance().getActionCallback(); - ((MageActionCallback)callback).enlargeCard(EnlargeMode.NORMAL); + ((MageActionCallback) callback).enlargeCard(EnlargeMode.NORMAL); } }); @@ -1397,7 +1411,7 @@ public final class GamePanel extends javax.swing.JPanel { @Override public void actionPerformed(ActionEvent actionEvent) { ActionCallback callback = Plugins.getInstance().getActionCallback(); - ((MageActionCallback)callback).enlargeCard(EnlargeMode.ALTERNATE); + ((MageActionCallback) callback).enlargeCard(EnlargeMode.ALTERNATE); } }); @@ -1442,12 +1456,12 @@ public final class GamePanel extends javax.swing.JPanel { @Override public void actionPerformed(ActionEvent actionEvent) { ActionCallback callback = Plugins.getInstance().getActionCallback(); - ((MageActionCallback)callback).hideEnlargedCard(); + ((MageActionCallback) callback).hideEnlargedCard(); } }); btnSwitchHands.setContentAreaFilled(false); - btnSwitchHands.setBorder(new EmptyBorder(0,0,0,0)); + btnSwitchHands.setBorder(new EmptyBorder(0, 0, 0, 0)); btnSwitchHands.setIcon(new ImageIcon(ImageManagerImpl.getInstance().getSwitchHandsButtonImage())); btnSwitchHands.setFocusable(false); btnSwitchHands.setToolTipText("Switch between your hand cards and hand cards of controlled players."); @@ -1461,7 +1475,7 @@ public final class GamePanel extends javax.swing.JPanel { }); btnStopWatching.setContentAreaFilled(false); - btnStopWatching.setBorder(new EmptyBorder(0,0,0,0)); + btnStopWatching.setBorder(new EmptyBorder(0, 0, 0, 0)); btnStopWatching.setIcon(new ImageIcon(ImageManagerImpl.getInstance().getStopWatchButtonImage())); btnStopWatching.setFocusable(false); btnStopWatching.setToolTipText("Stop watching this game."); @@ -1475,7 +1489,7 @@ public final class GamePanel extends javax.swing.JPanel { }); stack.setPreferredSize(new java.awt.Dimension(Config.dimensions.frameWidth, Config.dimensions.frameHeight + 25)); - stack.setBackgroundColor(new Color(0,0,0,0)); + stack.setBackgroundColor(new Color(0, 0, 0, 0)); btnStopReplay.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/control_stop.png"))); btnStopReplay.addActionListener(new java.awt.event.ActionListener() { @@ -1516,84 +1530,83 @@ public final class GamePanel extends javax.swing.JPanel { btnPreviousPlayActionPerformed(evt); } }); - + // Replay panel to control replay of games javax.swing.GroupLayout gl_pnlReplay = new javax.swing.GroupLayout(pnlReplay); pnlReplay.setLayout(gl_pnlReplay); gl_pnlReplay.setHorizontalGroup( - gl_pnlReplay.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(gl_pnlReplay.createSequentialGroup() - .addComponent(btnPreviousPlay, javax.swing.GroupLayout.PREFERRED_SIZE, 41, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnPlay, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(btnStopReplay, javax.swing.GroupLayout.PREFERRED_SIZE, 38, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnNextPlay, javax.swing.GroupLayout.PREFERRED_SIZE, 36, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnSkipForward, javax.swing.GroupLayout.PREFERRED_SIZE, 39, javax.swing.GroupLayout.PREFERRED_SIZE)) + gl_pnlReplay.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(gl_pnlReplay.createSequentialGroup() + .addComponent(btnPreviousPlay, javax.swing.GroupLayout.PREFERRED_SIZE, 41, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(btnPlay, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(btnStopReplay, javax.swing.GroupLayout.PREFERRED_SIZE, 38, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(btnNextPlay, javax.swing.GroupLayout.PREFERRED_SIZE, 36, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(btnSkipForward, javax.swing.GroupLayout.PREFERRED_SIZE, 39, javax.swing.GroupLayout.PREFERRED_SIZE)) ); gl_pnlReplay.setVerticalGroup( - gl_pnlReplay.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(btnSkipForward, 0, 0, Short.MAX_VALUE) - .addComponent(btnNextPlay, 0, 0, Short.MAX_VALUE) - .addComponent(btnStopReplay, 0, 0, Short.MAX_VALUE) - .addComponent(btnPlay, 0, 0, Short.MAX_VALUE) - .addComponent(btnPreviousPlay, javax.swing.GroupLayout.PREFERRED_SIZE, 31, Short.MAX_VALUE) + gl_pnlReplay.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(btnSkipForward, 0, 0, Short.MAX_VALUE) + .addComponent(btnNextPlay, 0, 0, Short.MAX_VALUE) + .addComponent(btnStopReplay, 0, 0, Short.MAX_VALUE) + .addComponent(btnPlay, 0, 0, Short.MAX_VALUE) + .addComponent(btnPreviousPlay, javax.swing.GroupLayout.PREFERRED_SIZE, 31, Short.MAX_VALUE) ); // Game info panel (buttons on the right panel) javax.swing.GroupLayout gl_pnlShortCuts = new javax.swing.GroupLayout(pnlShortCuts); pnlShortCuts.setLayout(gl_pnlShortCuts); gl_pnlShortCuts.setHorizontalGroup(gl_pnlShortCuts.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(gl_pnlShortCuts.createSequentialGroup() + .addGroup(gl_pnlShortCuts.createSequentialGroup() + .addComponent(btnSkipToNextTurn) + .addComponent(btnSkipToEndTurn) + .addComponent(btnSkipToNextMain) + .addComponent(btnSkipToYourTurn) + .addComponent(btnSkipStack) + ) + .addGroup(gl_pnlShortCuts.createSequentialGroup() + .addComponent(txtSpellsCast) + .addComponent(btnSwitchHands) + .addComponent(btnCancelSkip) + .addComponent(btnConcede) + .addComponent(btnStopWatching) + ) + //.addComponent(bigCard, javax.swing.GroupLayout.DEFAULT_SIZE, 256, Short.MAX_VALUE) + //.addComponent(feedbackPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 256, Short.MAX_VALUE) + //.addComponent(stack, javax.swing.GroupLayout.DEFAULT_SIZE, 256, Short.MAX_VALUE) + + .addGroup(gl_pnlShortCuts.createSequentialGroup() + .addContainerGap() + .addComponent(pnlReplay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(51, Short.MAX_VALUE)) + ); + gl_pnlShortCuts.setVerticalGroup(gl_pnlShortCuts.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(gl_pnlShortCuts.createSequentialGroup() + //.addComponent(bigCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + //.addGap(1, 1, 1) + //.addComponent(feedbackPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 109, javax.swing.GroupLayout.PREFERRED_SIZE) + //.addComponent(stack, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 164, Short.MAX_VALUE) + .addComponent(pnlReplay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(gl_pnlShortCuts.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(btnSkipToNextTurn) .addComponent(btnSkipToEndTurn) .addComponent(btnSkipToNextMain) .addComponent(btnSkipToYourTurn) .addComponent(btnSkipStack) ) - .addGroup(gl_pnlShortCuts.createSequentialGroup() + .addGroup(gl_pnlShortCuts.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(txtSpellsCast) .addComponent(btnSwitchHands) .addComponent(btnCancelSkip) .addComponent(btnConcede) .addComponent(btnStopWatching) ) - //.addComponent(bigCard, javax.swing.GroupLayout.DEFAULT_SIZE, 256, Short.MAX_VALUE) - //.addComponent(feedbackPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 256, Short.MAX_VALUE) - //.addComponent(stack, javax.swing.GroupLayout.DEFAULT_SIZE, 256, Short.MAX_VALUE) - - .addGroup(gl_pnlShortCuts.createSequentialGroup() - .addContainerGap() - .addComponent(pnlReplay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(51, Short.MAX_VALUE)) - ); - gl_pnlShortCuts.setVerticalGroup(gl_pnlShortCuts.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(gl_pnlShortCuts.createSequentialGroup() - //.addComponent(bigCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - //.addGap(1, 1, 1) - //.addComponent(feedbackPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 109, javax.swing.GroupLayout.PREFERRED_SIZE) - //.addComponent(stack, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 164, Short.MAX_VALUE) - .addComponent(pnlReplay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - - .addGroup(gl_pnlShortCuts.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(btnSkipToNextTurn) - .addComponent(btnSkipToEndTurn) - .addComponent(btnSkipToNextMain) - .addComponent(btnSkipToYourTurn) - .addComponent(btnSkipStack) - ) - .addGroup(gl_pnlShortCuts.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(txtSpellsCast) - .addComponent(btnSwitchHands) - .addComponent(btnCancelSkip) - .addComponent(btnConcede) - .addComponent(btnStopWatching) - ) - ) + ) ); pnlBattlefield.setLayout(new java.awt.GridBagLayout()); @@ -1602,7 +1615,7 @@ public final class GamePanel extends javax.swing.JPanel { jPhases.setBackground(new Color(0, 0, 0, 0)); jPhases.setLayout(null); jPhases.setPreferredSize(new Dimension(X_PHASE_WIDTH, 435)); - + MouseAdapter phasesMouseAdapter = new MouseAdapter() { @Override public void mouseClicked(MouseEvent evt) { @@ -1610,18 +1623,17 @@ public final class GamePanel extends javax.swing.JPanel { } }; String[] phases = {"Untap", "Upkeep", "Draw", "Main1", - "Combat_Start", "Combat_Attack", "Combat_Block", "Combat_Damage", "Combat_End", - "Main2", "Cleanup", "Next_Turn"}; + "Combat_Start", "Combat_Attack", "Combat_Block", "Combat_Damage", "Combat_End", + "Main2", "Cleanup", "Next_Turn"}; for (String name : phases) { createPhaseButton(name, phasesMouseAdapter); } - int i = 0; for (String name : hoverButtons.keySet()) { HoverButton hoverButton = hoverButtons.get(name); hoverButton.setAlignmentX(LEFT_ALIGNMENT); - hoverButton.setBounds(X_PHASE_WIDTH - 36, i*36, 36, 36); + hoverButton.setBounds(X_PHASE_WIDTH - 36, i * 36, 36, 36); jPhases.add(hoverButton); i++; } @@ -1644,26 +1656,26 @@ public final class GamePanel extends javax.swing.JPanel { JPanel empty1 = new JPanel(); empty1.setBackground(new Color(0, 0, 0, 0)); phasesContainer.add(empty1, ratio); - phasesContainer.add(jPhases); - + phasesContainer.add(jPhases); + javax.swing.GroupLayout gl_jPanel3 = new javax.swing.GroupLayout(jPanel3); gl_jPanel3.setHorizontalGroup( - gl_jPanel3.createParallelGroup(Alignment.LEADING) + gl_jPanel3.createParallelGroup(Alignment.LEADING) .addGroup(gl_jPanel3.createSequentialGroup() -// .addGap(0) + // .addGap(0) .addGroup(gl_jPanel3.createParallelGroup(Alignment.LEADING) .addGroup(gl_jPanel3.createSequentialGroup() .addGroup(gl_jPanel3.createParallelGroup(Alignment.LEADING) - .addComponent(helper, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(handContainer, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(helper, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(handContainer, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ) - .addGroup(gl_jPanel3.createParallelGroup(Alignment.LEADING) - .addComponent(pnlShortCuts, 400, 400, 400) - .addComponent(stack, 400, 400, 400) + .addGroup(gl_jPanel3.createParallelGroup(Alignment.LEADING) + .addComponent(pnlShortCuts, 400, 400, 400) + .addComponent(stack, 400, 400, 400) ) ) .addGap(0) - //.addComponent(jPhases, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + //.addComponent(jPhases, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(gl_jPanel3.createSequentialGroup() .addComponent(pnlBattlefield, GroupLayout.DEFAULT_SIZE, 200, Short.MAX_VALUE) .addComponent(phasesContainer, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) @@ -1671,24 +1683,24 @@ public final class GamePanel extends javax.swing.JPanel { ); gl_jPanel3.setVerticalGroup( gl_jPanel3.createParallelGroup(Alignment.TRAILING) - .addGroup(gl_jPanel3.createSequentialGroup() - .addGroup(gl_jPanel3.createParallelGroup(Alignment.LEADING) - .addComponent(pnlBattlefield, GroupLayout.DEFAULT_SIZE, 200, Short.MAX_VALUE) - .addComponent(phasesContainer, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addGroup(gl_jPanel3.createSequentialGroup() + .addGroup(gl_jPanel3.createParallelGroup(Alignment.LEADING) + .addComponent(pnlBattlefield, GroupLayout.DEFAULT_SIZE, 200, Short.MAX_VALUE) + .addComponent(phasesContainer, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + ) + //.addPreferredGap(ComponentPlacement.RELATED) + .addGroup(gl_jPanel3.createParallelGroup(Alignment.LEADING) + .addGroup(gl_jPanel3.createSequentialGroup() + .addGap(2) + .addComponent(pnlShortCuts, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addComponent(stack, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) ) - //.addPreferredGap(ComponentPlacement.RELATED) - .addGroup(gl_jPanel3.createParallelGroup(Alignment.LEADING) - .addGroup(gl_jPanel3.createSequentialGroup() - .addGap(2) - .addComponent(pnlShortCuts, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - .addComponent(stack, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - ) - .addGroup(gl_jPanel3.createSequentialGroup() - .addComponent(helper, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - .addComponent(handContainer, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - ) + .addGroup(gl_jPanel3.createSequentialGroup() + .addComponent(helper, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addComponent(handContainer, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) ) ) + ) ); jPanel3.setLayout(gl_jPanel3); @@ -1697,15 +1709,18 @@ public final class GamePanel extends javax.swing.JPanel { // Set individual area sizes of big card pane GridBagLayout gbl = new GridBagLayout(); - jPanel2.setLayout( gbl ); + jPanel2.setLayout(gbl); GridBagConstraints gbc = new GridBagConstraints(); gbc.fill = GridBagConstraints.BOTH; - gbc.gridx = 0; gbc.gridy = 0; - gbc.gridwidth = 1; gbc.gridheight = 4; // size 4/5 - gbc.weightx = 1.0; gbc.weighty = 1.0; - gbl.setConstraints( bigCard, gbc ); - jPanel2.add( bigCard ); + gbc.gridx = 0; + gbc.gridy = 0; + gbc.gridwidth = 1; + gbc.gridheight = 4; // size 4/5 + gbc.weightx = 1.0; + gbc.weighty = 1.0; + gbl.setConstraints(bigCard, gbc); + jPanel2.add(bigCard); jPanel2.setOpaque(false); @@ -1717,82 +1732,82 @@ public final class GamePanel extends javax.swing.JPanel { javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jSplitPane0, javax.swing.GroupLayout.DEFAULT_SIZE, 1078, Short.MAX_VALUE) ); layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jSplitPane0, javax.swing.GroupLayout.DEFAULT_SIZE, 798, Short.MAX_VALUE) ); } private void removeListener() { - for (MouseListener ml :this.getMouseListeners()) { + for (MouseListener ml : this.getMouseListeners()) { this.removeMouseListener(ml); } - for (MouseListener ml :this.btnCancelSkip.getMouseListeners()) { + for (MouseListener ml : this.btnCancelSkip.getMouseListeners()) { this.btnCancelSkip.removeMouseListener(ml); } - for (MouseListener ml :this.btnConcede.getMouseListeners()) { + for (MouseListener ml : this.btnConcede.getMouseListeners()) { this.btnConcede.removeMouseListener(ml); } - for (MouseListener ml :this.btnSkipToYourTurn.getMouseListeners()) { + for (MouseListener ml : this.btnSkipToYourTurn.getMouseListeners()) { this.btnSkipToYourTurn.removeMouseListener(ml); } - for (MouseListener ml :this.btnSkipStack.getMouseListeners()) { + for (MouseListener ml : this.btnSkipStack.getMouseListeners()) { this.btnSkipStack.removeMouseListener(ml); } - for (MouseListener ml :this.btnSkipToEndTurn.getMouseListeners()) { + for (MouseListener ml : this.btnSkipToEndTurn.getMouseListeners()) { this.btnSkipToEndTurn.removeMouseListener(ml); } - for (MouseListener ml :this.btnSkipToNextMain.getMouseListeners()) { + for (MouseListener ml : this.btnSkipToNextMain.getMouseListeners()) { this.btnSkipToNextMain.removeMouseListener(ml); } - for (MouseListener ml :this.btnSkipToNextTurn.getMouseListeners()) { + for (MouseListener ml : this.btnSkipToNextTurn.getMouseListeners()) { this.btnSkipToNextTurn.removeMouseListener(ml); } - for (MouseListener ml :this.btnSwitchHands.getMouseListeners()) { + for (MouseListener ml : this.btnSwitchHands.getMouseListeners()) { this.btnSwitchHands.removeMouseListener(ml); } - for (MouseListener ml :this.btnStopWatching.getMouseListeners()) { + for (MouseListener ml : this.btnStopWatching.getMouseListeners()) { this.btnStopWatching.removeMouseListener(ml); } - for (MouseListener ml :this.jPhases.getMouseListeners()) { + for (MouseListener ml : this.jPhases.getMouseListeners()) { this.jPhases.removeMouseListener(ml); } for (String name : hoverButtons.keySet()) { HoverButton hoverButton = hoverButtons.get(name); - for (MouseListener ml :hoverButton.getMouseListeners()) { + for (MouseListener ml : hoverButton.getMouseListeners()) { hoverButton.removeMouseListener(ml); } } - for (ActionListener al :this.btnPlay.getActionListeners()) { + for (ActionListener al : this.btnPlay.getActionListeners()) { this.btnPlay.removeActionListener(al); } - for (ActionListener al :this.btnStopReplay.getActionListeners()) { + for (ActionListener al : this.btnStopReplay.getActionListeners()) { this.btnStopReplay.removeActionListener(al); } - for (ActionListener al :this.btnNextPlay.getActionListeners()) { + for (ActionListener al : this.btnNextPlay.getActionListeners()) { this.btnNextPlay.removeActionListener(al); } - for (ActionListener al :this.btnNextPlay.getActionListeners()) { + for (ActionListener al : this.btnNextPlay.getActionListeners()) { this.btnNextPlay.removeActionListener(al); } - for (ActionListener al :this.btnPreviousPlay.getActionListeners()) { + for (ActionListener al : this.btnPreviousPlay.getActionListeners()) { this.btnPreviousPlay.removeActionListener(al); } - for (ActionListener al :this.btnSkipForward.getActionListeners()) { + for (ActionListener al : this.btnSkipForward.getActionListeners()) { this.btnSkipForward.removeActionListener(al); } final BasicSplitPaneUI myUi = (BasicSplitPaneUI) jSplitPane0.getUI(); final BasicSplitPaneDivider divider = myUi.getDivider(); final JButton upArrowButton = (JButton) divider.getComponent(0); - for (ActionListener al: upArrowButton.getActionListeners()) { + for (ActionListener al : upArrowButton.getActionListeners()) { upArrowButton.removeActionListener(al); } final JButton downArrowButton = (JButton) divider.getComponent(1); - for (ActionListener al: downArrowButton.getActionListeners()) { + for (ActionListener al : downArrowButton.getActionListeners()) { downArrowButton.removeActionListener(al); } @@ -1853,12 +1868,12 @@ public final class GamePanel extends javax.swing.JPanel { String[] choices = handCards.keySet().toArray(new String[0]); String newChosenHandKey = (String) JOptionPane.showInputDialog( - this, - "Choose hand to display:", "Switch between hands", - JOptionPane.PLAIN_MESSAGE, - null, - choices, - this.chosenHandKey); + this, + "Choose hand to display:", "Switch between hands", + JOptionPane.PLAIN_MESSAGE, + null, + choices, + this.chosenHandKey); if (newChosenHandKey != null && newChosenHandKey.length() > 0) { this.chosenHandKey = newChosenHandKey; @@ -1877,8 +1892,7 @@ public final class GamePanel extends javax.swing.JPanel { private void btnStopReplayActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnStopReplayActionPerformed if (replayTask != null && !replayTask.isDone()) { replayTask.cancel(true); - } - else if (modalQuestion("Are you sure you want to stop replay?", "Stop replay") == JOptionPane.YES_OPTION) { + } else if (modalQuestion("Are you sure you want to stop replay?", "Stop replay") == JOptionPane.YES_OPTION) { session.stopReplay(gameId); } }//GEN-LAST:event_btnStopReplayActionPerformed @@ -1958,15 +1972,15 @@ public final class GamePanel extends javax.swing.JPanel { private javax.swing.JButton btnConcede; private javax.swing.JButton btnSwitchHands; - + private javax.swing.JButton btnNextPlay; private javax.swing.JButton btnPlay; private javax.swing.JButton btnPreviousPlay; private javax.swing.JButton btnSkipForward; private javax.swing.JButton btnStopReplay; - + private javax.swing.JButton btnStopWatching; - + private mage.client.chat.ChatPanel gameChatPanel; private mage.client.game.FeedbackPanel feedbackPanel; private mage.client.chat.ChatPanel userChatPanel; @@ -2003,6 +2017,7 @@ public final class GamePanel extends javax.swing.JPanel { private boolean imagePanelState; } + class ReplayTask extends SwingWorker> { private final Session session; @@ -2032,8 +2047,8 @@ class ReplayTask extends SwingWorker> { logger.fatal("Replay Match Task error", ex); } catch (ExecutionException ex) { logger.fatal("Replay Match Task error", ex); - } catch (CancellationException ex) {} + } catch (CancellationException ex) { + } } - } diff --git a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java index de217391c73..bf8a5721825 100644 --- a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java +++ b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java @@ -1,37 +1,36 @@ /* -* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. -* -* Redistribution and use in source and binary forms, with or without modification, are -* permitted provided that the following conditions are met: -* -* 1. Redistributions of source code must retain the above copyright notice, this list of -* conditions and the following disclaimer. -* -* 2. Redistributions in binary form must reproduce the above copyright notice, this list -* of conditions and the following disclaimer in the documentation and/or other materials -* provided with the distribution. -* -* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED -* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR -* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* The views and conclusions contained in the software and documentation are those of the -* authors and should not be interpreted as representing official policies, either expressed -* or implied, of BetaSteward_at_googlemail.com. -*/ + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ /* * PlayerPanel.java * * Created on Nov 18, 2009, 3:01:31 PM */ - package mage.client.game; import java.awt.Color; @@ -57,18 +56,13 @@ import javax.swing.SwingConstants; import javax.swing.border.Border; import javax.swing.border.LineBorder; import mage.MageException; -import mage.cards.MageCard; -import mage.cards.action.ActionCallback; import mage.cards.decks.importer.DckDeckImporter; -import mage.cards.repository.CardRepository; import mage.client.MageFrame; import mage.client.cards.BigCard; import mage.client.components.HoverButton; import mage.client.components.MageRoundPane; import mage.client.components.ext.dlg.DialogManager; import mage.client.dialog.PreferencesDialog; -import mage.client.plugins.adapters.MageActionCallback; -import mage.client.plugins.impl.Plugins; import mage.client.util.CardsViewUtil; import mage.client.util.Command; import mage.client.util.ImageHelper; @@ -77,7 +71,6 @@ import mage.components.ImagePanel; import mage.constants.ManaType; import mage.remote.Session; import mage.utils.timer.PriorityTimer; -import mage.view.CardView; import mage.view.ManaPoolView; import mage.view.PlayerView; import org.mage.card.arcane.ManaSymbols; @@ -97,26 +90,25 @@ public class PlayerPanelExt extends javax.swing.JPanel { private BigCard bigCard; private static final int AVATAR_COUNT = 77; - + private static final String DEFAULT_AVATAR_PATH = "/avatars/51.jpg"; - + private static final int PANEL_WIDTH = 94; private static final int PANEL_HEIGHT = 242; private static final int PANEL_HEIGHT_SMALL = 212; private static final int MANA_LABEL_SIZE_HORIZONTAL = 20; - private static final Border greenBorder = new LineBorder(Color.green, 3); private static final Border redBorder = new LineBorder(Color.red, 2); - private static final Border emptyBorder = BorderFactory.createEmptyBorder(0,0,0,0); + private static final Border emptyBorder = BorderFactory.createEmptyBorder(0, 0, 0, 0); - private static final Dimension topCardDimension = new Dimension(40, 56); - private int avatarId = -1; private PriorityTimer timer; - /** Creates new form PlayerPanel */ + /** + * Creates new form PlayerPanel + */ public PlayerPanelExt() { setPreferredSize(new Dimension(PANEL_WIDTH, PANEL_HEIGHT)); initComponents(); @@ -158,7 +150,6 @@ public class PlayerPanelExt extends javax.swing.JPanel { if (timer != null) { this.timer.cancel(); } - topCardPanel.updateCallback(null, gameId); } public void update(PlayerView player) { @@ -271,26 +262,6 @@ public class PlayerPanelExt extends javax.swing.JPanel { this.avatar.setBorder(emptyBorder); this.btnPlayer.setBorder(emptyBorder); } - - - synchronized (this) { - if (player.getTopCard() != null) { - if (topCard == null || !topCard.getId().equals(player.getTopCard().getId())) { - if (topCard == null) { - topCardPanel.setVisible(true); - } - topCard = player.getTopCard(); - topCardPanel.update(topCard); - topCardPanel.updateImage(); - ActionCallback callback = Plugins.getInstance().getActionCallback(); - ((MageActionCallback)callback).refreshSession(); - topCardPanel.updateCallback(callback, gameId); - } - } else if (topCard != null) { - topCard = null; - topCardPanel.setVisible(false); - } - } update(player.getManaPool()); } @@ -304,7 +275,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { int h = priorityTimeLeft / 3600; int m = (priorityTimeLeft % 3600) / 60; int s = priorityTimeLeft % 60; - return (h < 10 ? "0" : "") + h + ":" + (m < 10 ? "0" : "") + m + ":" + (s < 10 ? "0" : "") + s; + return (h < 10 ? "0" : "") + h + ":" + (m < 10 ? "0" : "") + m + ":" + (s < 10 ? "0" : "") + s; } protected void update(ManaPoolView pool) { @@ -316,10 +287,10 @@ public class PlayerPanelExt extends javax.swing.JPanel { manaLabels.get("X").setText(Integer.toString(pool.getColorless())); } - /** This method is called from within the constructor to - * initialize the form. - * WARNING: Do NOT modify this code. The content of this method is - * always regenerated by the Form Editor. + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. */ @SuppressWarnings("unchecked") private void initComponents() { @@ -331,6 +302,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { lifeLabel = new JLabel(); handLabel = new JLabel(); poisonLabel = new JLabel(); + graveLabel = new JLabel(); libraryLabel = new JLabel(); setOpaque(false); @@ -341,10 +313,6 @@ public class PlayerPanelExt extends javax.swing.JPanel { // Avatar Image image = ImageHelper.getImageFromResources(DEFAULT_AVATAR_PATH); - topCardPanel = Plugins.getInstance().getMageCard(new CardView(CardRepository.instance.findCard("Forest").getMockCard()), bigCard, topCardDimension, gameId, true); - topCardPanel.setVisible(false); - panelBackground.add(topCardPanel); - BufferedImage resized = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(image, BufferedImage.TYPE_INT_ARGB), r); avatar = new HoverButton("player", resized, resized, resized, r); String showPlayerNamePermanently = MageFrame.getPreferences().get(PreferencesDialog.KEY_SHOW_PLAYER_NAMES_PERMANENTLY, "true"); @@ -360,7 +328,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { }); // timer area /small layout) timerLabel.setToolTipText("Time left"); - timerLabel.setSize(80,12); + timerLabel.setSize(80, 12); timerLabel.setHorizontalAlignment(SwingConstants.CENTER); // life area @@ -389,22 +357,29 @@ public class PlayerPanelExt extends javax.swing.JPanel { poison = new ImagePanel(resizedPoison, ImagePanel.ACTUAL); poison.setToolTipText("Poison"); poison.setOpaque(false); - + // Library r = new Rectangle(19, 19); libraryLabel.setToolTipText("Library"); Image imageLibrary = ImageHelper.getImageFromResources("/info/library.png"); BufferedImage resizedLibrary = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(imageLibrary, BufferedImage.TYPE_INT_ARGB), r); - library = new ImagePanel(resizedLibrary, ImagePanel.ACTUAL); + + library = new HoverButton(null, resizedLibrary, resizedLibrary, resizedLibrary, r); library.setToolTipText("Library"); library.setOpaque(false); + library.setObserver(new Command() { + @Override + public void execute() { + btnLibraryActionPerformed(null); + } + }); // Grave count and open graveyard button - graveLabel = new JLabel(); r = new Rectangle(21, 21); graveLabel.setToolTipText("Graveyard"); Image imageGrave = ImageHelper.getImageFromResources("/info/grave.png"); BufferedImage resizedGrave = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(imageGrave, BufferedImage.TYPE_INT_ARGB), r); + grave = new HoverButton(null, resizedGrave, resizedGrave, resizedGrave, r); grave.setToolTipText("Graveyard"); grave.setOpaque(false); @@ -579,195 +554,192 @@ public class PlayerPanelExt extends javax.swing.JPanel { GroupLayout gl_panelBackground = new GroupLayout(panelBackground); gl_panelBackground.setHorizontalGroup( gl_panelBackground.createParallelGroup(Alignment.LEADING) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(9) - .addComponent(life, GroupLayout.PREFERRED_SIZE, 18, GroupLayout.PREFERRED_SIZE) - .addGap(3) - .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(18) - .addComponent(hand, GroupLayout.PREFERRED_SIZE, 18, GroupLayout.PREFERRED_SIZE)) - .addComponent(lifeLabel, GroupLayout.PREFERRED_SIZE, 25, GroupLayout.PREFERRED_SIZE)) - .addGap(4) - .addComponent(handLabel, GroupLayout.PREFERRED_SIZE, 20, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(9) - .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(3) - .addComponent(poison, GroupLayout.PREFERRED_SIZE, 14, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(2) - .addComponent(btnWhiteMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(2) - .addComponent(btnBlueMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(2) - .addComponent(btnBlackMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) - .addComponent(grave, GroupLayout.PREFERRED_SIZE, 21, GroupLayout.PREFERRED_SIZE) - ) - .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(18) - .addComponent(library, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE)) - .addComponent(poisonLabel, GroupLayout.PREFERRED_SIZE, 20, GroupLayout.PREFERRED_SIZE) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(20) - .addComponent(btnRedMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(1) - .addComponent(manaCountLabelW, GroupLayout.PREFERRED_SIZE, MANA_LABEL_SIZE_HORIZONTAL, GroupLayout.PREFERRED_SIZE))) - .addGap(3) - .addComponent(manaCountLabelR, GroupLayout.PREFERRED_SIZE, MANA_LABEL_SIZE_HORIZONTAL, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(1) - .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) - .addComponent(manaCountLabelB, GroupLayout.PREFERRED_SIZE, MANA_LABEL_SIZE_HORIZONTAL, GroupLayout.PREFERRED_SIZE) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(19) - .addComponent(btnColorlessMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE))) - .addGap(5) - .addComponent(manaCountLabelX, GroupLayout.PREFERRED_SIZE, MANA_LABEL_SIZE_HORIZONTAL, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(20) - .addComponent(btnGreenMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(40) - .addComponent(manaCountLabelG, GroupLayout.PREFERRED_SIZE, MANA_LABEL_SIZE_HORIZONTAL, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(40) - .addComponent(libraryLabel, GroupLayout.PREFERRED_SIZE, 25, GroupLayout.PREFERRED_SIZE)) - /*.addGroup(gl_panelBackground.createSequentialGroup() - .addGap(18) - .addComponent(cheat, GroupLayout.PREFERRED_SIZE, 25, GroupLayout.PREFERRED_SIZE))*/ - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(18) - .addComponent(exileZone, GroupLayout.PREFERRED_SIZE, 25, GroupLayout.PREFERRED_SIZE) - ) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(5) - .addComponent(graveLabel, GroupLayout.PREFERRED_SIZE, 25, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(40) - .addComponent(exileLabel, GroupLayout.PREFERRED_SIZE, 25, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(1) - .addComponent(manaCountLabelU, GroupLayout.PREFERRED_SIZE, MANA_LABEL_SIZE_HORIZONTAL, GroupLayout.PREFERRED_SIZE)))) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(6) - .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) - .addComponent(btnPlayer, Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(timerLabel, Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(avatar, Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 80, Short.MAX_VALUE)) - .addGap(14)) - - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(6) - .addComponent(zonesPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE) - .addGap(14)) - ); - gl_panelBackground.setVerticalGroup( - gl_panelBackground.createParallelGroup(Alignment.LEADING) - .addGroup(gl_panelBackground.createSequentialGroup() - - .addGap(6) - .addComponent(avatar, GroupLayout.PREFERRED_SIZE, 80, GroupLayout.PREFERRED_SIZE) - .addPreferredGap(ComponentPlacement.RELATED) - .addComponent(btnPlayer) - .addComponent(timerLabel) - .addGap(1) - // Life & Hand - .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(1) - .addComponent(life, GroupLayout.PREFERRED_SIZE, 18, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(1) - .addComponent(hand, GroupLayout.PREFERRED_SIZE, 18, GroupLayout.PREFERRED_SIZE)) - .addComponent(lifeLabel, GroupLayout.PREFERRED_SIZE, 20, GroupLayout.PREFERRED_SIZE) - .addComponent(handLabel, GroupLayout.PREFERRED_SIZE, 20, GroupLayout.PREFERRED_SIZE)) - .addGap(1) - // Poison - .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(4) - .addComponent(poison, GroupLayout.PREFERRED_SIZE, 14, GroupLayout.PREFERRED_SIZE) - .addGap(4) - .addComponent(btnWhiteMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) - .addGap(2) - .addComponent(btnBlueMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) - .addGap(2) - .addComponent(btnBlackMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) - .addGap(5) - .addComponent(grave, GroupLayout.PREFERRED_SIZE, 21, GroupLayout.PREFERRED_SIZE) - ) - - .addGroup(gl_panelBackground.createSequentialGroup() - .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(1) - .addComponent(library, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE)) - .addComponent(poisonLabel, GroupLayout.PREFERRED_SIZE, 20, GroupLayout.PREFERRED_SIZE)) - .addGap(2) - .addComponent(btnRedMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(14) - .addComponent(manaCountLabelW, GroupLayout.PREFERRED_SIZE, 30, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(14) - .addComponent(manaCountLabelR, GroupLayout.PREFERRED_SIZE, 30, GroupLayout.PREFERRED_SIZE))) - .addGap(4) - .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) - .addComponent(manaCountLabelB, GroupLayout.PREFERRED_SIZE, 30, GroupLayout.PREFERRED_SIZE) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(8) - .addComponent(btnColorlessMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) - .addComponent(manaCountLabelX, GroupLayout.PREFERRED_SIZE, 30, GroupLayout.PREFERRED_SIZE))) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(39) - .addComponent(btnGreenMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(31) - .addComponent(manaCountLabelG, GroupLayout.PREFERRED_SIZE, 30, GroupLayout.PREFERRED_SIZE)) - .addComponent(libraryLabel, GroupLayout.PREFERRED_SIZE, 20, GroupLayout.PREFERRED_SIZE) - /*.addGroup(gl_panelBackground.createSequentialGroup() - .addGap(76) - .addComponent(cheat, GroupLayout.PREFERRED_SIZE, 21, GroupLayout.PREFERRED_SIZE))*/ - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(76) - .addComponent(exileZone, GroupLayout.PREFERRED_SIZE, 21, GroupLayout.PREFERRED_SIZE) - ) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(76) - .addComponent(graveLabel, GroupLayout.PREFERRED_SIZE, 21, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(76) - .addComponent(exileLabel, GroupLayout.PREFERRED_SIZE, 21, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(31) - .addComponent(manaCountLabelU, GroupLayout.PREFERRED_SIZE, 30, GroupLayout.PREFERRED_SIZE) - ) - ) - .addPreferredGap(ComponentPlacement.RELATED) - .addComponent(zonesPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(9) + .addComponent(life, GroupLayout.PREFERRED_SIZE, 18, GroupLayout.PREFERRED_SIZE) + .addGap(3) + .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(18) + .addComponent(hand, GroupLayout.PREFERRED_SIZE, 18, GroupLayout.PREFERRED_SIZE)) + .addComponent(lifeLabel, GroupLayout.PREFERRED_SIZE, 25, GroupLayout.PREFERRED_SIZE)) + .addGap(4) + .addComponent(handLabel, GroupLayout.PREFERRED_SIZE, 20, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(9) + .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(3) + .addComponent(poison, GroupLayout.PREFERRED_SIZE, 14, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(2) + .addComponent(btnWhiteMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(2) + .addComponent(btnBlueMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(2) + .addComponent(btnBlackMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) + .addComponent(grave, GroupLayout.PREFERRED_SIZE, 21, GroupLayout.PREFERRED_SIZE) ) + .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(18) + .addComponent(library, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE)) + .addComponent(poisonLabel, GroupLayout.PREFERRED_SIZE, 20, GroupLayout.PREFERRED_SIZE) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(20) + .addComponent(btnRedMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(1) + .addComponent(manaCountLabelW, GroupLayout.PREFERRED_SIZE, MANA_LABEL_SIZE_HORIZONTAL, GroupLayout.PREFERRED_SIZE))) + .addGap(3) + .addComponent(manaCountLabelR, GroupLayout.PREFERRED_SIZE, MANA_LABEL_SIZE_HORIZONTAL, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(1) + .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) + .addComponent(manaCountLabelB, GroupLayout.PREFERRED_SIZE, MANA_LABEL_SIZE_HORIZONTAL, GroupLayout.PREFERRED_SIZE) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(19) + .addComponent(btnColorlessMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE))) + .addGap(5) + .addComponent(manaCountLabelX, GroupLayout.PREFERRED_SIZE, MANA_LABEL_SIZE_HORIZONTAL, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(20) + .addComponent(btnGreenMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(40) + .addComponent(manaCountLabelG, GroupLayout.PREFERRED_SIZE, MANA_LABEL_SIZE_HORIZONTAL, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(40) + .addComponent(libraryLabel, GroupLayout.PREFERRED_SIZE, 25, GroupLayout.PREFERRED_SIZE)) + /*.addGroup(gl_panelBackground.createSequentialGroup() + .addGap(18) + .addComponent(cheat, GroupLayout.PREFERRED_SIZE, 25, GroupLayout.PREFERRED_SIZE))*/ + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(18) + .addComponent(exileZone, GroupLayout.PREFERRED_SIZE, 25, GroupLayout.PREFERRED_SIZE) + ) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(5) + .addComponent(graveLabel, GroupLayout.PREFERRED_SIZE, 25, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(40) + .addComponent(exileLabel, GroupLayout.PREFERRED_SIZE, 25, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(1) + .addComponent(manaCountLabelU, GroupLayout.PREFERRED_SIZE, MANA_LABEL_SIZE_HORIZONTAL, GroupLayout.PREFERRED_SIZE)))) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(6) + .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) + .addComponent(btnPlayer, Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(timerLabel, Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(avatar, Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 80, Short.MAX_VALUE)) + .addGap(14)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(6) + .addComponent(zonesPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE) + .addGap(14)) + ); + gl_panelBackground.setVerticalGroup( + gl_panelBackground.createParallelGroup(Alignment.LEADING) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(6) + .addComponent(avatar, GroupLayout.PREFERRED_SIZE, 80, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(ComponentPlacement.RELATED) + .addComponent(btnPlayer) + .addComponent(timerLabel) + .addGap(1) + // Life & Hand + .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(1) + .addComponent(life, GroupLayout.PREFERRED_SIZE, 18, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(1) + .addComponent(hand, GroupLayout.PREFERRED_SIZE, 18, GroupLayout.PREFERRED_SIZE)) + .addComponent(lifeLabel, GroupLayout.PREFERRED_SIZE, 20, GroupLayout.PREFERRED_SIZE) + .addComponent(handLabel, GroupLayout.PREFERRED_SIZE, 20, GroupLayout.PREFERRED_SIZE)) + .addGap(1) + // Poison + .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(4) + .addComponent(poison, GroupLayout.PREFERRED_SIZE, 14, GroupLayout.PREFERRED_SIZE) + .addGap(4) + .addComponent(btnWhiteMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) + .addGap(2) + .addComponent(btnBlueMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) + .addGap(2) + .addComponent(btnBlackMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) + .addGap(5) + .addComponent(grave, GroupLayout.PREFERRED_SIZE, 21, GroupLayout.PREFERRED_SIZE) + ) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(1) + .addComponent(library, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE)) + .addComponent(poisonLabel, GroupLayout.PREFERRED_SIZE, 20, GroupLayout.PREFERRED_SIZE)) + .addGap(2) + .addComponent(btnRedMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(14) + .addComponent(manaCountLabelW, GroupLayout.PREFERRED_SIZE, 30, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(14) + .addComponent(manaCountLabelR, GroupLayout.PREFERRED_SIZE, 30, GroupLayout.PREFERRED_SIZE))) + .addGap(4) + .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) + .addComponent(manaCountLabelB, GroupLayout.PREFERRED_SIZE, 30, GroupLayout.PREFERRED_SIZE) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(8) + .addComponent(btnColorlessMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) + .addComponent(manaCountLabelX, GroupLayout.PREFERRED_SIZE, 30, GroupLayout.PREFERRED_SIZE))) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(39) + .addComponent(btnGreenMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(31) + .addComponent(manaCountLabelG, GroupLayout.PREFERRED_SIZE, 30, GroupLayout.PREFERRED_SIZE)) + .addComponent(libraryLabel, GroupLayout.PREFERRED_SIZE, 20, GroupLayout.PREFERRED_SIZE) + /*.addGroup(gl_panelBackground.createSequentialGroup() + .addGap(76) + .addComponent(cheat, GroupLayout.PREFERRED_SIZE, 21, GroupLayout.PREFERRED_SIZE))*/ + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(76) + .addComponent(exileZone, GroupLayout.PREFERRED_SIZE, 21, GroupLayout.PREFERRED_SIZE) + ) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(76) + .addComponent(graveLabel, GroupLayout.PREFERRED_SIZE, 21, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(76) + .addComponent(exileLabel, GroupLayout.PREFERRED_SIZE, 21, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_panelBackground.createSequentialGroup() + .addGap(31) + .addComponent(manaCountLabelU, GroupLayout.PREFERRED_SIZE, 30, GroupLayout.PREFERRED_SIZE) + ) + ) + .addPreferredGap(ComponentPlacement.RELATED) + .addComponent(zonesPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE) + ) ); panelBackground.setLayout(gl_panelBackground); GroupLayout groupLayout = new GroupLayout(this); groupLayout.setHorizontalGroup( groupLayout.createParallelGroup(Alignment.LEADING) - .addGroup(groupLayout.createSequentialGroup() - .addComponent(panelBackground, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE)) + .addGroup(groupLayout.createSequentialGroup() + .addComponent(panelBackground, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE)) ); groupLayout.setVerticalGroup( groupLayout.createParallelGroup(Alignment.LEADING) - .addGroup(groupLayout.createSequentialGroup() - .addComponent(panelBackground, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE)) + .addGroup(groupLayout.createSequentialGroup() + .addComponent(panelBackground, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE)) ); setLayout(groupLayout); @@ -780,8 +752,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { timerLabel.setVisible(true); panelBackground.setPreferredSize(new Dimension(PANEL_WIDTH - 2, PANEL_HEIGHT_SMALL)); panelBackground.setBounds(0, 0, PANEL_WIDTH - 2, PANEL_HEIGHT_SMALL); - } - else { + } else { avatar.setVisible(true); btnPlayer.setVisible(false); timerLabel.setVisible(false); @@ -794,13 +765,12 @@ public class PlayerPanelExt extends javax.swing.JPanel { session.sendPlayerManaType(gameId, player.getPlayerId(), manaType); } - private void btnGraveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnGraveActionPerformed + private void btnGraveActionPerformed(java.awt.event.ActionEvent evt) { MageFrame.getGame(gameId).openGraveyardWindow(player.getName()); - /*if (graveyard == null) { - graveyard = new ShowCardsDialog(); - }*/ - //graveyard.loadCards(player.getName() + " graveyard", player.getGraveyard(), bigCard, Config.dimensions, gameId, false); - // DialogManager.getManager(gameId).showGraveyardDialog(player.getGraveyard(), bigCard, gameId); + } + + private void btnLibraryActionPerformed(java.awt.event.ActionEvent evt) { + MageFrame.getGame(gameId).openTopLibraryWindow(player.getName()); } private void btnCommandZoneActionPerformed(java.awt.event.ActionEvent evt) { @@ -826,9 +796,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { private ImagePanel poison; private ImagePanel hand; private HoverButton grave; - private ImagePanel library; - private CardView topCard; - private MageCard topCardPanel; + private HoverButton library; private JButton cheat; private MageRoundPane panelBackground; diff --git a/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java b/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java index 72847cca1ad..72c3eb98af4 100644 --- a/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java +++ b/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java @@ -1,7 +1,21 @@ package mage.client.util.gui; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.GraphicsConfiguration; +import java.awt.Insets; +import java.awt.Point; +import java.awt.Rectangle; +import java.util.ArrayList; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.SwingConstants; +import mage.client.MageFrame; import mage.constants.CardType; import mage.constants.MageObjectType; +import mage.constants.Rarity; import mage.utils.CardUtil; import mage.view.CardView; import mage.view.CounterView; @@ -10,39 +24,34 @@ import org.jdesktop.swingx.JXPanel; import org.mage.card.arcane.ManaSymbols; import org.mage.card.arcane.UI; -import javax.swing.*; -import java.awt.*; -import java.util.ArrayList; -import mage.constants.Rarity; - public class GuiDisplayUtil { + private static final Font cardNameFont = new Font("Calibri", Font.BOLD, 15); private static final Insets DEFAULT_INSETS = new Insets(0, 0, 70, 25); private static final Insets COMPONENT_INSETS = new Insets(0, 0, 40, 40); public static class TextLines { - + public int basicTextLength; public ArrayList lines; } - + public static JXPanel getDescription(CardView card, int width, int height) { JXPanel descriptionPanel = new JXPanel(); //descriptionPanel.setAlpha(.8f); - descriptionPanel.setBounds(0, 0, width, height); + descriptionPanel.setBounds(0, 0, width, height); descriptionPanel.setVisible(false); descriptionPanel.setLayout(null); //descriptionPanel.setBorder(BorderFactory.createLineBorder(Color.green)); - JButton j = new JButton(""); - j.setBounds(0, 0, width, height); + j.setBounds(0, 0, width, height); j.setBackground(Color.black); j.setLayout(null); JLabel cardText = new JLabel(); - cardText.setBounds(5, 5, width - 10, height - 10); + cardText.setBounds(5, 5, width - 10, height - 10); cardText.setForeground(Color.white); cardText.setFont(cardNameFont); cardText.setVerticalAlignment(SwingConstants.TOP); @@ -70,36 +79,52 @@ public class GuiDisplayUtil { return out.toString().toLowerCase(); } + public static void keepComponentInsideScreen(int centerX, int centerY, Component component) { + Dimension screenDim = component.getToolkit().getScreenSize(); + GraphicsConfiguration g = component.getGraphicsConfiguration(); - public static void keepComponentInsideScreen(int x, int y, Component c) { - Dimension screenDim = c.getToolkit().getScreenSize(); - GraphicsConfiguration g = c.getGraphicsConfiguration(); if (g != null) { - Insets insets = c.getToolkit().getScreenInsets(g); + Insets insets = component.getToolkit().getScreenInsets(g); // no usable space like toolbar boolean setLocation = false; - if (x + c.getWidth() > screenDim.width - insets.right) { - x = (screenDim.width - insets.right) - c.getWidth(); + if (centerX + component.getWidth() > screenDim.width - insets.right) { + centerX = (screenDim.width - insets.right) - component.getWidth(); setLocation = true; - } else if (x < insets.left) { - x = insets.left; + } else if (centerX < insets.left) { + centerX = insets.left; setLocation = true; } - if (y + c.getHeight() > screenDim.height - insets.bottom) { - y = (screenDim.height - insets.bottom) - c.getHeight(); + if (centerY + component.getHeight() > screenDim.height - insets.bottom) { + centerY = (screenDim.height - insets.bottom) - component.getHeight(); setLocation = true; - } else if (y < insets.top) { - y = insets.top; + } else if (centerY < insets.top) { + centerY = insets.top; setLocation = true; } if (setLocation) { - c.setLocation(x, y); + component.setLocation(centerX, centerY); } } else { System.out.println("GuiDisplayUtil::keepComponentInsideScreen -> no GraphicsConfiguration"); } } + static final int OVERLAP_LIMIT = 10; + + public static void keepComponentInsideFrame(int centerX, int centerY, Component component) { + Rectangle frameRec = MageFrame.getInstance().getBounds(); + boolean setLocation = false; + if (component.getX() > (frameRec.width - OVERLAP_LIMIT)) { + setLocation = true; + } + if (component.getY() > (frameRec.height - OVERLAP_LIMIT)) { + setLocation = true; + } + if (setLocation) { + component.setLocation(centerX, centerY); + } + } + public static Point keepComponentInsideParent(Point l, Point parentPoint, Component c, Component parent) { int dx = parentPoint.x + parent.getWidth() - DEFAULT_INSETS.right - COMPONENT_INSETS.right; if (l.x + c.getWidth() > dx) { @@ -117,8 +142,8 @@ public class GuiDisplayUtil { public static TextLines getTextLinesfromCardView(CardView card) { TextLines textLines = new TextLines(); textLines.lines = new ArrayList<>(card.getRules()); - for (String rule: card.getRules()) { - textLines.basicTextLength +=rule.length(); + for (String rule : card.getRules()) { + textLines.basicTextLength += rule.length(); } if (card.getMageObjectType().equals(MageObjectType.PERMANENT)) { if (card.getPairedCard() != null) { @@ -156,7 +181,7 @@ public class GuiDisplayUtil { } } if (card.getMageObjectType().isPermanent() && card instanceof PermanentView) { - int damage = ((PermanentView)card).getDamage(); + int damage = ((PermanentView) card).getDamage(); if (damage > 0) { textLines.lines.add("Damage dealt: " + damage + ""); textLines.basicTextLength += 50; @@ -183,10 +208,10 @@ public class GuiDisplayUtil { String fontFamily = "tahoma"; /*if (prefs.fontFamily == CardFontFamily.arial) - fontFamily = "arial"; - else if (prefs.fontFamily == CardFontFamily.verdana) { - fontFamily = "verdana"; - }*/ + fontFamily = "arial"; + else if (prefs.fontFamily == CardFontFamily.verdana) { + fontFamily = "verdana"; + }*/ final StringBuilder buffer = new StringBuilder(512); buffer.append(""); buffer.append(card.getDisplayName()); if (card.isGameObject()) { - buffer.append(" [").append(card.getId().toString().substring(0,3)).append("]"); + buffer.append(" [").append(card.getId().toString().substring(0, 3)).append("]"); } buffer.append(""); - if(card.getColor().isWhite()) { + if (card.getColor().isWhite()) { buffer.append("W"); } - if(card.getColor().isBlue()) { + if (card.getColor().isBlue()) { buffer.append("U"); } - if(card.getColor().isBlack()) { + if (card.getColor().isBlack()) { buffer.append("B"); } - if(card.getColor().isRed()) { + if (card.getColor().isRed()) { buffer.append("R"); } - if(card.getColor().isGreen()) { + if (card.getColor().isGreen()) { buffer.append("G"); } - if(!card.getColor().isColorless()) { + if (!card.getColor().isColorless()) { buffer.append("  "); } buffer.append(getTypes(card)); buffer.append(""); - String rarity ; + String rarity; if (card.getRarity() == null) { rarity = Rarity.COMMON.getCode(); - buffer.append(""); - }else { + buffer.append(""); + } else { switch (card.getRarity()) { case RARE: buffer.append(""); @@ -310,7 +335,7 @@ public class GuiDisplayUtil { if (textLine != null && !textLine.replace(".", "").trim().isEmpty()) { rule.append("

").append(textLine).append("

"); } - } + } } String legal = rule.toString(); @@ -319,12 +344,12 @@ public class GuiDisplayUtil { // legal = legal.replaceAll("#([^#]+)#", "$1"); // legal = legal.replaceAll("\\s*//\\s*", "
"); // legal = legal.replace("\r\n", "
"); - legal = legal.replaceAll("\\{this\\}", card.getName().isEmpty() ? "this":card.getName()); - legal = legal.replaceAll("\\{source\\}", card.getName().isEmpty() ? "this":card.getName()); + legal = legal.replaceAll("\\{this\\}", card.getName().isEmpty() ? "this" : card.getName()); + legal = legal.replaceAll("\\{source\\}", card.getName().isEmpty() ? "this" : card.getName()); buffer.append(ManaSymbols.replaceSymbolsWithHTML(legal, ManaSymbols.Type.CARD)); } - buffer.append("
"); + buffer.append("
"); return buffer; } @@ -347,5 +372,5 @@ public class GuiDisplayUtil { types += subType + " "; } return types.trim(); - } + } }