External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 21:12:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some exception problems (deck layout, mana symbols).

Browse source
This commit is contained in:
LevelX2 2016-10-04 23:57:11 +02:00
parent db31264538
commit 7c4b40073c
3 changed files with 47 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Mage.Client/src/main/java/mage/client/deck/generator/DeckGeneratorDialog.java
View file

@ -27,17 +27,6 @@
*/
package mage.client.deck.generator;
import mage.cards.Sets;
import mage.cards.decks.Deck;
import mage.client.MageFrame;
import mage.client.dialog.PreferencesDialog;
import mage.client.util.gui.ColorsChooser;
import mage.client.util.sets.ConstructedFormats;
import javax.swing.*;
import javax.swing.border.CompoundBorder;
import javax.swing.border.EmptyBorder;
import javax.swing.border.EtchedBorder;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@ -46,6 +35,16 @@ import java.awt.event.ItemListener;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Date;
import javax.swing.*;
import javax.swing.border.CompoundBorder;
import javax.swing.border.EmptyBorder;
import javax.swing.border.EtchedBorder;
import mage.cards.Sets;
import mage.cards.decks.Deck;
import mage.client.MageFrame;
import mage.client.dialog.PreferencesDialog;
import mage.client.util.gui.ColorsChooser;
import mage.client.util.sets.ConstructedFormats;
/**
*
@ -62,8 +61,7 @@ public class DeckGeneratorDialog {
private static SimpleDateFormat dateFormat;
private static RatioAdjustingSliderPanel adjustingSliderPanel;
public DeckGeneratorDialog()
{
public DeckGeneratorDialog() {
initDialog();
dateFormat = new SimpleDateFormat("dd-MM-yyyy-hh-mm-ss-SSS");
}
@ -143,12 +141,11 @@ public class DeckGeneratorDialog {
c.ipadx = 30;
c.insets = new Insets(5, 10, 0, 10);
c.weightx = 0.90;
cbDeckSize = new JComboBox<>(new String[] { "40", "60" });
cbDeckSize = new JComboBox<>(new String[]{"40", "60"});
cbDeckSize.setSelectedIndex(0);
cbDeckSize.setAlignmentX(Component.LEFT_ALIGNMENT);
mainPanel.add(cbDeckSize, c);
String prefSize = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_NEW_DECK_GENERATOR_DECK_SIZE, "60");
if (prefSet != null) {
cbDeckSize.setSelectedItem(prefSize);
@ -218,7 +215,6 @@ public class DeckGeneratorDialog {
c.insets = new Insets(5, 10, 0, 5);
mainPanel.add(advancedPanel, c);
btnGenerate = new JButton("Ok");
btnGenerate.addActionListener(new ActionListener() {
@Override
@ -306,7 +302,7 @@ public class DeckGeneratorDialog {
c.ipady = 0;
c.weightx = 1.0;
c.anchor = GridBagConstraints.LAST_LINE_END;
c.insets = new Insets(10,10, 0, 0);
c.insets = new Insets(10, 10, 0, 0);
c.gridx = 2;
c.gridwidth = 1;
c.gridy = 2;
@ -329,16 +325,16 @@ public class DeckGeneratorDialog {
}
public void cleanUp() {
for (ActionListener al: btnGenerate.getActionListeners()) {
for (ActionListener al : btnGenerate.getActionListeners()) {
btnGenerate.removeActionListener(al);
}
for (ActionListener al: btnCancel.getActionListeners()) {
for (ActionListener al : btnCancel.getActionListeners()) {
btnCancel.removeActionListener(al);
}
for (ActionListener al: btnReset.getActionListeners()) {
for (ActionListener al : btnReset.getActionListeners()) {
btnReset.removeActionListener(al);
}
for(ItemListener il: cAdvanced.getItemListeners()) {
for (ItemListener il : cAdvanced.getItemListeners()) {
cAdvanced.removeItemListener(il);
}
}
@ -356,7 +352,7 @@ public class DeckGeneratorDialog {
cleanUp();
return tmp.getAbsolutePath();
} catch (Exception e) {
JOptionPane.showMessageDialog(null, "Couldn't generate deck. Try again.");
MageFrame.getInstance().showError("Couldn't generate deck. Try again.");
}
return null;
}
@ -418,13 +414,11 @@ public class DeckGeneratorDialog {
}
public DeckGeneratorCMC getDeckGeneratorCMC() {
DeckGeneratorCMC selectedCMC = (DeckGeneratorCMC)cbCMC.getSelectedItem();
DeckGeneratorCMC selectedCMC = (DeckGeneratorCMC) cbCMC.getSelectedItem();
PreferencesDialog.saveValue(PreferencesDialog.KEY_NEW_DECK_GENERATOR_ADVANCED_CMC, selectedCMC.name());
return selectedCMC;
}
public String getSelectedColors() {
if (selectedColors != null) {
PreferencesDialog.saveValue(PreferencesDialog.KEY_NEW_DECK_GENERATOR_DECK_SIZE, cbDeckSize.getSelectedItem().toString());

6
Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java
View file

@ -156,8 +156,10 @@ public class ManaSymbols {
//Image image = UI.getImageIcon(file.getAbsolutePath()).getImage();
BufferedImage image = ImageIO.read(file);
//BufferedImage resized = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(image, BufferedImage.TYPE_INT_ARGB), r);
BufferedImage resized = ImageHelper.getResizedImage(image, r);
sizedSymbols.put(symbol, resized);
if (image != null) {
BufferedImage resized = ImageHelper.getResizedImage(image, r);
sizedSymbols.put(symbol, resized);
}
}
} catch (IOException e) {
LOGGER.error("Error for symbol:" + symbol);