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

Minor formatting.

Browse source
This commit is contained in:
LevelX2 2013-09-28 19:13:33 +02:00
parent fe82b49930
commit b6e1497b5c
2 changed files with 46 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPane.java
View file

@ -34,16 +34,16 @@
package mage.client.deckeditor;
import java.awt.Component;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import javax.swing.JComponent;
import mage.cards.decks.Deck;
import mage.client.MagePane;
import mage.client.constants.Constants.DeckEditorMode;
import mage.client.plugins.impl.Plugins;
import javax.swing.*;
import java.awt.*;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
/**
*
@ -56,8 +56,8 @@ public class DeckEditorPane extends MagePane {
boolean initialized = false;
if (Plugins.getInstance().isThemePluginLoaded()) {
Map<String, JComponent> ui = new HashMap<String, JComponent>();
JComponent container = Plugins.getInstance().updateTablePanel(ui);
Map<String, JComponent> uiMap = new HashMap<String, JComponent>();
JComponent container = Plugins.getInstance().updateTablePanel(uiMap);
if (container != null) {
deckEditorPanel1 = new mage.client.deckeditor.DeckEditorPanel();
initComponents(container);
@ -73,13 +73,16 @@ public class DeckEditorPane extends MagePane {
}
public void show(DeckEditorMode mode, Deck deck, String name, UUID tableId, int time) {
if (mode == DeckEditorMode.Sideboard || mode == DeckEditorMode.Limited)
if (mode == DeckEditorMode.Sideboard || mode == DeckEditorMode.Limited) {
this.setTitle("Deck Editor - " + tableId.toString());
}
else {
if (deck != null)
if (deck != null) {
this.setTitle("Deck Editor - " + deck.getName());
else
}
else {
this.setTitle("Deck Editor");
}
}
this.deckEditorPanel1.showDeckEditor(mode, deck, tableId, time);
this.repaint();

50
Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
View file

@ -104,8 +104,9 @@ public class DeckEditorPanel extends javax.swing.JPanel {
setTimeout(timeout);
}
else {
if (updateDeckTask != null)
if (updateDeckTask != null) {
updateDeckTask.cancel(true);
}
setTimeout(0);
countdown.stop();
hideDeckEditor();
@ -116,8 +117,9 @@ public class DeckEditorPanel extends javax.swing.JPanel {
}
public void showDeckEditor(DeckEditorMode mode, Deck deck, UUID tableId, int time) {
if (deck != null)
if (deck != null) {
this.deck = deck;
}
this.tableId = tableId;
this.mode = mode;
this.btnAddLand.setVisible(false);
@ -130,8 +132,9 @@ public class DeckEditorPanel extends javax.swing.JPanel {
this.cardSelector.loadSideboard(new ArrayList<Card>(deck.getSideboard()), this.bigCard);
this.btnExit.setVisible(false);
this.btnImport.setVisible(false);
if (!MageFrame.getSession().isTestMode())
this.btnLoad.setVisible(false);
if (!MageFrame.getSession().isTestMode()) {
this.btnLoad.setVisible(false);
}
this.deckArea.showSideboard(false);
countdown.stop();
this.timeout = time;
@ -150,8 +153,9 @@ public class DeckEditorPanel extends javax.swing.JPanel {
//this.cardTableSelector.loadCards(this.bigCard);
this.btnExit.setVisible(true);
this.btnImport.setVisible(true);
if (!MageFrame.getSession().isTestMode())
if (!MageFrame.getSession().isTestMode()) {
this.btnLoad.setVisible(true);
}
this.deckArea.showSideboard(true);
this.txtTimeRemaining.setVisible(false);
break;
@ -282,14 +286,16 @@ public class DeckEditorPanel extends javax.swing.JPanel {
}
public void hideDeckEditor() {
if (updateDeckTask != null)
if (updateDeckTask != null) {
updateDeckTask.cancel(true);
}
Component c = this.getParent();
while (c != null && !(c instanceof DeckEditorPane)) {
c = c.getParent();
}
if (c != null)
if (c != null) {
((DeckEditorPane)c).hideFrame();
}
}
private BigCard getBigCard() {
@ -517,8 +523,9 @@ public class DeckEditorPanel extends javax.swing.JPanel {
private void btnLoadActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnLoadActionPerformed
String lastFolder = MageFrame.getPreferences().get("lastDeckFolder", "");
if (!lastFolder.isEmpty())
if (!lastFolder.isEmpty()) {
fcSelectDeck.setCurrentDirectory(new File(lastFolder));
}
int ret = fcSelectDeck.showOpenDialog(this);
if (ret == JFileChooser.APPROVE_OPTION) {
File file = fcSelectDeck.getSelectedFile();
@ -543,16 +550,18 @@ public class DeckEditorPanel extends javax.swing.JPanel {
private void btnSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSaveActionPerformed
String lastFolder = MageFrame.getPreferences().get("lastDeckFolder", "");
if (!lastFolder.isEmpty())
if (!lastFolder.isEmpty()) {
fcSelectDeck.setCurrentDirectory(new File(lastFolder));
}
deck.setName(this.txtDeckName.getText());
int ret = fcSelectDeck.showSaveDialog(this);
if (ret == JFileChooser.APPROVE_OPTION) {
File file = fcSelectDeck.getSelectedFile();
try {
String fileName = file.getPath();
if (!fileName.endsWith(".dck"))
if (!fileName.endsWith(".dck")) {
fileName += ".dck";
}
setCursor(new Cursor(Cursor.WAIT_CURSOR));
Sets.saveDeck(fileName, deck.getDeckCardLists());
} catch (Exception ex) {
@ -587,8 +596,9 @@ public class DeckEditorPanel extends javax.swing.JPanel {
private void btnImportActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnImportActionPerformed
String lastFolder = MageFrame.getPreferences().get("lastImportFolder", "");
if (!lastFolder.isEmpty())
if (!lastFolder.isEmpty()) {
fcImportDeck.setCurrentDirectory(new File(lastFolder));
}
int ret = fcImportDeck.showOpenDialog(this);
if (ret == JFileChooser.APPROVE_OPTION) {
File file = fcImportDeck.getSelectedFile();
@ -613,19 +623,22 @@ public class DeckEditorPanel extends javax.swing.JPanel {
}
refreshDeck();
try {
if (file != null)
if (file != null) {
MageFrame.getPreferences().put("lastImportFolder", file.getCanonicalPath());
}
} catch (IOException ex) { }
}
fcImportDeck.setSelectedFile(null);
}//GEN-LAST:event_btnImportActionPerformed
private void btnSubmitActionPerformed(java.awt.event.ActionEvent evt) {
if (updateDeckTask != null)
if (updateDeckTask != null) {
updateDeckTask.cancel(true);
}
if (MageFrame.getSession().submitDeck(tableId, deck.getDeckCardLists()))
if (MageFrame.getSession().submitDeck(tableId, deck.getDeckCardLists())) {
hideDeckEditor();
}
}
private void btnAddLandActionPerformed(java.awt.event.ActionEvent evt) {
@ -659,8 +672,9 @@ class DeckFilter extends FileFilter {
@Override
public boolean accept(File f) {
if (f.isDirectory())
if (f.isDirectory()) {
return true;
}
String ext = null;
String s = f.getName();
@ -682,8 +696,9 @@ class ImportFilter extends FileFilter {
@Override
public boolean accept(File f) {
if (f.isDirectory())
if (f.isDirectory()) {
return true;
}
String ext = null;
String s = f.getName();
@ -693,8 +708,9 @@ class ImportFilter extends FileFilter {
ext = s.substring(i+1).toLowerCase();
}
if (ext != null) {
if (ext.toLowerCase().equals("dec") || ext.toLowerCase().equals("mwdeck") || ext.toLowerCase().equals("txt"))
if (ext.toLowerCase().equals("dec") || ext.toLowerCase().equals("mwdeck") || ext.toLowerCase().equals("txt")) {
return true;
}
}
return false;
}