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

Merge with version 0.8

Browse source
This commit is contained in:
BetaSteward 2011-07-17 15:49:38 -04:00
commit 9ddea9d9c5
67 changed files with 2510 additions and 2646 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -108,7 +108,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class);
private JLabel title;
private Rectangle titleRectangle;
private final static MageVersion version = new MageVersion(0, 7, 4, "beta-2");
private final static MageVersion version = new MageVersion(0, 8, 0, "");
private UUID clientId;
private static MagePane activeFrame;
private static boolean liteMode = false;
@ -761,8 +761,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
}//GEN-LAST:event_btnCollectionViewerActionPerformed
private void btnPreferencesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnPreferencesActionPerformed
//PhasesDialog.main(new String[]{});
PreferencesDialog.main(new String[]{});
PhasesDialog.main(new String[]{});
}//GEN-LAST:event_btnPreferencesActionPerformed
public void exitApp() {

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

@ -173,7 +173,6 @@ public class DeckEditorPanel extends javax.swing.JPanel {
if (cardInfoPane instanceof CardInfoPane) {
((CardInfoPane)cardInfoPane).setCard(new CardView(card));
}
hidePopup();
}
} else if (event.getEventName().equals("shift-double-click") && mode == DeckEditorMode.Constructed) {
@ -182,7 +181,6 @@ public class DeckEditorPanel extends javax.swing.JPanel {
if (cardInfoPane instanceof CardInfoPane) {
((CardInfoPane)cardInfoPane).setCard(new CardView(card));
}
hidePopup();
}
refreshDeck();
}
@ -196,7 +194,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
public void event(Event event) {
if (event.getEventName().equals("double-click")) {
for (Card card: deck.getCards()) {
if (card.getId().equals(event.getSource())) {
if (card.getId().equals((UUID)event.getSource())) {
deck.getCards().remove(card);
if (mode == DeckEditorMode.Limited || mode == DeckEditorMode.Sideboard) {
deck.getSideboard().add(card);
@ -205,18 +203,16 @@ public class DeckEditorPanel extends javax.swing.JPanel {
break;
}
}
hidePopup();
refreshDeck();
}
else if (event.getEventName().equals("shift-double-click") && mode == DeckEditorMode.Constructed) {
for (Card card: deck.getCards()) {
if (card.getId().equals(event.getSource())) {
if (card.getId().equals((UUID)event.getSource())) {
deck.getCards().remove(card);
deck.getSideboard().add(card);
break;
}
}
hidePopup();
refreshDeck();
}
}
@ -227,14 +223,16 @@ public class DeckEditorPanel extends javax.swing.JPanel {
@Override
public void event(Event event) {
if (event.getEventName().equals("double-click")) {
//boolean isListView = cardSelector.getCardsList() instanceof TableModel;
for (Card card: deck.getSideboard()) {
if (card.getId().equals(event.getSource())) {
if (card.getId().equals((UUID)event.getSource())) {
deck.getSideboard().remove(card);
//if (!isListView) {
deck.getCards().add(card);
//}
break;
}
}
hidePopup();
refreshDeck();
}
}
@ -245,10 +243,6 @@ public class DeckEditorPanel extends javax.swing.JPanel {
this.repaint();
}
private void hidePopup() {
Plugins.getInstance().getActionCallback().mouseExited(null, null);
}
public void hideDeckEditor() {
Component c = this.getParent();
while (c != null && !(c instanceof DeckEditorPane)) {
@ -585,26 +579,27 @@ public class DeckEditorPanel extends javax.swing.JPanel {
int ret = fcImportDeck.showOpenDialog(this);
if (ret == JFileChooser.APPROVE_OPTION) {
File file = fcImportDeck.getSelectedFile();
try {
setCursor(new Cursor(Cursor.WAIT_CURSOR));
DeckImporter importer = getDeckImporter(file.getPath());
if (importer != null) {
deck = Deck.load(importer.importDeck(file.getPath()));
if (file != null) {
try {
setCursor(new Cursor(Cursor.WAIT_CURSOR));
DeckImporter importer = getDeckImporter(file.getPath());
if (importer != null) {
deck = Deck.load(importer.importDeck(file.getPath()));
}
else {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Unknown deck format", "Error importing deck", JOptionPane.ERROR_MESSAGE);
}
} catch (Exception ex) {
Logger.getLogger(DeckEditorPanel.class.getName()).log(Level.SEVERE, null, ex);
}
else {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Unknown deck format", "Error importing deck", JOptionPane.ERROR_MESSAGE);
finally {
setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
}
} catch (Exception ex) {
Logger.getLogger(DeckEditorPanel.class.getName()).log(Level.SEVERE, null, ex);
}
finally {
setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
}
refreshDeck();
try {
if (file != null)
refreshDeck();
try {
MageFrame.getPreferences().put("lastImportFolder", file.getCanonicalPath());
} catch (IOException ex) { }
} catch (IOException ex) { }
}
}
fcImportDeck.setSelectedFile(null);
}//GEN-LAST:event_btnImportActionPerformed

8
Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
View file

@ -80,9 +80,6 @@ public class CallbackClientImpl implements CallbackClient {
public void run() {
try {
logger.info(callback.getMessageId() + " -- " + callback.getMethod());
if (callback.getMethod() == null) { // may happen on disconnect
return;
}
if (callback.getMethod().equals("startGame")) {
TableClientMessage message = (TableClientMessage) callback.getData();
GameManager.getInstance().setCurrentPlayerUUID(message.getPlayerId());
@ -247,7 +244,10 @@ public class CallbackClientImpl implements CallbackClient {
}
}
else if (callback.getMethod().equals("draftInit")) {
DraftClientMessage message = (DraftClientMessage) callback.getData();
DraftPanel panel = frame.getDraft(callback.getObjectId());
if (panel != null)
panel.loadBooster(message.getDraftPickView());
}
else if (callback.getMethod().equals("tournamentInit")) {