github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-24 19:19:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Extracted Session interface, moved implementation to SessionImpl

Browse source
This commit is contained in:
magenoxx 2012-04-29 19:03:08 +04:00
parent 0970856fc8
commit 96cfb51686
11 changed files with 1265 additions and 1035 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,6 @@
package mage.client;
import mage.Constants;
import mage.cards.Card;
import mage.cards.decks.Deck;
import mage.client.cards.CardsStorage;
@ -60,7 +59,6 @@ import mage.client.util.EDTExceptionHandler;
import mage.client.util.SettingsManager;
import mage.client.util.gui.ArrowBuilder;
import mage.components.ImagePanel;
import mage.game.match.MatchOptions;
import mage.interfaces.Action;
import mage.interfaces.MageClient;
import mage.interfaces.callback.CallbackClient;
@ -68,10 +66,9 @@ import mage.interfaces.callback.ClientCallback;
import mage.remote.Connection;
import mage.remote.Connection.ProxyType;
import mage.remote.Session;
import mage.remote.SessionImpl;
import mage.server.Main;
import mage.sets.Sets;
import mage.utils.MageVersion;
import mage.view.TableView;
import org.apache.log4j.Logger;
import org.mage.card.arcane.ManaSymbols;
@ -181,7 +178,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
SettingsManager.getInstance().setScreenWidthAndHeight(1024, 768);
this.setExtendedState(JFrame.MAXIMIZED_BOTH);
session = new Session(this);
session = new SessionImpl(this);
session.setEmbeddedMageServerAction(new Action() {
@Override
public void execute() {

18
Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java
View file

@ -27,29 +27,27 @@
*/
package mage.client.dialog;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JOptionPane;
import javax.swing.SpinnerNumberModel;
import mage.Constants.MultiplayerAttackOption;
import mage.Constants.RangeOfInfluence;
import mage.cards.decks.importer.DeckImporterUtil;
import mage.client.MageFrame;
import mage.client.components.MageComponents;
import mage.cards.decks.importer.DeckImporterUtil;
import mage.client.table.TablePlayerPanel;
import mage.client.util.Event;
import mage.client.util.Listener;
import mage.game.match.MatchOptions;
import mage.remote.Session;
import mage.sets.Sets;
import mage.view.GameTypeView;
import mage.view.TableView;
import org.apache.log4j.Logger;
import javax.swing.*;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com

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

@ -29,7 +29,6 @@
package mage.client.dialog;
import java.awt.BorderLayout;
import java.awt.Point;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.UUID;
@ -37,15 +36,11 @@ import java.util.UUID;
import javax.swing.JButton;
import javax.swing.JLayeredPane;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import mage.cards.CardDimensions;
import mage.client.MageFrame;
import mage.client.cards.BigCard;
import mage.client.cards.CardArea;
import mage.client.util.SettingsManager;
import mage.client.util.gui.GuiDisplayUtil;
import mage.remote.Session;
import mage.view.CardsView;
/**

14
Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
View file

@ -34,22 +34,22 @@
package mage.client.draft;
import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.UUID;
import javax.swing.Timer;
import mage.client.MageFrame;
import mage.client.constants.Constants.SortBy;
import mage.client.plugins.impl.Plugins;
import mage.client.util.CardsViewUtil;
import mage.remote.Session;
import mage.client.util.Event;
import mage.client.util.Listener;
import mage.remote.Session;
import mage.view.CardsView;
import mage.view.DraftPickView;
import mage.view.DraftView;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com

1
Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
View file

@ -36,7 +36,6 @@ package mage.client.game;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.MouseEvent;
import java.io.Serializable;
import java.util.Map;
import java.util.UUID;

1
Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
View file

@ -5,7 +5,6 @@ import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import java.util.List;
import java.util.UUID;
import java.util.prefs.Preferences;
import javax.swing.*;

3
Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java
View file

@ -8,6 +8,7 @@ import mage.interfaces.MageClient;
import mage.interfaces.callback.ClientCallback;
import mage.remote.Connection;
import mage.remote.Session;
import mage.remote.SessionImpl;
import mage.utils.MageVersion;
import org.apache.log4j.Logger;
import org.junit.Ignore;
@ -46,7 +47,7 @@ public class MultiConnectTest {
}
public void connect() {
session = new Session(this);
session = new SessionImpl(this);
Connection connection = new Connection();
connection.setUsername(username);
connection.setHost("localhost");

1138
Mage.Common/src/mage/remote/Session.java
View file

File diff suppressed because it is too large Load diff

1109
Mage.Common/src/mage/remote/SessionImpl.java Normal file
View file

File diff suppressed because it is too large Load diff

3
Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java
View file

@ -38,6 +38,7 @@ import mage.interfaces.MageClient;
import mage.interfaces.callback.ClientCallback;
import mage.remote.Connection;
import mage.remote.Session;
import mage.remote.SessionImpl;
import mage.utils.MageVersion;
import org.apache.log4j.Logger;
@ -79,7 +80,7 @@ public class ConsoleFrame extends javax.swing.JFrame implements MageClient {
initComponents();
try {
UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
session = new Session(this);
session = new SessionImpl(this);
connectDialog = new ConnectDialog();
} catch (Exception ex) {
logger.fatal("", ex);

1
Mage.Server.Console/src/main/java/mage/server/console/ConsolePanel.java
View file

@ -40,6 +40,7 @@ import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import javax.swing.SwingWorker;
import javax.swing.table.AbstractTableModel;
import mage.remote.Session;
import mage.view.TableView;
import mage.view.UserView;