";
this.lblText.setText(text);
if (userRequestMessage.getButton1Text() != null) {
@@ -128,30 +121,30 @@ public class UserRequestDialog extends MageDialog {
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addContainerGap()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(lblText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addGroup(layout.createSequentialGroup()
- .addComponent(btn3, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(btn2, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(btn1, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)))
- .addContainerGap())
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(lblText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(btn3, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(btn2, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(btn1, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)))
+ .addContainerGap())
);
layout.setVerticalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(lblText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(btn1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(btn2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(btn3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addGap(12, 12, 12))
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(lblText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(btn1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(btn2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(btn3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGap(12, 12, 12))
);
pack();
diff --git a/Mage.Client/src/main/java/mage/client/dialog/WhatsNewDialog.form b/Mage.Client/src/main/java/mage/client/dialog/WhatsNewDialog.form
new file mode 100644
index 0000000000..af26b1a540
--- /dev/null
+++ b/Mage.Client/src/main/java/mage/client/dialog/WhatsNewDialog.form
@@ -0,0 +1,73 @@
+
+
+
diff --git a/Mage.Client/src/main/java/mage/client/dialog/WhatsNewDialog.java b/Mage.Client/src/main/java/mage/client/dialog/WhatsNewDialog.java
new file mode 100644
index 0000000000..761024b843
--- /dev/null
+++ b/Mage.Client/src/main/java/mage/client/dialog/WhatsNewDialog.java
@@ -0,0 +1,434 @@
+package mage.client.dialog;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.concurrent.Worker;
+import javafx.embed.swing.JFXPanel;
+import javafx.scene.Scene;
+import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebView;
+import mage.client.MageFrame;
+import mage.utils.MageVersion;
+import org.apache.log4j.Logger;
+import org.w3c.dom.events.EventListener;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Type;
+import java.net.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+/**
+ * @author JayDi85
+ */
+public class WhatsNewDialog extends MageDialog {
+
+ private static final Logger logger = Logger.getLogger(WhatsNewDialog.class);
+ private static final MageVersion clientVersion = new MageVersion(WhatsNewDialog.class);
+
+ // cookies tester: http://www.html-kit.com/tools/cookietester/
+ private static final String WHATS_NEW_PAGE = "https://jaydi85.github.io/xmage-web-news/news.html";
+ private static final String WHATS_NEW_VERSION_PAGE = "https://jaydi85.github.io/xmage-web-news/news_version.html"; // increment version=123 to auto-shown for all users
+ private static final int WHATS_NEW_LOAD_TIMEOUT_SECS = 20; // timeout for page loading
+
+ private final JFXPanel fxPanel;
+ private WebView webView;
+ private WebEngine engine;
+ private boolean isPageReady = false;
+
+ private final SwingWorker backgroundWorker = new SwingWorker() {
+ @Override
+ public Void doInBackground() {
+ try {
+ int maxWait = WHATS_NEW_LOAD_TIMEOUT_SECS;
+ int currentWait = 0;
+ while (!isPageReady) {
+ Thread.sleep(1000);
+ currentWait++;
+ if (currentWait > maxWait) {
+ logger.error("Can't load news page: " + WHATS_NEW_PAGE);
+ break;
+ }
+ }
+ } catch (InterruptedException e) {
+ logger.error("Checking news was interrupted", e);
+ Thread.currentThread().interrupt();
+ }
+ return null;
+ }
+
+ @Override
+ public void done() {
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ if (isPageReady) {
+ showDialog();
+ }
+ }
+ });
+ }
+ };
+
+ private final SwingWorker backgroundUpdatesWorker = new SwingWorker() {
+
+ private String newVersion = "";
+
+ @Override
+ public Void doInBackground() {
+ try {
+ // download version
+ URLConnection connection = new URL(WHATS_NEW_VERSION_PAGE).openConnection();
+ connection.setRequestProperty("user-agent", "xmage");
+ InputStream download = connection.getInputStream();
+ Scanner s = new Scanner(download).useDelimiter("\\A");
+ String result = s.hasNext() ? s.next() : "";
+
+ // check version (default: always have new version)
+ if (result.startsWith("version=")) {
+ newVersion = result.substring("version=".length());
+ }
+ } catch (MalformedURLException e) {
+ logger.error("Checking updates got wrong url " + WHATS_NEW_VERSION_PAGE, e);
+ } catch (IOException e) {
+ logger.error("Checking updates got error", e);
+ }
+ return null;
+ }
+
+ @Override
+ public void done() {
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ String oldVersion = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_NEWS_PAGE_LAST_VERSION, "1");
+
+ boolean isHaveUpdates = newVersion.isEmpty() || !newVersion.equals(oldVersion);
+ if (isHaveUpdates) {
+ PreferencesDialog.saveValue(PreferencesDialog.KEY_NEWS_PAGE_LAST_VERSION, newVersion);
+ loadURL(WHATS_NEW_PAGE);
+ backgroundWorker.execute();
+ }
+ }
+ });
+ }
+ };
+
+ public WhatsNewDialog() {
+ initComponents();
+ this.setDefaultCloseOperation(HIDE_ON_CLOSE);
+
+ fxPanel = new JFXPanel();
+ panelData.add(fxPanel);
+ webView = null;
+ engine = null;
+
+ createWebView();
+ }
+
+ public void checkUpdatesAndShow(boolean forceToShowPage) {
+ // lazy loading in background
+ // shows it on page ready or by force
+
+ isPageReady = false;
+ if (forceToShowPage) {
+ // direct open
+ loadURL(WHATS_NEW_PAGE);
+ if (!backgroundUpdatesWorker.isDone()) backgroundUpdatesWorker.cancel(true);
+ if (!backgroundWorker.isDone()) backgroundWorker.cancel(true);
+
+ showDialog();
+ } else {
+ // checks version -> loads on new
+ backgroundUpdatesWorker.execute();
+ }
+ }
+
+ private void showDialog() {
+ this.setModal(true);
+ this.setResizable(true);
+ getRootPane().setDefaultButton(buttonCancel);
+ this.setSize(800, 600);
+
+ // windows settings
+ MageFrame.getDesktop().remove(this);
+ if (this.isModal()) {
+ MageFrame.getDesktop().add(this, JLayeredPane.MODAL_LAYER);
+ } else {
+ MageFrame.getDesktop().add(this, JLayeredPane.PALETTE_LAYER);
+ }
+ this.makeWindowCentered();
+
+ // Close on "ESC"
+ registerKeyboardAction(e -> onCancel(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+
+ this.setVisible(true);
+ }
+
+
+ /**
+ * Store cookies in preferences
+ */
+ private class PersistentCookieStore implements CookieStore, Runnable {
+ private CookieStore store;
+
+ public PersistentCookieStore() {
+ store = new CookieManager().getCookieStore();
+
+ // restore data
+ loadFromPrefs();
+
+ // save data on app close
+ Runtime.getRuntime().addShutdownHook(new Thread(this));
+ }
+
+ private void loadFromPrefs() {
+ String sourceValue = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_NEWS_PAGE_COOKIES, "");
+
+ Gson gson = new GsonBuilder().create();
+ List httpCookies = new ArrayList<>();
+ Type type = new TypeToken>() {
+ }.getType();
+ try {
+ httpCookies = gson.fromJson(sourceValue, type);
+ if (httpCookies != null) {
+ for (HttpCookie cookie : httpCookies) {
+ store.add(URI.create(cookie.getDomain()), cookie);
+ }
+ }
+ } catch (Exception e) {
+ logger.error("Wrong news page cookies", e);
+ }
+ }
+
+ private void saveToPrefs() {
+ List httpCookies = store.getCookies();
+ Gson gson = new GsonBuilder().create();
+ String destValue = gson.toJson(httpCookies);
+ PreferencesDialog.saveValue(PreferencesDialog.KEY_NEWS_PAGE_COOKIES, destValue);
+ }
+
+ @Override
+ public void run() {
+ saveToPrefs();
+ }
+
+ @Override
+ public void add(URI uri, HttpCookie cookie) {
+ store.add(uri, cookie);
+ }
+
+ @Override
+ public List get(URI uri) {
+ return store.get(uri);
+ }
+
+ @Override
+ public List getCookies() {
+ return store.getCookies();
+ }
+
+ @Override
+ public List getURIs() {
+ return store.getURIs();
+ }
+
+ @Override
+ public boolean remove(URI uri, HttpCookie cookie) {
+ return store.remove(uri, cookie);
+ }
+
+ @Override
+ public boolean removeAll() {
+ return store.removeAll();
+ }
+ }
+
+ private void createWebView() {
+
+ // init web engine and events
+ // https://docs.oracle.com/javafx/2/swing/swing-fx-interoperability.htm
+
+ Platform.runLater(new Runnable() {
+ @Override
+ public void run() {
+
+ webView = new WebView();
+ engine = webView.getEngine();
+ engine.setUserAgent(engine.getUserAgent() + " XMage/" + clientVersion.toString(false));
+ webView.contextMenuEnabledProperty().setValue(false);
+
+ CookieManager cookieManager = new CookieManager(new PersistentCookieStore(), CookiePolicy.ACCEPT_ALL);
+ CookieHandler.setDefault(cookieManager);
+
+ // on error
+ engine.getLoadWorker().exceptionProperty().addListener(new ChangeListener() {
+ public void changed(ObservableValue o, Throwable old, final Throwable value) {
+ if (engine.getLoadWorker().getState() == Worker.State.FAILED) {
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ logger.error("Can't load news page: " + (value != null ? value.getMessage() : "null"), value);
+ }
+ });
+ }
+ }
+ });
+
+ // on completed
+ engine.getLoadWorker().stateProperty().addListener(new ChangeListener() {
+ public void changed(ObservableValue ov, Worker.State oldState, Worker.State newState) {
+ if (newState == Worker.State.SUCCEEDED) {
+
+ // 1. replace urls with custom click processing
+ // all classes from org.w3c.dom
+ org.w3c.dom.events.EventListener listener = new EventListener() {
+ public void handleEvent(org.w3c.dom.events.Event ev) {
+ String href = ((org.w3c.dom.Element) ev.getTarget()).getAttribute("href");
+ ev.preventDefault();
+
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ if (Desktop.isDesktopSupported()) {
+ Desktop desktop = Desktop.getDesktop();
+ try {
+ URI uri = new URI(href);
+ desktop.browse(uri);
+ } catch (IOException | URISyntaxException ex) {
+ // do nothing
+ }
+ }
+ }
+ });
+ }
+ };
+ org.w3c.dom.Document doc = engine.getDocument();
+ org.w3c.dom.NodeList listA = doc.getElementsByTagName("a");
+ for (int i = 0; i < listA.getLength(); i++) {
+ ((org.w3c.dom.events.EventTarget) listA.item(i)).addEventListener("click", listener, false);
+ }
+
+ // 2. page can be shown
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ isPageReady = true;
+ }
+ });
+ }
+ }
+ });
+
+ fxPanel.setScene(new Scene(webView));
+ }
+ });
+ }
+
+ public void loadURL(final String url) {
+ Platform.runLater(new Runnable() {
+ @Override
+ public void run() {
+ String tmp = toURL(url);
+ if (url == null) {
+ tmp = toURL("http://" + url);
+ }
+ engine.load(tmp);
+ }
+ });
+ }
+
+ private static String toURL(String str) {
+ try {
+ return new URL(str).toExternalForm();
+ } catch (MalformedURLException exception) {
+ return null;
+ }
+ }
+
+
+ private void onCancel() {
+ 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.
+ */
+ @SuppressWarnings("unchecked")
+ // //GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ buttonCancel = new javax.swing.JButton();
+ buttonRefresh = new javax.swing.JButton();
+ panelData = new javax.swing.JPanel();
+
+ buttonCancel.setText("Close");
+ buttonCancel.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonCancelActionPerformed(evt);
+ }
+ });
+
+ buttonRefresh.setText("Refresh");
+ buttonRefresh.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonRefreshActionPerformed(evt);
+ }
+ });
+
+ panelData.setLayout(new java.awt.BorderLayout());
+
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
+ getContentPane().setLayout(layout);
+ layout.setHorizontalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(panelData, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(buttonRefresh, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(buttonCancel, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addContainerGap())
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(panelData, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(buttonCancel, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(buttonRefresh, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap())
+ );
+
+ pack();
+ }// //GEN-END:initComponents
+
+ private void buttonCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonCancelActionPerformed
+ onCancel();
+ }//GEN-LAST:event_buttonCancelActionPerformed
+
+ private void buttonRefreshActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonRefreshActionPerformed
+ loadURL(WHATS_NEW_PAGE);
+ }//GEN-LAST:event_buttonRefreshActionPerformed
+
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JButton buttonCancel;
+ private javax.swing.JButton buttonRefresh;
+ private javax.swing.JPanel panelData;
+ // End of variables declaration//GEN-END:variables
+}
diff --git a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
index 2ebb71df7a..d5b41eb9e0 100644
--- a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
+++ b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
@@ -21,7 +21,6 @@ import mage.client.util.audio.AudioManager;
import mage.client.util.gui.BufferedImageBuilder;
import mage.constants.PlayerAction;
import mage.view.*;
-import org.apache.log4j.Logger;
import javax.swing.*;
import javax.swing.Timer;
@@ -31,21 +30,16 @@ import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.image.BufferedImage;
import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.List;
-/**
+ /**
*
* @author BetaSteward_at_googlemail.com
*/
public class DraftPanel extends javax.swing.JPanel {
- private static final Logger LOGGER = Logger.getLogger(DraftPanel.class);
-
private UUID draftId;
private Timer countdown;
private int timeout;
@@ -63,8 +57,11 @@ public class DraftPanel extends javax.swing.JPanel {
// id of card with popup menu
protected UUID cardIdPopupMenu;
- // Filename for the draft log (only updated if writing the log).
- private String logFilename;
+ // Helper for writing the draft log.
+ private DraftPickLogger draftLogger;
+
+ // List of set codes (for draft log writing).
+ private List setCodes;
// Number of the current booster (for draft log writing).
private int packNo;
@@ -73,7 +70,6 @@ public class DraftPanel extends javax.swing.JPanel {
private int pickNo;
// Cached booster data to be written into the log (see logLastPick).
- private String currentBoosterHeader;
private String[] currentBooster;
private static final CardsView EMPTY_VIEW = new CardsView();
@@ -139,17 +135,11 @@ public class DraftPanel extends javax.swing.JPanel {
}
if (isLogging()) {
- // If we are logging the draft create a file that will contain
- // the log.
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss");
- logFilename = "Draft_" + sdf.format(new Date()) + '_' + draftId + ".txt";
- try {
- Files.write(pathToDraftLog(), "".getBytes(), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
- } catch (IOException ex) {
- LOGGER.error(null, ex);
- }
+ String logFilename = "Draft_" + sdf.format(new Date()) + '_' + draftId + ".draft";
+ draftLogger = new DraftPickLogger(new File("gamelogs"), logFilename);
} else {
- logFilename = null;
+ draftLogger = new DraftPickLogger();
}
}
@@ -171,6 +161,8 @@ public class DraftPanel extends javax.swing.JPanel {
packNo = draftView.getBoosterNum();
pickNo = draftView.getCardNum();
+ setCodes = draftView.getSetCodes();
+ draftLogger.updateDraft(draftId, draftView);
int right = draftView.getPlayers().size() / 2;
int left = draftView.getPlayers().size() - right;
@@ -251,7 +243,7 @@ public class DraftPanel extends javax.swing.JPanel {
}
}
- public void loadBooster(DraftPickView draftPickView) {
+ public void loadBooster(DraftPickView draftPickView) {
logLastPick(draftPickView);
// upper area that shows the picks
loadCardsToPickedCardsArea(draftPickView.getPicks());
@@ -416,13 +408,21 @@ public class DraftPanel extends javax.swing.JPanel {
if (currentBooster != null) {
String lastPick = getCardName(getLastPick(pickView.getPicks().values()));
if (lastPick != null && currentBooster.length > 1) {
- logPick(lastPick);
+ draftLogger.logPick(getCurrentSetCode(), packNo, pickNo-1, lastPick, currentBooster);
}
currentBooster = null;
}
setCurrentBoosterForLog(pickView.getBooster());
if (currentBooster.length == 1) {
- logPick(currentBooster[0]);
+ draftLogger.logPick(getCurrentSetCode(), packNo, pickNo, currentBooster[0], currentBooster);
+ }
+ }
+
+ private String getCurrentSetCode() {
+ if (!setCodes.isEmpty()) {
+ return setCodes.get(packNo-1);
+ } else {
+ return "";
}
}
@@ -440,39 +440,10 @@ public class DraftPanel extends javax.swing.JPanel {
}
}
- currentBoosterHeader = "Pack " + packNo + " pick " + pickNo + ":\n";
currentBooster = cards.toArray(new String[cards.size()]);
}
- private void logPick(String pick) {
- StringBuilder b = new StringBuilder();
- b.append(currentBoosterHeader);
- for (String name : currentBooster) {
- b.append(pick.equals(name) ? "--> " : " ");
- b.append(name);
- b.append('\n');
- }
- b.append('\n');
- appendToDraftLog(b.toString());
- }
-
- private Path pathToDraftLog() {
- File saveDir = new File("gamelogs");
- if (!saveDir.exists()) {
- saveDir.mkdirs();
- }
- return new File(saveDir, logFilename).toPath();
- }
-
- private void appendToDraftLog(String data) {
- try {
- Files.write(pathToDraftLog(), data.getBytes(), StandardOpenOption.APPEND);
- } catch (IOException ex) {
- LOGGER.error(null, ex);
- }
- }
-
- private static SimpleCardView getLastPick(Collection picks) {
+ private static SimpleCardView getLastPick(Collection picks) {
SimpleCardView last = null;
for (SimpleCardView pick : picks) {
last = pick;
diff --git a/Mage.Client/src/main/java/mage/client/draft/DraftPickLogger.java b/Mage.Client/src/main/java/mage/client/draft/DraftPickLogger.java
new file mode 100644
index 0000000000..db585e1a22
--- /dev/null
+++ b/Mage.Client/src/main/java/mage/client/draft/DraftPickLogger.java
@@ -0,0 +1,85 @@
+package mage.client.draft;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+
+import org.apache.log4j.Logger;
+
+import mage.view.DraftView;
+
+public class DraftPickLogger {
+
+ private static final Logger LOGGER = Logger.getLogger(DraftPickLogger.class);
+
+ private final Path logPath;
+ private final boolean logging;
+ private boolean headerWritten = false;
+
+ public DraftPickLogger(File directory, String logFilename) {
+ this.logging = true;
+ if (!directory.exists()) {
+ directory.mkdirs();
+ }
+ this.logPath = new File(directory, logFilename).toPath();
+ try {
+ Files.write(logPath, new byte[0], StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+ } catch (IOException ex) {
+ LOGGER.error(null, ex);
+ }
+ }
+
+ public DraftPickLogger() {
+ this.logging = false;
+ this.logPath = null;
+ }
+
+ public void updateDraft(UUID draftId, DraftView draftView) {
+ if (headerWritten) {
+ return;
+ }
+ headerWritten = true;
+ Date now = new Date();
+ SimpleDateFormat formatter = new SimpleDateFormat("M/d/yyyy h:mm:ss a");
+ StringBuilder buffer = new StringBuilder()
+ .append("Event #: ").append(draftId).append("\n")
+ .append("Time: ").append(formatter.format(now)).append('\n');
+ buffer.append("Players:\n");
+ for (String player : draftView.getPlayers()) {
+ buffer.append(" ").append(player).append('\n');
+ }
+ buffer.append('\n');
+ appendToDraftLog(buffer.toString());
+ }
+
+ public void logPick(String setCode, int packNo, int pickNo, String pick, String[] currentBooster) {
+ StringBuilder b = new StringBuilder();
+ if (pickNo == 1) {
+ b.append("------ ").append(setCode).append(" ------\n\n");
+ }
+ b.append("Pack ").append(packNo).append(" pick ").append(pickNo).append(":\n");
+ for (String name : currentBooster) {
+ b.append(pick.equals(name) ? "--> " : " ");
+ b.append(name);
+ b.append('\n');
+ }
+ b.append('\n');
+ appendToDraftLog(b.toString());
+ }
+
+ private void appendToDraftLog(String data) {
+ if (logging) {
+ try {
+ Files.write(logPath, data.getBytes(), StandardOpenOption.APPEND);
+ } catch (IOException ex) {
+ LOGGER.error(null, ex);
+ }
+ }
+ }
+
+}
diff --git a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
index 3a050b3c54..08a6e2a41e 100644
--- a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
@@ -235,14 +235,10 @@ public class BattlefieldPanel extends javax.swing.JLayeredPane {
private void addPermanent(PermanentView permanent, final int count) {
if (cardDimension == null) {
- cardDimension = new Dimension(Config.dimensions.frameWidth, Config.dimensions.frameHeight);
+ cardDimension = new Dimension(Config.dimensions.getFrameWidth(), Config.dimensions.getFrameHeight());
}
final MagePermanent perm = Plugins.instance.getMagePermanent(permanent, bigCard, cardDimension, gameId, true);
- if (!Plugins.instance.isCardPluginLoaded()) {
- //perm.setBounds(findEmptySpace(new Dimension(Config.dimensions.frameWidth, Config.dimensions.frameHeight)));
- } else {
- //perm.setAlpha(0);
- }
+
permanents.put(permanent.getId(), perm);
BattlefieldPanel.this.jPanel.add(perm, 10);
diff --git a/Mage.Client/src/main/java/mage/client/game/FirstButtonMousePressedAction.java b/Mage.Client/src/main/java/mage/client/game/FirstButtonMousePressedAction.java
new file mode 100644
index 0000000000..881a6b1f13
--- /dev/null
+++ b/Mage.Client/src/main/java/mage/client/game/FirstButtonMousePressedAction.java
@@ -0,0 +1,58 @@
+package mage.client.game;
+
+import mage.client.components.KeyboundButton;
+
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.function.Consumer;
+
+public class FirstButtonMousePressedAction extends MouseAdapter {
+
+ private final Consumer callback;
+ private boolean pressed = false;
+ private boolean inside = false;
+
+ public FirstButtonMousePressedAction(Consumer callback) {
+ this.callback = callback;
+ }
+
+ @Override
+ public void mousePressed(MouseEvent e) {
+ pressed = true;
+ if (e.getSource() instanceof KeyboundButton) {
+ KeyboundButton button = (KeyboundButton) e.getSource();
+ button.setTint(true);
+ }
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent e) {
+ pressed = false;
+ if (e.getSource() instanceof KeyboundButton) {
+ KeyboundButton button = (KeyboundButton) e.getSource();
+ button.setTint(false);
+ }
+ if (e.getButton() == MouseEvent.BUTTON1 && inside) {
+ callback.accept(e);
+ }
+ }
+
+ @Override
+ public void mouseEntered(MouseEvent e) {
+ inside = true;
+ if (pressed && e.getSource() instanceof KeyboundButton) {
+ KeyboundButton button = (KeyboundButton) e.getSource();
+ button.setTint(true);
+ }
+ }
+
+ @Override
+ public void mouseExited(MouseEvent e) {
+ inside = false;
+ if (e.getSource() instanceof KeyboundButton) {
+ KeyboundButton button = (KeyboundButton) e.getSource();
+ button.setTint(false);
+ }
+ }
+
+}
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 86ad18aa28..d4839275a9 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -1,4 +1,3 @@
-
package mage.client.game;
import mage.cards.Card;
@@ -19,8 +18,8 @@ import mage.client.dialog.CardInfoWindowDialog.ShowType;
import mage.client.game.FeedbackPanel.FeedbackMode;
import mage.client.plugins.adapters.MageActionCallback;
import mage.client.plugins.impl.Plugins;
-import mage.client.util.*;
import mage.client.util.Event;
+import mage.client.util.*;
import mage.client.util.audio.AudioManager;
import mage.client.util.gui.ArrowBuilder;
import mage.client.util.gui.MageDialogState;
@@ -32,8 +31,8 @@ import org.mage.card.arcane.CardPanel;
import org.mage.plugins.card.utils.impl.ImageManagerImpl;
import javax.swing.*;
-import javax.swing.GroupLayout.Alignment;
import javax.swing.Timer;
+import javax.swing.GroupLayout.Alignment;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
import javax.swing.border.LineBorder;
@@ -42,8 +41,8 @@ import javax.swing.plaf.basic.BasicSplitPaneUI;
import java.awt.*;
import java.awt.event.*;
import java.io.Serializable;
-import java.util.*;
import java.util.List;
+import java.util.*;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@@ -52,7 +51,7 @@ import static mage.client.dialog.PreferencesDialog.*;
import static mage.constants.PlayerAction.*;
/**
- * @author BetaSteward_at_googlemail.com, nantuko8
+ * @author BetaSteward_at_googlemail.com, nantuko8, JayDi85
*/
public final class GamePanel extends javax.swing.JPanel {
@@ -87,6 +86,7 @@ public final class GamePanel extends javax.swing.JPanel {
private String chosenHandKey = "You";
private boolean smallMode = false;
private boolean initialized = false;
+ private skipButtonsList skipButtons = new skipButtonsList();
private boolean menuNameSet = false;
private boolean handCardsOfOpponentAvailable = false;
@@ -103,7 +103,6 @@ public final class GamePanel extends javax.swing.JPanel {
private Timer resizeTimer;
private enum PopUpMenuType {
-
TRIGGER_ORDER
}
@@ -320,7 +319,7 @@ public final class GamePanel extends javax.swing.JPanel {
private void saveDividerLocations() {
// save panel sizes and divider locations.
Rectangle rec = MageFrame.getDesktop().getBounds();
- String sb = Double.toString(rec.getWidth()) + 'x' + Double.toString(rec.getHeight());
+ String sb = Double.toString(rec.getWidth()) + 'x' + rec.getHeight();
PreferencesDialog.saveValue(PreferencesDialog.KEY_MAGE_PANEL_LAST_SIZE, sb);
PreferencesDialog.saveValue(PreferencesDialog.KEY_GAMEPANEL_DIVIDER_LOCATION_0, Integer.toString(this.jSplitPane0.getDividerLocation()));
PreferencesDialog.saveValue(PreferencesDialog.KEY_GAMEPANEL_DIVIDER_LOCATION_1, Integer.toString(this.jSplitPane1.getDividerLocation()));
@@ -331,7 +330,7 @@ public final class GamePanel extends javax.swing.JPanel {
Rectangle rec = MageFrame.getDesktop().getBounds();
if (rec != null) {
String size = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_MAGE_PANEL_LAST_SIZE, null);
- String sb = Double.toString(rec.getWidth()) + 'x' + Double.toString(rec.getHeight());
+ String sb = Double.toString(rec.getWidth()) + 'x' + rec.getHeight();
// use divider positions only if screen size is the same as it was the time the settings were saved
if (size != null && size.equals(sb)) {
@@ -697,6 +696,13 @@ public final class GamePanel extends javax.swing.JPanel {
}
}
+ List possibleBlockers = new ArrayList<>();
+ if (options != null && options.containsKey(Constants.Option.POSSIBLE_BLOCKERS)) {
+ if (options.get(Constants.Option.POSSIBLE_BLOCKERS) instanceof List) {
+ possibleBlockers.addAll((List) options.get(Constants.Option.POSSIBLE_BLOCKERS));
+ }
+ }
+
for (PlayerView player : game.getPlayers()) {
if (players.containsKey(player.getPlayerId())) {
if (!possibleAttackers.isEmpty()) {
@@ -706,10 +712,16 @@ public final class GamePanel extends javax.swing.JPanel {
}
}
}
+ if (!possibleBlockers.isEmpty()) {
+ for (UUID permanentId : possibleBlockers) {
+ if (player.getBattlefield().containsKey(permanentId)) {
+ player.getBattlefield().get(permanentId).setCanBlock(true);
+ }
+ }
+ }
players.get(player.getPlayerId()).update(player);
if (player.getPlayerId().equals(playerId)) {
- updateSkipButtons(player.isPassedTurn(), player.isPassedUntilEndOfTurn(), player.isPassedUntilNextMain(), player.isPassedAllTurns(), player.isPassedUntilStackResolved(),
- player.isPassedUntilEndStepBeforeMyTurn());
+ skipButtons.updateFromPlayer(player);
}
// update open or remove closed graveyard windows
graveyards.put(player.getName(), player.getGraveyard());
@@ -738,6 +750,8 @@ public final class GamePanel extends javax.swing.JPanel {
// can happen at the game start before player list is initiated
}
}
+ updateSkipButtons();
+
if (!menuNameSet) {
StringBuilder sb = new StringBuilder();
if (playerId == null) {
@@ -821,41 +835,169 @@ public final class GamePanel extends javax.swing.JPanel {
this.repaint();
}
+ // skip buttons border
private static final int BORDER_SIZE = 2;
+ private static final Border BORDER_ACTIVE = new LineBorder(Color.orange, BORDER_SIZE);
+ private static final Border BORDER_NON_ACTIVE = new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE);
- private void updateSkipButtons(boolean turn, boolean endOfTurn, boolean nextMain, boolean allTurns, boolean stack, boolean endStepBeforeYourStep) {
- if (turn) { //F4
- btnSkipToNextTurn.setBorder(new LineBorder(Color.orange, BORDER_SIZE));
- } else {
- btnSkipToNextTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
- }
- if (endOfTurn) { // F5
- btnSkipToEndTurn.setBorder(new LineBorder(Color.orange, BORDER_SIZE));
- } else {
- btnSkipToEndTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
- }
- if (nextMain) { // F7
- btnSkipToNextMain.setBorder(new LineBorder(Color.orange, BORDER_SIZE));
- } else {
- btnSkipToNextMain.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
- }
- if (stack) { // F8
- btnSkipStack.setBorder(new LineBorder(Color.orange, BORDER_SIZE));
- } else {
- btnSkipStack.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
- }
- if (allTurns) { // F9
- btnSkipToYourTurn.setBorder(new LineBorder(Color.orange, BORDER_SIZE));
- } else {
- btnSkipToYourTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
+ // skip buttons info
+ private class skipButton {
+
+ private final String text;
+ private final String extraFalse;
+ private final String extraTrue;
+ private final String hotkeyName;
+ private boolean extraMode = false; // extra option enabled from preferences
+ private boolean pressState = false; // activated by user or not
+
+ skipButton(String text, String extraFalse, String extraTrue, String hotkeyName) {
+ this.text = text;
+ this.extraFalse = extraFalse;
+ this.extraTrue = extraTrue;
+ this.hotkeyName = hotkeyName;
}
- if (endStepBeforeYourStep) { // F11
- btnSkipToEndStepBeforeYourTurn.setBorder(new LineBorder(Color.orange, BORDER_SIZE));
- } else {
- btnSkipToEndStepBeforeYourTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
+ public void setExtraMode(boolean enable) {
+ this.extraMode = enable;
}
+ public void setPressState(boolean enable) {
+ this.pressState = enable;
+ }
+
+ public String getTooltip() {
+ // show hotkey and selects current button mode
+
+ // text
+ String res = ""
+ + "" + getCachedKeyText(this.hotkeyName) + ""
+ + " - " + text;
+
+ // mode
+ String mesTrue = this.extraTrue;
+ String mesFalse = this.extraFalse;
+ if (!this.extraTrue.isEmpty() || !this.extraFalse.isEmpty()) {
+ if (this.extraMode) {
+ mesTrue = "" + mesTrue + "";
+ } else {
+ mesFalse = "" + mesFalse + "";
+ }
+ res = res.replace("EXTRA_FALSE", mesFalse);
+ res = res.replace("EXTRA_TRUE", mesTrue);
+ res = res + " - adjust using preferences";
+ }
+ return res;
+ }
+
+ public Border getBorder() {
+ return this.pressState ? BORDER_ACTIVE : BORDER_NON_ACTIVE;
+ }
+
+ }
+
+ private class skipButtonsList {
+
+ private final skipButton turn;
+ private final skipButton untilEndOfTurn;
+ private final skipButton untilNextMain;
+ private final skipButton allTurns;
+ private final skipButton untilStackResolved;
+ private final skipButton untilUntilEndStepBeforeMyTurn;
+
+ skipButtonsList() {
+ this.turn = new skipButton("Skip to next turn", "", "", KEY_CONTROL_NEXT_TURN);
+ this.untilEndOfTurn = new skipButton("Skip to [EXTRA_TRUE / EXTRA_FALSE] END OF TURN step", "opponent", "next", KEY_CONTROL_END_STEP);
+ this.untilNextMain = new skipButton("Skip to [EXTRA_TRUE / EXTRA_FALSE] MAIN step", "opponent", "next", KEY_CONTROL_MAIN_STEP);
+ this.allTurns = new skipButton("Skip to YOUR turn", "", "", KEY_CONTROL_YOUR_TURN);
+ this.untilStackResolved = new skipButton("Skip until stack is resolved [EXTRA_TRUE]", "", "or stop on new objects added", KEY_CONTROL_SKIP_STACK);
+ this.untilUntilEndStepBeforeMyTurn = new skipButton("Skip to END OF TURN before YOUR", "", "", KEY_CONTROL_PRIOR_END);
+ }
+
+ private void updateExtraMode(PlayerView player) {
+ this.turn.setExtraMode(false); // not used
+ this.untilEndOfTurn.setExtraMode(player.getUserData().getUserSkipPrioritySteps().isStopOnAllEndPhases());
+ this.untilNextMain.setExtraMode(player.getUserData().getUserSkipPrioritySteps().isStopOnAllMainPhases());
+ this.allTurns.setExtraMode(false); // not used
+ this.untilStackResolved.setExtraMode(player.getUserData().getUserSkipPrioritySteps().isStopOnStackNewObjects());
+ this.untilUntilEndStepBeforeMyTurn.setExtraMode(false); // not used
+ }
+
+ private void updatePressState(PlayerView player) {
+ this.turn.setPressState(player.isPassedTurn());
+ this.untilEndOfTurn.setPressState(player.isPassedUntilEndOfTurn());
+ this.untilNextMain.setPressState(player.isPassedUntilNextMain());
+ this.allTurns.setPressState(player.isPassedAllTurns());
+ this.untilStackResolved.setPressState(player.isPassedUntilStackResolved());
+ this.untilUntilEndStepBeforeMyTurn.setPressState(player.isPassedUntilEndStepBeforeMyTurn());
+ }
+
+ public void updateFromPlayer(PlayerView player) {
+ updateExtraMode(player);
+ updatePressState(player);
+ }
+
+ private skipButton findButton(String hotkey) {
+ switch (hotkey) {
+ case KEY_CONTROL_NEXT_TURN:
+ return this.turn;
+ case KEY_CONTROL_END_STEP:
+ return this.untilEndOfTurn;
+ case KEY_CONTROL_MAIN_STEP:
+ return this.untilNextMain;
+ case KEY_CONTROL_YOUR_TURN:
+ return this.allTurns;
+ case KEY_CONTROL_SKIP_STACK:
+ return this.untilStackResolved;
+ case KEY_CONTROL_PRIOR_END:
+ return this.untilUntilEndStepBeforeMyTurn;
+ default:
+ logger.error("Unknown hotkey name " + hotkey);
+ return null;
+ }
+ }
+
+ public String getTooltip(String hotkey) {
+ skipButton butt = findButton(hotkey);
+ return butt != null ? butt.getTooltip() : "";
+ }
+
+ public Border getBorder(String hotkey) {
+ skipButton butt = findButton(hotkey);
+ return butt != null ? butt.getBorder() : BORDER_NON_ACTIVE;
+ }
+
+ public void activateSkipButton(String hotkey) {
+ // enable ONE button and disable all other (no needs to wait server feedback)
+ this.turn.setPressState(false);
+ this.untilEndOfTurn.setPressState(false);
+ this.untilNextMain.setPressState(false);
+ this.allTurns.setPressState(false);
+ this.untilStackResolved.setPressState(false);
+ this.untilUntilEndStepBeforeMyTurn.setPressState(false);
+
+ if (!hotkey.isEmpty()) {
+ skipButton butt = findButton(hotkey);
+ if (butt != null) butt.setPressState(true);
+ }
+ }
+ }
+
+ private void updateSkipButtons() {
+ // hints
+ btnSkipToNextTurn.setToolTipText(skipButtons.turn.getTooltip());
+ btnSkipToEndTurn.setToolTipText(skipButtons.untilEndOfTurn.getTooltip());
+ btnSkipToNextMain.setToolTipText(skipButtons.untilNextMain.getTooltip());
+ btnSkipStack.setToolTipText(skipButtons.untilStackResolved.getTooltip());
+ btnSkipToYourTurn.setToolTipText(skipButtons.allTurns.getTooltip());
+ btnSkipToEndStepBeforeYourTurn.setToolTipText(skipButtons.untilUntilEndStepBeforeMyTurn.getTooltip());
+
+ // border
+ btnSkipToNextTurn.setBorder(skipButtons.turn.getBorder());
+ btnSkipToEndTurn.setBorder(skipButtons.untilEndOfTurn.getBorder());
+ btnSkipToNextMain.setBorder(skipButtons.untilNextMain.getBorder());
+ btnSkipStack.setBorder(skipButtons.untilStackResolved.getBorder());
+ btnSkipToYourTurn.setBorder(skipButtons.allTurns.getBorder());
+ btnSkipToEndStepBeforeYourTurn.setBorder(skipButtons.untilUntilEndStepBeforeMyTurn.getBorder());
}
/**
@@ -921,6 +1063,8 @@ public final class GamePanel extends javax.swing.JPanel {
case END_TURN:
updateButton("Cleanup");
break;
+ default:
+ break;
}
}
@@ -1027,6 +1171,8 @@ public final class GamePanel extends javax.swing.JPanel {
case LOOKED_AT:
cardInfoWindowDialog.loadCards((SimpleCardsView) cardsView, bigCard, gameId);
break;
+ default:
+ break;
}
}
}
@@ -1041,6 +1187,114 @@ public final class GamePanel extends javax.swing.JPanel {
this.feedbackPanel.getFeedback(FeedbackMode.QUESTION, question, false, options, messageId, true, gameView.getPhase());
}
+ private void prepareSelectableView(GameView gameView, Map options, Set targets) {
+ // make cards/perm selectable
+ // highlighting chosen
+ // code calls after each selects or updates, no needs in switch off cards
+
+ Zone needZone = Zone.ALL;
+ if (options.containsKey("targetZone")) {
+ needZone = (Zone) options.get("targetZone");
+ }
+
+ List needChoosen = null;
+ if (options.containsKey("chosen")) {
+ needChoosen = (List) options.get("chosen");
+ }
+ if (needChoosen == null) {
+ needChoosen = new ArrayList<>();
+ }
+
+ Set needSelectable;
+ if (targets != null) {
+ needSelectable = targets;
+ } else {
+ needSelectable = new HashSet<>();
+ }
+
+ if (needChoosen.size() == 0 && needSelectable.size() == 0) {
+ return;
+ }
+
+ // hand
+ if (needZone == Zone.HAND || needZone == Zone.ALL) {
+ for (CardView card : gameView.getHand().values()) {
+ if (needSelectable.contains(card.getId())) {
+ card.setChoosable(true);
+ }
+ if (needChoosen.contains(card.getId())) {
+ card.setSelected(true);
+ }
+ }
+ }
+
+ // stack
+ if (needZone == Zone.STACK || needZone == Zone.ALL) {
+ for (Map.Entry card : gameView.getStack().entrySet()) {
+ if (needSelectable.contains(card.getKey())) {
+ card.getValue().setChoosable(true);
+ }
+ if (needChoosen.contains(card.getKey())) {
+ card.getValue().setSelected(true);
+ }
+ }
+ }
+
+ // battlefield
+ if (needZone == Zone.BATTLEFIELD || needZone == Zone.ALL) {
+ for (PlayerView player : gameView.getPlayers()) {
+ for (Map.Entry perm : player.getBattlefield().entrySet()) {
+ if (needSelectable.contains(perm.getKey())) {
+ perm.getValue().setChoosable(true);
+ }
+ if (needChoosen.contains(perm.getKey())) {
+ perm.getValue().setSelected(true);
+ }
+ }
+ }
+ }
+
+ // graveyard
+ if (needZone == Zone.GRAVEYARD || needZone == Zone.ALL) {
+ for (PlayerView player : gameView.getPlayers()) {
+ for (Map.Entry card : player.getGraveyard().entrySet()) {
+ if (needSelectable.contains(card.getKey())) {
+ card.getValue().setChoosable(true);
+ }
+ if (needChoosen.contains(card.getKey())) {
+ card.getValue().setSelected(true);
+ }
+ }
+ }
+ }
+
+ // exile
+ if (needZone == Zone.HAND || needZone == Zone.ALL) {
+ for (ExileView exile : gameView.getExile()) {
+ for (Map.Entry card : exile.entrySet()) {
+ if (needSelectable.contains(card.getKey())) {
+ card.getValue().setChoosable(true);
+ }
+ if (needChoosen.contains(card.getKey())) {
+ card.getValue().setSelected(true);
+ }
+ }
+ }
+ }
+
+ // revealed
+ for (RevealedView rev : gameView.getRevealed()) {
+ for (Map.Entry card : rev.getCards().entrySet()) {
+ if (needSelectable.contains(card.getKey())) {
+ card.getValue().setChoosable(true);
+ }
+ if (needChoosen.contains(card.getKey())) {
+ card.getValue().setSelected(true);
+ }
+ }
+ }
+ }
+
/**
* Shows a pick target dialog and allows the player to pick a target (e.g.
* the pick triggered ability)
@@ -1056,30 +1310,23 @@ public final class GamePanel extends javax.swing.JPanel {
public void pickTarget(String message, CardsView cardView, GameView gameView, Set targets, boolean required, Map options, int messageId) {
PopUpMenuType popupMenuType = null;
if (options != null) {
- if (options.containsKey("targetZone")) {
- if (Zone.HAND == options.get("targetZone")) { // mark selectable target cards in hand
- List choosen = null;
- if (options.containsKey("chosen")) {
- choosen = (List) options.get("chosen");
- }
- for (CardView card : gameView.getHand().values()) {
- if (targets == null || targets.isEmpty()) {
- card.setPlayable(false);
- card.setChoosable(true);
- } else if (targets.contains(card.getId())) {
- card.setPlayable(false);
- card.setChoosable(true);
- }
- if (choosen != null && choosen.contains(card.getId())) {
- card.setSelected(true);
- }
- }
+ if (options.containsKey("queryType")) {
+ PlayerQueryEvent.QueryType needType = (PlayerQueryEvent.QueryType) options.get("queryType");
+ switch (needType) {
+ case PICK_ABILITY:
+ popupMenuType = PopUpMenuType.TRIGGER_ORDER;
+ prepareSelectableView(gameView, options, targets);
+ break;
+ case PICK_TARGET:
+ prepareSelectableView(gameView, options, targets);
+ break;
+ default:
+ logger.warn("Unknown query type in pick target: " + needType + " in " + message);
+ break;
}
}
- if (options.containsKey("queryType") && PlayerQueryEvent.QueryType.PICK_ABILITY == options.get("queryType")) {
- popupMenuType = PopUpMenuType.TRIGGER_ORDER;
- }
}
+
updateGame(gameView);
Map options0 = options == null ? new HashMap<>() : options;
ShowCardsDialog dialog = null;
@@ -1360,20 +1607,15 @@ public final class GamePanel extends javax.swing.JPanel {
btnToggleMacro.setToolTipText("Toggle Record Macro ("
+ getCachedKeyText(KEY_CONTROL_TOGGLE_MACRO) + ").");
btnToggleMacro.setFocusable(false);
- btnToggleMacro.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent evt) {
- if (evt.getButton() == MouseEvent.BUTTON1) {
- btnToggleMacroActionPerformed(null);
- }
- }
- });
+ btnToggleMacro.addMouseListener(new FirstButtonMousePressedAction(e ->
+ btnToggleMacroActionPerformed(null)));
KeyStroke kst = getCachedKeystroke(KEY_CONTROL_TOGGLE_MACRO);
this.getInputMap(c).put(kst, "F8_PRESS");
this.getActionMap().put("F8_PRESS", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
btnToggleMacroActionPerformed(actionEvent);
}
});
@@ -1383,45 +1625,35 @@ public final class GamePanel extends javax.swing.JPanel {
this.getActionMap().put("F3_PRESS", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
restorePriorityActionPerformed(actionEvent);
}
});
+ // SKIP BUTTONS (button's hint/state is dynamic)
+
btnCancelSkip.setContentAreaFilled(false);
btnCancelSkip.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
btnCancelSkip.setIcon(new ImageIcon(ImageManagerImpl.instance.getCancelSkipButtonImage()));
- btnCancelSkip.setToolTipText("Cancel all skip actions ("
- + getCachedKeyText(KEY_CONTROL_CANCEL_SKIP) + ").");
+ btnCancelSkip.setToolTipText("CANCEL all skips");
btnCancelSkip.setFocusable(false);
- btnCancelSkip.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent evt) {
- if (evt.getButton() == MouseEvent.BUTTON1) {
- restorePriorityActionPerformed(null);
- }
- }
- });
+ btnCancelSkip.addMouseListener(new FirstButtonMousePressedAction(e ->
+ restorePriorityActionPerformed(null)));
btnSkipToNextTurn.setContentAreaFilled(false);
btnSkipToNextTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
btnSkipToNextTurn.setIcon(new ImageIcon(ImageManagerImpl.instance.getSkipNextTurnButtonImage()));
- btnSkipToNextTurn.setToolTipText("Skip to next turn ("
- + getCachedKeyText(KEY_CONTROL_NEXT_TURN) + ").");
+ btnSkipToNextTurn.setToolTipText("dynamic");
btnSkipToNextTurn.setFocusable(false);
- btnSkipToNextTurn.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent evt) {
- if (evt.getButton() == MouseEvent.BUTTON1) {
- btnEndTurnActionPerformed(null);
- }
- }
- });
+ btnSkipToNextTurn.addMouseListener(new FirstButtonMousePressedAction(e ->
+ btnEndTurnActionPerformed(null)));
KeyStroke ks = getCachedKeystroke(KEY_CONTROL_NEXT_TURN);
this.getInputMap(c).put(ks, "F4_PRESS");
this.getActionMap().put("F4_PRESS", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
btnEndTurnActionPerformed(actionEvent);
}
});
@@ -1429,23 +1661,17 @@ public final class GamePanel extends javax.swing.JPanel {
btnSkipToEndTurn.setContentAreaFilled(false);
btnSkipToEndTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
btnSkipToEndTurn.setIcon(new ImageIcon(ImageManagerImpl.instance.getSkipEndTurnButtonImage()));
- btnSkipToEndTurn.setToolTipText("Skip to (opponents/next) end of turn step ("
- + getCachedKeyText(KEY_CONTROL_END_STEP) + ") - adjust using preferences.");
+ btnSkipToEndTurn.setToolTipText("dynamic");
btnSkipToEndTurn.setFocusable(false);
- btnSkipToEndTurn.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent evt) {
- if (evt.getButton() == MouseEvent.BUTTON1) {
- btnUntilEndOfTurnActionPerformed(null);
- }
- }
- });
+ btnSkipToEndTurn.addMouseListener(new FirstButtonMousePressedAction(e ->
+ btnUntilEndOfTurnActionPerformed(null)));
ks = getCachedKeystroke(KEY_CONTROL_END_STEP);
this.getInputMap(c).put(ks, "F5_PRESS");
this.getActionMap().put("F5_PRESS", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
btnUntilEndOfTurnActionPerformed(actionEvent);
}
});
@@ -1455,6 +1681,7 @@ public final class GamePanel extends javax.swing.JPanel {
this.getActionMap().put("F6_PRESS", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
btnEndTurnSkipStackActionPerformed(actionEvent);
}
});
@@ -1462,23 +1689,17 @@ public final class GamePanel extends javax.swing.JPanel {
btnSkipToNextMain.setContentAreaFilled(false);
btnSkipToNextMain.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
btnSkipToNextMain.setIcon(new ImageIcon(ImageManagerImpl.instance.getSkipMainButtonImage()));
- btnSkipToNextMain.setToolTipText("Skip to (your) next main phase ("
- + getCachedKeyText(KEY_CONTROL_MAIN_STEP) + ") - adjust using preferences.");
+ btnSkipToNextMain.setToolTipText("dynamic");
btnSkipToNextMain.setFocusable(false);
- btnSkipToNextMain.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent evt) {
- if (evt.getButton() == MouseEvent.BUTTON1) {
- btnUntilNextMainPhaseActionPerformed(null);
- }
- }
- });
+ btnSkipToNextMain.addMouseListener(new FirstButtonMousePressedAction(e ->
+ btnUntilNextMainPhaseActionPerformed(null)));
ks = getCachedKeystroke(KEY_CONTROL_MAIN_STEP);
this.getInputMap(c).put(ks, "F7_PRESS");
this.getActionMap().put("F7_PRESS", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
btnUntilNextMainPhaseActionPerformed(actionEvent);
}
});
@@ -1486,23 +1707,17 @@ public final class GamePanel extends javax.swing.JPanel {
btnSkipToYourTurn.setContentAreaFilled(false);
btnSkipToYourTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
btnSkipToYourTurn.setIcon(new ImageIcon(ImageManagerImpl.instance.getSkipYourNextTurnButtonImage()));
- btnSkipToYourTurn.setToolTipText("Skip to your next turn ("
- + getCachedKeyText(KEY_CONTROL_YOUR_TURN) + ").");
+ btnSkipToYourTurn.setToolTipText("dynamic");
btnSkipToYourTurn.setFocusable(false);
- btnSkipToYourTurn.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent evt) {
- if (evt.getButton() == MouseEvent.BUTTON1) {
- btnPassPriorityUntilNextYourTurnActionPerformed(null);
- }
- }
- });
+ btnSkipToYourTurn.addMouseListener(new FirstButtonMousePressedAction(e ->
+ btnPassPriorityUntilNextYourTurnActionPerformed(null)));
KeyStroke ks9 = getCachedKeystroke(KEY_CONTROL_YOUR_TURN);
this.getInputMap(c).put(ks9, "F9_PRESS");
this.getActionMap().put("F9_PRESS", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
btnPassPriorityUntilNextYourTurnActionPerformed(actionEvent);
}
});
@@ -1510,23 +1725,17 @@ public final class GamePanel extends javax.swing.JPanel {
btnSkipToEndStepBeforeYourTurn.setContentAreaFilled(false);
btnSkipToEndStepBeforeYourTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
btnSkipToEndStepBeforeYourTurn.setIcon(new ImageIcon(ImageManagerImpl.instance.getSkipEndStepBeforeYourTurnButtonImage()));
- btnSkipToEndStepBeforeYourTurn.setToolTipText("Skip to the end step before your turn ("
- + getCachedKeyText(KEY_CONTROL_PRIOR_END) + ") - adjust using preferences.");
+ btnSkipToEndStepBeforeYourTurn.setToolTipText("dynamic");
btnSkipToEndStepBeforeYourTurn.setFocusable(false);
- btnSkipToEndStepBeforeYourTurn.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent evt) {
- if (evt.getButton() == MouseEvent.BUTTON1) {
- btnSkipToEndStepBeforeYourTurnActionPerformed(null);
- }
- }
- });
+ btnSkipToEndStepBeforeYourTurn.addMouseListener(new FirstButtonMousePressedAction(e ->
+ btnSkipToEndStepBeforeYourTurnActionPerformed(null)));
KeyStroke ks11 = getCachedKeystroke(KEY_CONTROL_PRIOR_END);
this.getInputMap(c).put(ks11, "F11_PRESS");
this.getActionMap().put("F11_PRESS", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
btnSkipToEndStepBeforeYourTurnActionPerformed(actionEvent);
}
});
@@ -1534,23 +1743,17 @@ public final class GamePanel extends javax.swing.JPanel {
btnSkipStack.setContentAreaFilled(false);
btnSkipStack.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
btnSkipStack.setIcon(new ImageIcon(ImageManagerImpl.instance.getSkipStackButtonImage()));
- btnSkipStack.setToolTipText("Skip until stack is resolved ("
- + getCachedKeyText(KEY_CONTROL_SKIP_STACK) + ").");
+ btnSkipStack.setToolTipText("dynamic");
btnSkipStack.setFocusable(false);
- btnSkipStack.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent evt) {
- if (evt.getButton() == MouseEvent.BUTTON1) {
- btnPassPriorityUntilStackResolvedActionPerformed(null);
- }
- }
- });
+ btnSkipStack.addMouseListener(new FirstButtonMousePressedAction(e ->
+ btnPassPriorityUntilStackResolvedActionPerformed(null)));
ks = getCachedKeystroke(KEY_CONTROL_SKIP_STACK);
this.getInputMap(c).put(ks, "F10_PRESS");
this.getActionMap().put("F10_PRESS", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
btnPassPriorityUntilStackResolvedActionPerformed(actionEvent);
}
});
@@ -1558,33 +1761,49 @@ public final class GamePanel extends javax.swing.JPanel {
btnConcede.setContentAreaFilled(false);
btnConcede.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
btnConcede.setIcon(new ImageIcon(ImageManagerImpl.instance.getConcedeButtonImage()));
- btnConcede.setToolTipText("Concede the current game.");
+ btnConcede.setToolTipText("CONCEDE current game");
btnConcede.setFocusable(false);
- btnConcede.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent evt) {
- if (evt.getButton() == MouseEvent.BUTTON1) {
- btnConcedeActionPerformed(null);
- }
- }
- });
+ btnConcede.addMouseListener(new FirstButtonMousePressedAction(e ->
+ btnConcedeActionPerformed(null)));
+
+ // update button hint/states to default values
+ updateSkipButtons();
+
+ // HOTKEYS
KeyStroke ks2 = getCachedKeystroke(KEY_CONTROL_CONFIRM);
this.getInputMap(c).put(ks2, "F2_PRESS");
this.getActionMap().put("F2_PRESS", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
if (feedbackPanel != null) {
feedbackPanel.pressOKYesOrDone();
}
}
});
+ KeyStroke ks12 = getCachedKeystroke(KEY_CONTROL_SWITCH_CHAT);
+ this.getInputMap(c).put(ks12, "F12_PRESS");
+ this.getActionMap().put("F12_PRESS", new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent actionEvent) {
+ // switch in/out to chat, must triggers in chat input too
+ //if (isUserImputActive()) return;
+ if (isChatInputActive()) {
+ KeyboardFocusManager.getCurrentKeyboardFocusManager().clearFocusOwner();
+ } else if (!isUserImputActive()) {
+ userChatPanel.getTxtMessageInputComponent().requestFocusInWindow();
+ }
+ }
+ });
+
KeyStroke ksAltE = KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.ALT_MASK);
this.getInputMap(c).put(ksAltE, "ENLARGE");
this.getActionMap().put("ENLARGE", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
ActionCallback callback = Plugins.instance.getActionCallback();
((MageActionCallback) callback).enlargeCard(EnlargeMode.NORMAL);
}
@@ -1595,6 +1814,7 @@ public final class GamePanel extends javax.swing.JPanel {
this.getActionMap().put("ENLARGE_SOURCE", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
ActionCallback callback = Plugins.instance.getActionCallback();
((MageActionCallback) callback).enlargeCard(EnlargeMode.ALTERNATE);
}
@@ -1605,6 +1825,7 @@ public final class GamePanel extends javax.swing.JPanel {
this.getActionMap().put("BIG_IMAGE", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
imagePanelState = !imagePanelState;
if (!imagePanelState) {
jSplitPane0.resetToPreferredSizes();
@@ -1620,6 +1841,7 @@ public final class GamePanel extends javax.swing.JPanel {
this.getActionMap().put("USEFIRSTMANAABILITY", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
SessionHandler.sendPlayerAction(PlayerAction.USE_FIRST_MANA_ABILITY_ON, gameId, null);
setMenuStates(
PreferencesDialog.getCachedValue(KEY_GAME_MANA_AUTOPAYMENT, "true").equals("true"),
@@ -1644,6 +1866,7 @@ public final class GamePanel extends javax.swing.JPanel {
this.getActionMap().put("ENLARGE_RELEASE", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
ActionCallback callback = Plugins.instance.getActionCallback();
((MageActionCallback) callback).hideEnlargedCard();
}
@@ -1654,6 +1877,7 @@ public final class GamePanel extends javax.swing.JPanel {
this.getActionMap().put("USEFIRSTMANAABILITY_RELEASE", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent actionEvent) {
+ if (isUserImputActive()) return;
SessionHandler.sendPlayerAction(PlayerAction.USE_FIRST_MANA_ABILITY_OFF, gameId, null);
setMenuStates(
PreferencesDialog.getCachedValue(KEY_GAME_MANA_AUTOPAYMENT, "true").equals("true"),
@@ -1668,28 +1892,16 @@ public final class GamePanel extends javax.swing.JPanel {
btnSwitchHands.setIcon(new ImageIcon(ImageManagerImpl.instance.getSwitchHandsButtonImage()));
btnSwitchHands.setFocusable(false);
btnSwitchHands.setToolTipText("Switch between your hand cards and hand cards of controlled players.");
- btnSwitchHands.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent evt) {
- if (evt.getButton() == MouseEvent.BUTTON1) {
- btnSwitchHandActionPerformed(null);
- }
- }
- });
+ btnSwitchHands.addMouseListener(new FirstButtonMousePressedAction(e ->
+ btnSwitchHandActionPerformed(null)));
btnStopWatching.setContentAreaFilled(false);
btnStopWatching.setBorder(new EmptyBorder(0, 0, 0, 0));
btnStopWatching.setIcon(new ImageIcon(ImageManagerImpl.instance.getStopWatchButtonImage()));
btnStopWatching.setFocusable(false);
btnStopWatching.setToolTipText("Stop watching this game.");
- btnStopWatching.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent evt) {
- if (evt.getButton() == MouseEvent.BUTTON1) {
- btnStopWatchingActionPerformed(null);
- }
- }
- });
+ btnStopWatching.addMouseListener(new FirstButtonMousePressedAction(e ->
+ btnStopWatchingActionPerformed(null)));
stackObjects.setBackgroundColor(new Color(0, 0, 0, 40));
@@ -1810,8 +2022,8 @@ 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);
}
@@ -2019,66 +2231,100 @@ public final class GamePanel extends javax.swing.JPanel {
private void btnToggleMacroActionPerformed(java.awt.event.ActionEvent evt) {
SessionHandler.sendPlayerAction(PlayerAction.TOGGLE_RECORD_MACRO, gameId, null);
+ skipButtons.activateSkipButton("");
+
AudioManager.playOnSkipButton();
- updateSkipButtons(false, false, false, false, false, false);
- if (btnToggleMacro.getBorder() instanceof EmptyBorder) {
- btnToggleMacro.setBorder(new LineBorder(Color.orange, BORDER_SIZE));
+ if (btnToggleMacro.getBorder().equals(BORDER_ACTIVE)) {
+ btnToggleMacro.setBorder(BORDER_NON_ACTIVE);
} else {
- btnToggleMacro.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
+ btnToggleMacro.setBorder(BORDER_ACTIVE);
}
}
private void btnEndTurnActionPerformed(java.awt.event.ActionEvent evt) {
SessionHandler.sendPlayerAction(PlayerAction.PASS_PRIORITY_UNTIL_NEXT_TURN, gameId, null);
+ skipButtons.activateSkipButton(KEY_CONTROL_NEXT_TURN);
+
AudioManager.playOnSkipButton();
- updateSkipButtons(true, false, false, false, false, false);
+ updateSkipButtons();
+ }
+
+ private boolean isChatInputUnderCursor(Point p) {
+ Component c = this.getComponentAt(p);
+ return gameChatPanel.getTxtMessageInputComponent().equals(c) || userChatPanel.getTxtMessageInputComponent().equals(c);
+ }
+
+ private boolean isChatInputActive() {
+ Component c = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+ return gameChatPanel.getTxtMessageInputComponent().equals(c) || userChatPanel.getTxtMessageInputComponent().equals(c);
+ }
+
+ private boolean isUserImputActive() {
+ // any imput or choose dialog active (need to disable skip buttons in dialogs and chat)
+ return MageDialog.isModalDialogActivated() || isChatInputActive();
}
private void btnUntilEndOfTurnActionPerformed(java.awt.event.ActionEvent evt) {
SessionHandler.sendPlayerAction(PlayerAction.PASS_PRIORITY_UNTIL_TURN_END_STEP, gameId, null);
+ skipButtons.activateSkipButton(KEY_CONTROL_END_STEP);
+
AudioManager.playOnSkipButton();
- updateSkipButtons(false, true, false, false, false, false);
+ updateSkipButtons();
}
private void btnEndTurnSkipStackActionPerformed(java.awt.event.ActionEvent evt) {
+ logger.error("Skip action don't used", new Throwable());
+ /*
SessionHandler.sendPlayerAction(PlayerAction.PASS_PRIORITY_UNTIL_NEXT_TURN_SKIP_STACK, gameId, null);
AudioManager.playOnSkipButton();
updateSkipButtons(true, false, false, false, true, false);
+ */
}
private void btnUntilNextMainPhaseActionPerformed(java.awt.event.ActionEvent evt) {
SessionHandler.sendPlayerAction(PlayerAction.PASS_PRIORITY_UNTIL_NEXT_MAIN_PHASE, gameId, null);
+ skipButtons.activateSkipButton(KEY_CONTROL_MAIN_STEP);
+
AudioManager.playOnSkipButton();
- updateSkipButtons(false, false, true, false, false, false);
+ updateSkipButtons();
}
private void btnPassPriorityUntilNextYourTurnActionPerformed(java.awt.event.ActionEvent evt) {
SessionHandler.sendPlayerAction(PlayerAction.PASS_PRIORITY_UNTIL_MY_NEXT_TURN, gameId, null);
+ skipButtons.activateSkipButton(KEY_CONTROL_YOUR_TURN);
+
AudioManager.playOnSkipButton();
- updateSkipButtons(false, false, false, true, false, false);
+ updateSkipButtons();
}
private void btnPassPriorityUntilStackResolvedActionPerformed(java.awt.event.ActionEvent evt) {
SessionHandler.sendPlayerAction(PlayerAction.PASS_PRIORITY_UNTIL_STACK_RESOLVED, gameId, null);
+ skipButtons.activateSkipButton(KEY_CONTROL_SKIP_STACK);
+
AudioManager.playOnSkipButton();
- updateSkipButtons(false, false, false, false, true, false);
+ updateSkipButtons();
}
private void btnSkipToEndStepBeforeYourTurnActionPerformed(java.awt.event.ActionEvent evt) {
SessionHandler.sendPlayerAction(PlayerAction.PASS_PRIORITY_UNTIL_END_STEP_BEFORE_MY_NEXT_TURN, gameId, null);
+ skipButtons.activateSkipButton(KEY_CONTROL_PRIOR_END);
+
AudioManager.playOnSkipButton();
- updateSkipButtons(false, false, false, false, false, true);
+ updateSkipButtons();
}
private void restorePriorityActionPerformed(java.awt.event.ActionEvent evt) {
SessionHandler.sendPlayerAction(PlayerAction.PASS_PRIORITY_CANCEL_ALL_ACTIONS, gameId, null);
+ skipButtons.activateSkipButton("");
+
AudioManager.playOnSkipButtonCancel();
- updateSkipButtons(false, false, false, false, false, false);
+ updateSkipButtons();
}
private void mouseClickPhaseBar(MouseEvent evt) {
if (evt.getButton() == MouseEvent.BUTTON1) { // Left button
PreferencesDialog.main(new String[]{PreferencesDialog.OPEN_PHASES_TAB});
+ // TODO: add event handler on preferences closed and refresh game data from server
}
}
@@ -2214,6 +2460,8 @@ public final class GamePanel extends javax.swing.JPanel {
case CMD_AUTO_ORDER_RESET_ALL:
SessionHandler.sendPlayerAction(TRIGGER_AUTO_ORDER_RESET_ALL, gameId, null);
break;
+ default:
+ break;
}
for (ShowCardsDialog dialog : pickTarget) {
dialog.removeDialog();
@@ -2279,6 +2527,13 @@ public final class GamePanel extends javax.swing.JPanel {
boolean isActionEvent = false;
if (id == MouseEvent.MOUSE_PRESSED) {
isActionEvent = true;
+ // clear chat focus on click
+ if (event instanceof MouseEvent) {
+ MouseEvent me = (MouseEvent) event;
+ if (isChatInputActive() && !isChatInputUnderCursor(me.getPoint())) {
+ KeyboardFocusManager.getCurrentKeyboardFocusManager().clearFocusOwner();
+ }
+ }
} else if (id == KeyEvent.KEY_PRESSED) {
KeyEvent key = (KeyEvent) event;
int keyCode = key.getKeyCode();
diff --git a/Mage.Client/src/main/java/mage/client/game/HelperPanel.java b/Mage.Client/src/main/java/mage/client/game/HelperPanel.java
index c9a81633cc..45fc243a68 100644
--- a/Mage.Client/src/main/java/mage/client/game/HelperPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/HelperPanel.java
@@ -1,40 +1,23 @@
package mage.client.game;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.util.ArrayList;
-import java.util.UUID;
-import javax.swing.JButton;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.ToolTipManager;
-import javax.swing.UIManager;
-import javax.swing.border.EmptyBorder;
-
import mage.client.SessionHandler;
import mage.client.components.MageTextArea;
import mage.client.constants.Constants;
import mage.client.dialog.PreferencesDialog;
import mage.client.game.FeedbackPanel.FeedbackMode;
-
-import static mage.client.game.FeedbackPanel.FeedbackMode.QUESTION;
import mage.client.util.GUISizeHelper;
import mage.constants.TurnPhase;
-import static mage.constants.PlayerAction.REQUEST_AUTO_ANSWER_ID_NO;
-import static mage.constants.PlayerAction.REQUEST_AUTO_ANSWER_ID_YES;
-import static mage.constants.PlayerAction.REQUEST_AUTO_ANSWER_RESET_ALL;
-import static mage.constants.PlayerAction.REQUEST_AUTO_ANSWER_TEXT_NO;
-import static mage.constants.PlayerAction.REQUEST_AUTO_ANSWER_TEXT_YES;
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
+import java.awt.event.*;
+import java.util.ArrayList;
+import java.util.UUID;
+
+import static mage.client.game.FeedbackPanel.FeedbackMode.QUESTION;
+import static mage.constants.PlayerAction.*;
/**
* Panel with buttons that copy the state of feedback panel.
@@ -326,10 +309,18 @@ public class HelperPanel extends JPanel {
this.buttonGrid.setPreferredSize(null);
ArrayList buttons = new ArrayList<>();
- if (this.btnSpecial.isVisible()) { buttons.add(this.btnSpecial); }
- if (this.btnLeft.isVisible()) { buttons.add(this.btnLeft); }
- if (this.btnRight.isVisible()) { buttons.add(this.btnRight); }
- if (this.btnUndo.isVisible()) { buttons.add(this.btnUndo); }
+ if (this.btnSpecial.isVisible()) {
+ buttons.add(this.btnSpecial);
+ }
+ if (this.btnLeft.isVisible()) {
+ buttons.add(this.btnLeft);
+ }
+ if (this.btnRight.isVisible()) {
+ buttons.add(this.btnRight);
+ }
+ if (this.btnUndo.isVisible()) {
+ buttons.add(this.btnUndo);
+ }
// color panel on player's feedback waiting
if (this.gameNeedFeedback) {
@@ -360,10 +351,14 @@ public class HelperPanel extends JPanel {
case COMBAT:
backColor = ACTIVE_FEEDBACK_BACKGROUND_COLOR_BATTLE;
break;
+ default:
+ break;
}
}
this.mainPanel.setBackground(backColor);
break;
+ default:
+ break;
}
} else {
// inform about other players
@@ -500,6 +495,8 @@ public class HelperPanel extends JPanel {
case CMD_AUTO_ANSWER_RESET_ALL:
SessionHandler.sendPlayerAction(REQUEST_AUTO_ANSWER_RESET_ALL, gameId, null);
break;
+ default:
+ break;
}
}
diff --git a/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java b/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
index 42541329f9..b266d991c8 100644
--- a/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
@@ -20,7 +20,8 @@ import javax.swing.JPopupMenu;
import javax.swing.LayoutStyle.ComponentPlacement;
import javax.swing.MenuSelectionManager;
import javax.swing.event.ChangeListener;
-import mage.cards.decks.importer.DeckImporterUtil;
+
+import mage.cards.decks.importer.DeckImporter;
import mage.client.MageFrame;
import mage.client.SessionHandler;
import mage.client.cards.BigCard;
@@ -167,6 +168,8 @@ public class PlayAreaPanel extends javax.swing.JPanel {
SessionHandler.sendPlayerAction(PlayerAction.PASS_PRIORITY_UNTIL_END_STEP_BEFORE_MY_NEXT_TURN, gameId, null);
break;
}
+ default:
+ break;
}
};
@@ -408,6 +411,8 @@ public class PlayAreaPanel extends javax.swing.JPanel {
MageFrame.getInstance().showUserRequestDialog(message);
break;
}
+ default:
+ break;
}
};
@@ -569,7 +574,7 @@ public class PlayAreaPanel extends javax.swing.JPanel {
}
private void btnCheatActionPerformed(java.awt.event.ActionEvent evt) {
- SessionHandler.cheat(gameId, playerId, DeckImporterUtil.importDeck("cheat.dck"));
+ SessionHandler.cheat(gameId, playerId, DeckImporter.importDeckFromFile("cheat.dck"));
}
public boolean isSmallMode() {
diff --git a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
index 344e62c1b6..bd3d34052b 100644
--- a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
+++ b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
@@ -1,22 +1,5 @@
package mage.client.plugins.adapters;
-import java.awt.Component;
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseWheelEvent;
-import java.awt.image.BufferedImage;
-import java.util.*;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.Popup;
-import javax.swing.PopupFactory;
-import javax.swing.SwingUtilities;
import mage.cards.MageCard;
import mage.cards.action.ActionCallback;
import mage.cards.action.TransferData;
@@ -42,6 +25,18 @@ import org.jdesktop.swingx.JXPanel;
import org.mage.card.arcane.CardPanel;
import org.mage.plugins.card.images.ImageCache;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
+import java.awt.image.BufferedImage;
+import java.util.List;
+import java.util.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
/**
* Class that handles the callbacks from the card panels to mage to display big
* card images from the cards the mouse hovers on. Also handles tooltip text
@@ -116,7 +111,7 @@ public class MageActionCallback implements ActionCallback {
}
private void showTooltipPopup(final TransferData data, final Component parentComponent, final Point parentPoint) {
- if (data.component != null) {
+ if (data.getComponent() != null) {
tooltipDelay = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_SHOW_TOOLTIPS_DELAY, 300);
if (tooltipDelay == 0) {
return;
@@ -125,18 +120,18 @@ public class MageActionCallback implements ActionCallback {
if (cardInfoPane == null) {
PopupFactory factory = PopupFactory.getSharedInstance();
- if (data.locationOnScreen == null) {
- if (data.component == null) {
+ if (data.getLocationOnScreen() == null) {
+ if (data.getComponent() == null) {
return;
}
- data.locationOnScreen = data.component.getLocationOnScreen();
+ data.setLocationOnScreen(data.getComponent().getLocationOnScreen());
}
- data.popupText.updateText();
- tooltipPopup = factory.getPopup(data.component, data.popupText, (int) data.locationOnScreen.getX() + data.popupOffsetX, (int) data.locationOnScreen.getY() + data.popupOffsetY + 40);
+ data.getPopupText().updateText();
+ tooltipPopup = factory.getPopup(data.getComponent(), data.getPopupText(), (int) data.getLocationOnScreen().getX() + data.getPopupOffsetX(), (int) data.getLocationOnScreen().getY() + data.getPopupOffsetY() + 40);
tooltipPopup.show();
// hack to get popup to resize to fit text
tooltipPopup.hide();
- tooltipPopup = factory.getPopup(data.component, data.popupText, (int) data.locationOnScreen.getX() + data.popupOffsetX, (int) data.locationOnScreen.getY() + data.popupOffsetY + 40);
+ tooltipPopup = factory.getPopup(data.getComponent(), data.getPopupText(), (int) data.getLocationOnScreen().getX() + data.getPopupOffsetX(), (int) data.getLocationOnScreen().getY() + data.getPopupOffsetY() + 40);
tooltipPopup.show();
} else {
sumbitShowPopupTask(data, parentComponent, parentPoint);
@@ -150,7 +145,7 @@ public class MageActionCallback implements ActionCallback {
ThreadUtils.sleep(tooltipDelay);
if (tooltipCard == null
- || !tooltipCard.equals(data.card)
+ || !tooltipCard.equals(data.getCard())
|| SessionHandler.getSession() == null
|| !popupTextWindowOpen
|| enlargedWindowState != EnlargedWindowState.CLOSED) {
@@ -159,35 +154,33 @@ public class MageActionCallback implements ActionCallback {
try {
final Component popupContainer = MageFrame.getUI().getComponent(MageComponents.POPUP_CONTAINER);
- Component popup2 = MageFrame.getUI().getComponent(MageComponents.CARD_INFO_PANE);
-
- ((CardInfoPane) popup2).setCard(data.card, popupContainer);
-
- showPopup(popupContainer, popup2);
-
+ Component popupInfo = MageFrame.getUI().getComponent(MageComponents.CARD_INFO_PANE);
+ ((CardInfoPane) popupInfo).setCard(data.getCard(), popupContainer);
+ showPopup(popupContainer, popupInfo);
} catch (InterruptedException e) {
- LOGGER.warn(e.getMessage());
+ LOGGER.error("Can't show card tooltip", e);
+ Thread.currentThread().interrupt();
}
}
public void showPopup(final Component popupContainer, final Component infoPane) throws InterruptedException {
final Component c = MageFrame.getUI().getComponent(MageComponents.DESKTOP_PANE);
SwingUtilities.invokeLater(() -> {
- if (!popupTextWindowOpen
- || enlargedWindowState != EnlargedWindowState.CLOSED) {
- return;
- }
- if (data.locationOnScreen == null) {
- data.locationOnScreen = data.component.getLocationOnScreen();
- }
+ if (!popupTextWindowOpen || enlargedWindowState != EnlargedWindowState.CLOSED) {
+ return;
+ }
- Point location = new Point((int) data.locationOnScreen.getX() + data.popupOffsetX - 40, (int) data.locationOnScreen.getY() + data.popupOffsetY - 40);
- location = GuiDisplayUtil.keepComponentInsideParent(location, parentPoint, infoPane, parentComponent);
- location.translate(-parentPoint.x, -parentPoint.y);
- popupContainer.setLocation(location);
- popupContainer.setVisible(true);
- c.repaint();
- }
+ if (data.getLocationOnScreen() == null) {
+ data.setLocationOnScreen(data.getComponent().getLocationOnScreen());
+ }
+
+ Point location = new Point((int) data.getLocationOnScreen().getX() + data.getPopupOffsetX() - 40, (int) data.getLocationOnScreen().getY() + data.getPopupOffsetY() - 40);
+ location = GuiDisplayUtil.keepComponentInsideParent(location, parentPoint, infoPane, parentComponent);
+ location.translate(-parentPoint.x, -parentPoint.y);
+ popupContainer.setLocation(location);
+ popupContainer.setVisible(true);
+ c.repaint();
+ }
);
}
});
@@ -195,7 +188,7 @@ public class MageActionCallback implements ActionCallback {
@Override
public void mousePressed(MouseEvent e, TransferData data) {
- data.component.requestFocusInWindow();
+ data.getComponent().requestFocusInWindow();
// for some reason sometime mouseRelease happens before numerous Mouse_Dragged events
// that results in not finished dragging
@@ -206,23 +199,23 @@ public class MageActionCallback implements ActionCallback {
prevCardPanel = null;
cardPanels.clear();
Point mouse = new Point(e.getX(), e.getY());
- SwingUtilities.convertPointToScreen(mouse, data.component);
+ SwingUtilities.convertPointToScreen(mouse, data.getComponent());
initialMousePos = new Point((int) mouse.getX(), (int) mouse.getY());
- initialCardPos = data.component.getLocation();
+ initialCardPos = data.getComponent().getLocation();
// Closes popup & enlarged view if a card/Permanent is selected
hideTooltipPopup();
}
@Override
public void mouseReleased(MouseEvent e, TransferData transferData) {
- CardPanel card = ((CardPanel) transferData.component);
+ CardPanel card = ((CardPanel) transferData.getComponent());
if (e.isPopupTrigger() /*&& card.getPopupMenu() != null*/) {
hideTooltipPopup();
} else if (card.getZone() != null && card.getZone().equalsIgnoreCase("hand")) {
int maxXOffset = 0;
if (isDragging) {
Point mouse = new Point(e.getX(), e.getY());
- SwingUtilities.convertPointToScreen(mouse, transferData.component);
+ SwingUtilities.convertPointToScreen(mouse, transferData.getComponent());
maxXOffset = Math.abs((int) (mouse.getX() - initialMousePos.x));
}
@@ -230,15 +223,15 @@ public class MageActionCallback implements ActionCallback {
this.startedDragging = false;
if (maxXOffset < MIN_X_OFFSET_REQUIRED) { // we need this for protection from small card movements
- transferData.component.requestFocusInWindow();
- DefaultActionCallback.instance.mouseClicked(transferData.gameId, transferData.card);
+ transferData.getComponent().requestFocusInWindow();
+ DefaultActionCallback.instance.mouseClicked(transferData.getGameId(), transferData.getCard());
// Closes popup & enlarged view if a card/Permanent is selected
hideTooltipPopup();
}
e.consume();
} else {
- transferData.component.requestFocusInWindow();
- DefaultActionCallback.instance.mouseClicked(transferData.gameId, transferData.card);
+ transferData.getComponent().requestFocusInWindow();
+ DefaultActionCallback.instance.mouseClicked(transferData.getGameId(), transferData.getCard());
// Closes popup & enlarged view if a card/Permanent is selected
hideTooltipPopup();
e.consume();
@@ -266,7 +259,7 @@ public class MageActionCallback implements ActionCallback {
if (!Plugins.instance.isCardPluginLoaded()) {
return;
}
- if (!popupData.card.equals(transferData.card)) {
+ if (!popupData.getCard().equals(transferData.getCard())) {
this.popupData = transferData;
handleOverNewView(transferData);
@@ -279,7 +272,7 @@ public class MageActionCallback implements ActionCallback {
@Override
public void mouseDragged(MouseEvent e, TransferData transferData) {
- CardPanel cardPanel = ((CardPanel) transferData.component);
+ CardPanel cardPanel = ((CardPanel) transferData.getComponent());
if (cardPanel.getZone() == null || !cardPanel.getZone().equalsIgnoreCase("hand")) {
// drag'n'drop is allowed for HAND zone only
return;
@@ -292,7 +285,7 @@ public class MageActionCallback implements ActionCallback {
prevCardPanel = cardPanel;
Point cardPanelLocationOld = cardPanel.getLocation();
Point mouse = new Point(e.getX(), e.getY());
- SwingUtilities.convertPointToScreen(mouse, transferData.component);
+ SwingUtilities.convertPointToScreen(mouse, transferData.getComponent());
int xOffset = cardPanel.getXOffset(cardPanel.getCardWidth());
int newX = Math.max(initialCardPos.x + (int) (mouse.getX() - initialMousePos.x) - xOffset, 0);
cardPanel.setCardBounds(
@@ -311,7 +304,7 @@ public class MageActionCallback implements ActionCallback {
@Override
public void mouseExited(MouseEvent e, final TransferData data) {
if (data != null) {
- hideAll(data.gameId);
+ hideAll(data.getGameId());
} else {
hideAll(null);
}
@@ -367,20 +360,20 @@ public class MageActionCallback implements ActionCallback {
// Prevent to show tooltips from panes not in front
MagePane topPane = MageFrame.getTopMost(null);
if (topPane instanceof GamePane) {
- if (!((GamePane) topPane).getGameId().equals(data.gameId)) {
+ if (!((GamePane) topPane).getGameId().equals(data.getGameId())) {
return;
}
- } else if (data.gameId != null) {
+ } else if (data.getGameId() != null) {
return;
}
hideTooltipPopup();
cancelTimeout();
- Component parentComponent = SwingUtilities.getRoot(data.component);
+ Component parentComponent = SwingUtilities.getRoot(data.getComponent());
Point parentPoint = parentComponent.getLocationOnScreen();
- if (data.locationOnScreen == null) {
- data.locationOnScreen = data.component.getLocationOnScreen();
+ if (data.getLocationOnScreen() == null) {
+ data.setLocationOnScreen(data.getComponent().getLocationOnScreen());
}
ArrowUtil.drawArrowsForTargets(data, parentPoint);
@@ -388,12 +381,13 @@ public class MageActionCallback implements ActionCallback {
ArrowUtil.drawArrowsForPairedCards(data, parentPoint);
ArrowUtil.drawArrowsForBandedCards(data, parentPoint);
ArrowUtil.drawArrowsForEnchantPlayers(data, parentPoint);
- tooltipCard = data.card;
+
+ tooltipCard = data.getCard();
showTooltipPopup(data, parentComponent, parentPoint);
}
private void handlePopup(TransferData transferData) {
- MageCard mageCard = (MageCard) transferData.component;
+ MageCard mageCard = (MageCard) transferData.getComponent();
if (!popupTextWindowOpen
|| !Objects.equals(mageCard.getOriginal().getId(), bigCard.getCardId())) {
if (bigCard.getWidth() > 0) {
@@ -419,13 +413,9 @@ public class MageActionCallback implements ActionCallback {
@Override
public void hideOpenComponents() {
- this.hideTooltipPopup();
- this.hideEnlargedCard();
+ hideAll(null);
}
- /**
- * Hides the text popup window
- */
public void hideTooltipPopup() {
this.tooltipCard = null;
if (tooltipPopup != null) {
@@ -438,11 +428,11 @@ public class MageActionCallback implements ActionCallback {
if (SessionHandler.getSession() == null) {
return;
}
- // set enlarged card display to visible = false
Component popupContainer = MageFrame.getUI().getComponent(MageComponents.POPUP_CONTAINER);
popupContainer.setVisible(false);
- } catch (Exception e2) {
- LOGGER.warn("Can't set tooltip to visible = false", e2);
+ } catch (InterruptedException e) {
+ LOGGER.error("Can't hide card tooltip", e);
+ Thread.currentThread().interrupt();
}
}
@@ -500,14 +490,14 @@ public class MageActionCallback implements ActionCallback {
* Show the big card image on mouse position while hovering over a card
*
* @param showAlternative defines if the original image (if it's a copied
- * card) or the opposite side of a transformable card will be shown
+ * card) or the opposite side of a transformable card will be shown
*/
public void enlargeCard(EnlargeMode showAlternative) {
if (enlargedWindowState == EnlargedWindowState.CLOSED) {
this.enlargeMode = showAlternative;
CardView cardView = null;
if (popupData != null) {
- cardView = popupData.card;
+ cardView = popupData.getCard();
}
if (this.popupTextWindowOpen) {
hideTooltipPopup();
@@ -571,17 +561,17 @@ public class MageActionCallback implements ActionCallback {
}
final Component popupContainer = MageFrame.getUI().getComponent(mageComponentCardPreviewContainer);
Component cardPreviewPane = MageFrame.getUI().getComponent(mageComponentCardPreviewPane);
- Component parentComponent = SwingUtilities.getRoot(transferData.component);
+ Component parentComponent = SwingUtilities.getRoot(transferData.getComponent());
if (cardPreviewPane != null && parentComponent != null) {
Point parentPoint = parentComponent.getLocationOnScreen();
- transferData.locationOnScreen = transferData.component.getLocationOnScreen();
- Point location = new Point((int) transferData.locationOnScreen.getX() + transferData.popupOffsetX - 40, (int) transferData.locationOnScreen.getY() + transferData.popupOffsetY - 40);
+ transferData.setLocationOnScreen(transferData.getComponent().getLocationOnScreen());
+ Point location = new Point((int) transferData.getLocationOnScreen().getX() + transferData.getPopupOffsetX() - 40, (int) transferData.getLocationOnScreen().getY() + transferData.getPopupOffsetY() - 40);
location = GuiDisplayUtil.keepComponentInsideParent(location, parentPoint, cardPreviewPane, parentComponent);
location.translate(-parentPoint.x, -parentPoint.y);
popupContainer.setLocation(location);
popupContainer.setVisible(true);
- MageCard mageCard = (MageCard) transferData.component;
+ MageCard mageCard = (MageCard) transferData.getComponent();
Image image = null;
switch (enlargeMode) {
case COPY:
@@ -598,6 +588,8 @@ public class MageActionCallback implements ActionCallback {
}
}
break;
+ default:
+ break;
}
if (image == null) {
image = mageCard.getImage();
diff --git a/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java b/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java
index d9f1fef14f..e63d104219 100644
--- a/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java
+++ b/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java
@@ -26,6 +26,8 @@ import mage.view.CardView;
import mage.view.PermanentView;
import net.xeoh.plugins.base.PluginManager;
import net.xeoh.plugins.base.impl.PluginManagerFactory;
+import net.xeoh.plugins.base.util.uri.ClassURI;
+
import org.apache.log4j.Logger;
import org.mage.plugins.card.CardPluginImpl;
import static org.mage.plugins.card.utils.CardImageUtils.getImagesDir;
@@ -46,13 +48,15 @@ public enum Plugins implements MagePlugins {
@Override
public void loadPlugins() {
-
LOGGER.info("Loading plugins...");
pm = PluginManagerFactory.createPluginManager();
pm.addPluginsFrom(new File(PLUGINS_DIRECTORY + File.separator).toURI());
- this.cardPlugin = new CardPluginImpl();
+ pm.addPluginsFrom(new ClassURI(CardPluginImpl.class).toURI());
+ pm.addPluginsFrom(new ClassURI(ThemePluginImpl.class).toURI());
+
+ this.cardPlugin = pm.getPlugin(CardPlugin.class);
this.counterPlugin = pm.getPlugin(CounterPlugin.class);
- this.themePlugin = new ThemePluginImpl();
+ this.themePlugin = pm.getPlugin(ThemePlugin.class);
LOGGER.info("Done.");
}
@@ -65,15 +69,11 @@ public enum Plugins implements MagePlugins {
@Override
public void changeGUISize() {
- setGUISize();
if (this.cardPlugin != null) {
cardPlugin.changeGUISize();
}
}
- private void setGUISize() {
-
- }
@Override
public void updateGamePanel(Map ui) {
diff --git a/Mage.Client/src/main/java/mage/client/preference/MagePreferences.java b/Mage.Client/src/main/java/mage/client/preference/MagePreferences.java
index 7b17194867..37e84edc6d 100644
--- a/Mage.Client/src/main/java/mage/client/preference/MagePreferences.java
+++ b/Mage.Client/src/main/java/mage/client/preference/MagePreferences.java
@@ -2,6 +2,7 @@ package mage.client.preference;
import com.google.common.collect.Sets;
import mage.client.MageFrame;
+import mage.client.util.Config;
import java.util.Set;
import java.util.prefs.BackingStoreException;
@@ -16,9 +17,13 @@ public final class MagePreferences {
private static final String KEY_PASSWORD = "password";
private static final String KEY_EMAIL = "email";
private static final String KEY_AUTO_CONNECT = "autoConnect";
-
private static final String NODE_KEY_IGNORE_LIST = "ignoreListString";
+ private static String lastServerAddress = "";
+ private static int lastServerPort = 0;
+ private static String lastServerUser = "";
+ private static String lastServerPassword = "";
+
private static Preferences prefs() {
// TODO: Move MageFrame.prefs to this class.
return MageFrame.getPreferences();
@@ -138,4 +143,26 @@ public final class MagePreferences {
return prefs().node(NODE_KEY_IGNORE_LIST).node(serverAddress);
}
+ public static void saveLastServer() {
+ lastServerAddress = getServerAddressWithDefault(Config.serverName);
+ lastServerPort = getServerPortWithDefault(Config.port);
+ lastServerUser = getUserName(lastServerAddress);
+ lastServerPassword = getPassword(lastServerAddress);
+ }
+
+ public static String getLastServerAddress() {
+ return lastServerAddress.isEmpty() ? getServerAddress() : lastServerAddress;
+ }
+
+ public static int getLastServerPort() {
+ return lastServerPort == 0 ? getServerPort() : lastServerPort;
+ }
+
+ public static String getLastServerUser() {
+ return lastServerUser.isEmpty() ? getUserName(getLastServerAddress()) : lastServerUser;
+ }
+
+ public static String getLastServerPassword() {
+ return lastServerPassword.isEmpty() ? getPassword(getLastServerAddress()) : lastServerPassword;
+ }
}
diff --git a/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java b/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
index f71b122591..3f7501c184 100644
--- a/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
+++ b/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
@@ -1,10 +1,5 @@
-
package mage.client.remote;
-import java.awt.event.KeyEvent;
-import java.util.List;
-import java.util.UUID;
-import javax.swing.*;
import mage.cards.decks.Deck;
import mage.client.MageFrame;
import mage.client.SessionHandler;
@@ -28,8 +23,12 @@ import mage.view.*;
import mage.view.ChatMessage.MessageType;
import org.apache.log4j.Logger;
+import javax.swing.*;
+import java.awt.event.KeyEvent;
+import java.util.List;
+import java.util.UUID;
+
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class CallbackClientImpl implements CallbackClient {
@@ -158,7 +157,7 @@ public class CallbackClientImpl implements CallbackClient {
case GAME_INIT: {
GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) {
- appendJsonEvent("GAME_INIT", callback.getObjectId(), (GameView) callback.getData());
+ appendJsonEvent("GAME_INIT", callback.getObjectId(), callback.getData());
panel.init((GameView) callback.getData());
}
break;
@@ -214,7 +213,7 @@ public class CallbackClientImpl implements CallbackClient {
case GAME_CHOOSE_ABILITY: {
GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) {
- appendJsonEvent("GAME_CHOOSE_PILE", callback.getObjectId(), callback.getData());
+ appendJsonEvent("GAME_CHOOSE_ABILITY", callback.getObjectId(), callback.getData());
panel.pickAbility((AbilityPickerView) callback.getData());
}
break;
@@ -353,8 +352,9 @@ public class CallbackClientImpl implements CallbackClient {
}
case DRAFT_UPDATE: {
DraftPanel panel = MageFrame.getDraft(callback.getObjectId());
+ DraftClientMessage message = (DraftClientMessage) callback.getData();
if (panel != null) {
- panel.updateDraft((DraftView) callback.getData());
+ panel.updateDraft(message.getDraftView());
}
break;
}
@@ -371,6 +371,8 @@ public class CallbackClientImpl implements CallbackClient {
case USER_REQUEST_DIALOG:
frame.showUserRequestDialog((UserRequestMessage) callback.getData());
break;
+ default:
+ break;
}
messageId = callback.getMessageId();
} catch (Exception ex) {
@@ -399,36 +401,41 @@ public class CallbackClientImpl implements CallbackClient {
switch (usedPanel.getChatType()) {
case GAME:
usedPanel.receiveMessage("", new StringBuilder("You may use hot keys to play faster:")
- .append(" Turn mousewheel up (ALT-e) - enlarge image of card the mousepointer hovers over")
- .append(" Turn mousewheel down (ALT-s) - enlarge original/alternate image of card the mousepointer hovers over")
- .append(" ")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CONTROL_CONFIRM, 113)))
- .append(" - Confirm \"Ok\", \"Yes\" or \"Done\" button")
- .append(" ")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CONTROL_NEXT_TURN, 115)))
- .append(" - Skip current turn but stop on declare attackers/blockers and something on the stack")
- .append(" ")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CONTROL_END_STEP, 116)))
- .append(" - Skip to next end step but stop on declare attackers/blockers and something on the stack")
- .append(" ")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CONTROL_SKIP_STEP, 117)))
- .append(" - Skip current turn but stop on declare attackers/blockers")
- .append(" ")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CONTROL_MAIN_STEP, 118)))
- .append(" - Skip to next main phase but stop on declare attackers/blockers and something on the stack")
- .append(" ")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CONTROL_YOUR_TURN, 120)))
- .append(" - Skip everything until your next turn")
- .append(" ")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CONTROL_PRIOR_END, 122)))
- .append(" - Skip everything until the end step just prior to your turn")
- .append(" ")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CONTROL_CANCEL_SKIP, 114)))
- .append(" - Undo F4/F5/F7/F9/F11")
- .append(" ")
- .append(KeyEvent.getKeyText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CONTROL_TOGGLE_MACRO, 119)))
- .append(" - Toggle recording a sequence of actions to repeat. Will not pause if interrupted and can fail if a selected card changes such as when scrying top card to bottom.")
- .append(" ").append(System.getProperty("os.name").contains("Mac OS X") ? "Cmd" : "Ctrl").append(" + click - Hold priority while casting a spell or activating an ability").toString(),
+ .append(" Turn mousewheel up (ALT-e) - enlarge image of card the mousepointer hovers over")
+ .append(" Turn mousewheel down (ALT-s) - enlarge original/alternate image of card the mousepointer hovers over")
+ .append(" ")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_CONFIRM)))
+ .append(" - Confirm \"Ok\", \"Yes\" or \"Done\" button")
+ .append(" ")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_NEXT_TURN)))
+ .append(" - Skip current turn but stop on declare attackers/blockers and something on the stack")
+ .append(" ")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_END_STEP)))
+ .append(" - Skip to next end step but stop on declare attackers/blockers and something on the stack")
+ .append(" ")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_SKIP_STEP)))
+ .append(" - Skip current turn but stop on declare attackers/blockers")
+ .append(" ")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_MAIN_STEP)))
+ .append(" - Skip to next main phase but stop on declare attackers/blockers and something on the stack")
+ .append(" ")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_YOUR_TURN)))
+ .append(" - Skip everything until your next turn")
+ .append(" ")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_PRIOR_END)))
+ .append(" - Skip everything until the end step just prior to your turn")
+ .append(" ")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_CANCEL_SKIP)))
+ .append(" - Undo F4/F5/F7/F9/F11")
+ .append(" ")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_SWITCH_CHAT)))
+ .append(" - Switth in/out to chat text field")
+ .append(" ")
+ .append(KeyEvent.getKeyText(PreferencesDialog.getCurrentControlKey(PreferencesDialog.KEY_CONTROL_TOGGLE_MACRO)))
+ .append(" - Toggle recording a sequence of actions to repeat. Will not pause if interrupted and can fail if a selected card changes such as when scrying top card to bottom.")
+ .append(" ").append(System.getProperty("os.name").contains("Mac OS X") ? "Cmd" : "Ctrl").append(" + click - Hold priority while casting a spell or activating an ability")
+ .append(" ").append("Type /FIX message in chat to fix freezed game")
+ .toString(),
null, MessageType.USER_INFO, ChatMessage.MessageColor.BLUE);
break;
case TOURNAMENT:
@@ -437,12 +444,14 @@ public class CallbackClientImpl implements CallbackClient {
break;
case TABLES:
usedPanel.receiveMessage("", new StringBuilder("Download card images by using the \"Images\" menu to the top right .")
- .append(" Download icons and symbols by using the \"Symbols\" menu to the top right.")
- .append(" \\list - Show a list of available chat commands.")
- .append(" ").append(IgnoreList.usage())
- .append(" Type \\w yourUserName profanity 0 (or 1 or 2) to turn off/on the profanity filter").toString(),
+ .append(" Download icons and symbols by using the \"Symbols\" menu to the top right.")
+ .append(" \\list - Show a list of available chat commands.")
+ .append(" ").append(IgnoreList.usage())
+ .append(" Type \\w yourUserName profanity 0 (or 1 or 2) to turn off/on the profanity filter").toString(),
null, MessageType.USER_INFO, ChatMessage.MessageColor.BLUE);
break;
+ default:
+ break;
}
}
diff --git a/Mage.Client/src/main/java/mage/client/table/ColumnInfo.java b/Mage.Client/src/main/java/mage/client/table/ColumnInfo.java
new file mode 100644
index 0000000000..d8a3a9ebba
--- /dev/null
+++ b/Mage.Client/src/main/java/mage/client/table/ColumnInfo.java
@@ -0,0 +1,41 @@
+package mage.client.table;
+
+/**
+ * @author JayDi85
+ */
+public class ColumnInfo {
+ private Integer index;
+ private Integer width;
+ private String headerName;
+ private String headerHint;
+ private Class colClass;
+
+ public ColumnInfo(Integer index, Integer width, Class colClass, String headerName, String headerHint) {
+ this.index = index;
+ this.width = width;
+ this.colClass = colClass;
+ this.headerName = headerName;
+ this.headerHint = headerHint;
+ }
+
+
+ public Integer getIndex() {
+ return index;
+ }
+
+ public Integer getWidth() {
+ return width;
+ }
+
+ public String getHeaderName() {
+ return headerName;
+ }
+
+ public String getHeaderHint() {
+ return headerHint;
+ }
+
+ public Class getColClass() {
+ return colClass;
+ }
+}
diff --git a/Mage.Client/src/main/java/mage/client/table/MageTable.java b/Mage.Client/src/main/java/mage/client/table/MageTable.java
new file mode 100644
index 0000000000..2162acaf3e
--- /dev/null
+++ b/Mage.Client/src/main/java/mage/client/table/MageTable.java
@@ -0,0 +1,69 @@
+package mage.client.table;
+
+import mage.client.util.GUISizeHelper;
+import org.apache.log4j.Logger;
+
+import javax.swing.*;
+import javax.swing.table.JTableHeader;
+import javax.swing.table.TableColumn;
+import java.awt.event.MouseEvent;
+
+/**
+ * @author JayDi85
+ */
+public class MageTable extends JTable {
+
+ private static final Logger logger = Logger.getLogger(MageTable.class);
+ private TableInfo tableInfo;
+
+ public MageTable() {
+ this(null);
+ }
+
+ public MageTable(TableInfo tableInfo) {
+ this.tableInfo = tableInfo;
+ }
+
+ @Override
+ public String getToolTipText(MouseEvent e) {
+ // default tooltip for cells
+ java.awt.Point p = e.getPoint();
+ int viewRow = rowAtPoint(p);
+ int viewCol = columnAtPoint(p);
+ int modelRow = TablesUtil.getModelRowFromView(this, viewRow);
+ int modelCol = this.convertColumnIndexToModel(viewCol);
+ String tip = null;
+ if (modelRow != -1 && modelCol != -1) {
+ tip = this.getModel().getValueAt(modelRow, modelCol).toString();
+ }
+ return GUISizeHelper.textToHtmlWithSize(tip, GUISizeHelper.tableFont);
+ }
+
+ @Override
+ protected JTableHeader createDefaultTableHeader() {
+ // default tooltip for headers
+ return new JTableHeader(columnModel) {
+ public String getToolTipText(MouseEvent e) {
+ // html tooltip
+ java.awt.Point p = e.getPoint();
+ int colIndex = columnModel.getColumnIndexAtX(p.x);
+ TableColumn col = columnModel.getColumn(colIndex);
+ int realIndex = col.getModelIndex();
+
+ String tip;
+ if (tableInfo != null) {
+ // custom hint from table info
+ tip = tableInfo.getColumnByIndex(realIndex).getHeaderHint();
+ if (tip == null) {
+ tip = tableInfo.getColumnByIndex(realIndex).getHeaderName();
+ }
+ } else {
+ // default hint from header
+ tip = col.getHeaderValue().toString();
+ }
+
+ return GUISizeHelper.textToHtmlWithSize(tip, GUISizeHelper.tableFont);
+ }
+ };
+ }
+}
diff --git a/Mage.Client/src/main/java/mage/client/table/MatchesTableModel.java b/Mage.Client/src/main/java/mage/client/table/MatchesTableModel.java
new file mode 100644
index 0000000000..b842686d6e
--- /dev/null
+++ b/Mage.Client/src/main/java/mage/client/table/MatchesTableModel.java
@@ -0,0 +1,146 @@
+package mage.client.table;
+
+import mage.remote.MageRemoteException;
+import mage.view.MatchView;
+
+import javax.swing.table.AbstractTableModel;
+import java.util.Collection;
+import java.util.Date;
+import java.util.UUID;
+
+public class MatchesTableModel extends AbstractTableModel {
+
+ private final String[] columnNames = new String[]{"Deck Type", "Players", "Game Type", "Rating", "Result", "Duration", "Start Time", "End Time", "Action"};
+ public static final int COLUMN_DURATION = 5;
+ public static final int COLUMN_START = 6;
+ public static final int COLUMN_END = 7;
+ public static final int COLUMN_ACTION = 8; // column the action is located (starting with 0)
+
+ private MatchView[] matches = new MatchView[0];
+
+ public void loadData(Collection matches) throws MageRemoteException {
+ this.matches = matches.toArray(new MatchView[0]);
+ this.fireTableDataChanged();
+ }
+
+ MatchesTableModel() {
+ }
+
+
+ public String getTableAndGameInfo(int row) {
+ return this.matches[row].getTableId().toString() + ";" + (!matches[row].getGames().isEmpty() ? matches[row].getGames().get(0).toString() : "null");
+ }
+
+ public String findTableAndGameInfoByRow(int row) {
+ if (row >= 0 && row < this.matches.length) {
+ return getTableAndGameInfo(row);
+ } else {
+ return null;
+ }
+ }
+
+ public int findRowByTableAndGameInfo(String tableAndGame) {
+ for (int i = 0; i < this.matches.length; i++) {
+ String rowID = this.matches[i].getTableId().toString() + ";" + (!this.matches[i].getGames().isEmpty() ? this.matches[i].getGames().get(0).toString() : "null");
+ if (tableAndGame.equals(rowID)) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ @Override
+ public int getRowCount() {
+ return matches.length;
+ }
+
+ @Override
+ public int getColumnCount() {
+ return columnNames.length;
+ }
+
+ @Override
+ public Object getValueAt(int arg0, int arg1) {
+ switch (arg1) {
+ case 0:
+ return matches[arg0].getDeckType();
+ case 1:
+ return matches[arg0].getPlayers();
+ case 2:
+ return matches[arg0].getGameType();
+ case 3:
+ return matches[arg0].isRated() ? TablesTableModel.RATED_VALUE_YES : TablesTableModel.RATED_VALUE_NO;
+ case 4:
+ return matches[arg0].getResult();
+ case 5:
+ if (matches[arg0].getEndTime() != null) {
+ return matches[arg0].getEndTime().getTime() - matches[arg0].getStartTime().getTime() + new Date().getTime();
+ } else {
+ return 0L;
+ }
+ case 6:
+ return matches[arg0].getStartTime();
+ case 7:
+ return matches[arg0].getEndTime();
+ case 8:
+ if (matches[arg0].isTournament()) {
+ return "Show";
+ } else if (matches[arg0].isReplayAvailable()) {
+ return "Replay";
+ } else {
+ return "None";
+ }
+ case 9:
+ return matches[arg0].getGames();
+ default:
+ return "";
+ }
+ }
+
+ public java.util.List getListofGames(int row) {
+ return matches[row].getGames();
+ }
+
+ public boolean isTournament(int row) {
+ return matches[row].isTournament();
+ }
+
+ public UUID getMatchId(int row) {
+ return matches[row].getMatchId();
+ }
+
+ public UUID getTableId(int row) {
+ return matches[row].getTableId();
+ }
+
+ @Override
+ public String getColumnName(int columnIndex) {
+ String colName = "";
+
+ if (columnIndex <= getColumnCount()) {
+ colName = columnNames[columnIndex];
+ }
+
+ return colName;
+ }
+
+ @Override
+ public Class getColumnClass(int columnIndex) {
+ switch (columnIndex) {
+ case COLUMN_DURATION:
+ return Long.class;
+ case COLUMN_START:
+ return Date.class;
+ case COLUMN_END:
+ return Date.class;
+ default:
+ return String.class;
+ }
+ }
+
+ @Override
+ public boolean isCellEditable(int rowIndex, int columnIndex) {
+ return columnIndex == COLUMN_ACTION;
+ }
+
+}
diff --git a/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java b/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java
index f2e8b484a8..c735906900 100644
--- a/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java
@@ -12,6 +12,8 @@ import java.io.IOException;
import java.util.Locale;
import javax.swing.*;
import javax.swing.filechooser.FileFilter;
+
+import mage.cards.decks.DeckFileFilter;
import mage.client.MageFrame;
import mage.client.deck.generator.DeckGenerator;
import mage.client.util.Config;
@@ -31,7 +33,7 @@ public class NewPlayerPanel extends javax.swing.JPanel {
initComponents();
fcSelectDeck = new JFileChooser();
fcSelectDeck.setAcceptAllFileFilterUsed(false);
- fcSelectDeck.addChoosableFileFilter(new DeckFilter());
+ fcSelectDeck.addChoosableFileFilter(new DeckFileFilter("dck", "XMage's deck files (*.dck)"));
String deckPath = MageFrame.getPreferences().get("defaultDeckPath", "");
if (deckPath.isEmpty()) {
if (Config.defaultDeckPath != null) {
@@ -197,29 +199,4 @@ public class NewPlayerPanel extends javax.swing.JPanel {
private javax.swing.JTextField txtPlayerName;
// End of variables declaration//GEN-END:variables
-}
-
-class DeckFilter extends FileFilter {
-
- @Override
- public boolean accept(File f) {
- if (f.isDirectory()) {
- return true;
- }
-
- String ext = null;
- String s = f.getName();
- int i = s.lastIndexOf('.');
-
- if (i > 0 && i < s.length() - 1) {
- ext = s.substring(i + 1).toLowerCase(Locale.ENGLISH);
- }
- return (ext == null) ? false : ext.equals("dck");
- }
-
- @Override
- public String getDescription() {
- return "Deck Files";
- }
-
-}
+}
\ No newline at end of file
diff --git a/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java b/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java
index 732e6f21a1..032ef1ea65 100644
--- a/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java
@@ -1,13 +1,5 @@
-
-
- /*
- * ChatPanel.java
- *
- * Created on 15-Dec-2009, 11:04:31 PM
- */
package mage.client.table;
-import mage.client.MageFrame;
import mage.client.chat.ChatPanelBasic;
import mage.client.util.GUISizeHelper;
import mage.client.util.MageTableRowSorter;
@@ -16,18 +8,15 @@ import mage.client.util.gui.countryBox.CountryCellRenderer;
import mage.remote.MageRemoteException;
import mage.view.RoomUsersView;
import mage.view.UsersView;
-import net.java.balloontip.utils.ToolTipUtils;
import javax.swing.*;
import javax.swing.border.EmptyBorder;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.JTableHeader;
-import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
import java.awt.*;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionAdapter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import static mage.client.chat.ChatPanelBasic.CHAT_ALPHA;
@@ -35,20 +24,45 @@ import static mage.client.dialog.PreferencesDialog.KEY_USERS_COLUMNS_ORDER;
import static mage.client.dialog.PreferencesDialog.KEY_USERS_COLUMNS_WIDTH;
/**
- *
- * @author BetaSteward_at_googlemail.com, nantuko
+ * @author BetaSteward_at_googlemail.com, nantuko, JayDi85
*/
public class PlayersChatPanel extends javax.swing.JPanel {
private final List players = new ArrayList<>();
private final UserTableModel userTableModel;
- private static final int[] DEFAULT_COLUMNS_WIDTH = {20, 100, 40, 40, 40, 100, 40, 100, 80, 80};
+ private static final TableInfo tableInfo = new TableInfo()
+ .addColumn(0, 20, Icon.class, "Flag", null)
+ .addColumn(1, 100, String.class, "Players",
+ "User name"
+ + " (the number behind the header text is the number of users online)")
+ .addColumn(2, 40, Integer.class, "Constructed Rating", null)
+ .addColumn(3, 40, Integer.class, "Limited Rating", null)
+ .addColumn(4, 40, String.class, "Matches",
+ "Number of matches the user played so far"
+ + " Q = number of matches quit"
+ + " I = number of matches lost because of idle timeout"
+ + " T = number of matches lost because of match timeout")
+ .addColumn(5, 100, Integer.class, "MQP",
+ "Percent-Ratio of matches played related to matches quit"
+ + " this calculation does not include tournament matches")
+ .addColumn(6, 40, String.class, "Tourneys",
+ "Number of tournaments the user played so far"
+ + " D = number of tournaments left during draft phase"
+ + " C = number of tournaments left during constructing phase"
+ + " R = number of tournaments left during rounds")
+ .addColumn(7, 100, Integer.class, "TQP",
+ "Percent-Ratio of tournament matches played related to tournament matches quit"
+ + " this calculation does not include non tournament matches")
+ .addColumn(8, 80, String.class, "Games",
+ "Current activities of the player"
+ + " the header itself shows the number of currently active games"
+ + " T: = number of games threads "
+ + " (that can vary from active games because of sideboarding or crashed games)"
+ + " limt: the maximum of games the server is configured to"
+ + " (if the number of started games exceed that limit, the games have to wait"
+ + " until active games end)")
+ .addColumn(9, 80, String.class, "Ping", null);
-
- /*
- * Creates new form ChatPanel
- *
- */
public PlayersChatPanel() {
userTableModel = new UserTableModel(); // needs to be set before initComponents();
@@ -60,8 +74,7 @@ public class PlayersChatPanel extends javax.swing.JPanel {
jTablePlayers.setRowSorter(new MageTableRowSorter(userTableModel));
setGUISize();
- TableUtil.setColumnWidthAndOrder(jTablePlayers, DEFAULT_COLUMNS_WIDTH, KEY_USERS_COLUMNS_WIDTH, KEY_USERS_COLUMNS_ORDER);
- userTableModel.initHeaderTooltips();
+ TableUtil.setColumnWidthAndOrder(jTablePlayers, tableInfo.getColumnsWidth(), KEY_USERS_COLUMNS_WIDTH, KEY_USERS_COLUMNS_ORDER);
jTablePlayers.setDefaultRenderer(Icon.class, new CountryCellRenderer());
@@ -122,7 +135,6 @@ public class PlayersChatPanel extends javax.swing.JPanel {
class UserTableModel extends AbstractTableModel {
- private final String[] columnNames = new String[]{"Loc", "Players", "Constructed Rating", "Limited Rating", "Matches", "MQP", "Tourneys", "TQP", "Games", "Connection"};
private UsersView[] players = new UsersView[0];
public void loadData(Collection roomUserInfoList) throws MageRemoteException {
@@ -131,9 +143,9 @@ public class PlayersChatPanel extends javax.swing.JPanel {
JTableHeader th = jTablePlayers.getTableHeader();
TableColumnModel tcm = th.getColumnModel();
- tcm.getColumn(jTablePlayers.convertColumnIndexToView(1)).setHeaderValue("Players (" + this.players.length + ')');
- tcm.getColumn(jTablePlayers.convertColumnIndexToView(8)).setHeaderValue(
- "Games " + roomUserInfo.getNumberActiveGames()
+ tcm.getColumn(jTablePlayers.convertColumnIndexToView(tableInfo.getColumnByName("Players").getIndex())).setHeaderValue("Players (" + this.players.length + ')');
+ tcm.getColumn(jTablePlayers.convertColumnIndexToView(tableInfo.getColumnByName("Games").getIndex())).setHeaderValue("Games "
+ + roomUserInfo.getNumberActiveGames()
+ (roomUserInfo.getNumberActiveGames() != roomUserInfo.getNumberGameThreads() ? " (T:" + roomUserInfo.getNumberGameThreads() : " (")
+ " limit: " + roomUserInfo.getNumberMaxGames() + ')');
th.repaint();
@@ -147,117 +159,45 @@ public class PlayersChatPanel extends javax.swing.JPanel {
@Override
public int getColumnCount() {
- return columnNames.length;
+ return tableInfo.getColumns().size();
}
@Override
- public Object getValueAt(int arg0, int arg1) {
- switch (arg1) {
+ public Object getValueAt(int rowIndex, int colIndex) {
+ switch (colIndex) {
case 0:
- return players[arg0].getFlagName();
+ return players[rowIndex].getFlagName();
case 1:
- return players[arg0].getUserName();
+ return players[rowIndex].getUserName();
case 2:
- return players[arg0].getConstructedRating();
+ return players[rowIndex].getConstructedRating();
case 3:
- return players[arg0].getLimitedRating();
+ return players[rowIndex].getLimitedRating();
case 4:
- return players[arg0].getMatchHistory();
+ return players[rowIndex].getMatchHistory();
case 5:
- return players[arg0].getMatchQuitRatio();
+ return players[rowIndex].getMatchQuitRatio();
case 6:
- return players[arg0].getTourneyHistory();
+ return players[rowIndex].getTourneyHistory();
case 7:
- return players[arg0].getTourneyQuitRatio();
+ return players[rowIndex].getTourneyQuitRatio();
case 8:
- return players[arg0].getInfoGames();
+ return players[rowIndex].getInfoGames();
case 9:
- return players[arg0].getInfoPing();
+ return players[rowIndex].getInfoPing();
+ default:
+ return "";
}
- return "";
- }
-
- public void initHeaderTooltips() {
- ColumnHeaderToolTips tips = new ColumnHeaderToolTips();
- for (int c = 0; c < jTablePlayers.getColumnCount(); c++) {
- String tooltipText = "";
- switch (c) {
- case 0:
- tooltipText = "The flag the user has assigned to his profile"
- + " You can assign the flag in the connect to server dialog window";
- break;
- case 1:
- tooltipText = "Name of the user"
- + " (the number behind the header text is the number of currently connected users to the server)";
- break;
- case 2:
- tooltipText = "Constructed player rating";
- break;
- case 3:
- tooltipText = "Limited player rating";
- break;
- case 4:
- tooltipText = "Number of matches the user played so far"
- + " Q = number of matches quit"
- + " I = number of matches lost because of idle timeout"
- + " T = number of matches lost because of match timeout";
- break;
- case 5:
- tooltipText = "Percent-Ratio of matches played related to matches quit"
- + " this calculation does not include tournament matches";
- break;
- case 6:
- tooltipText = "Number of tournaments the user played so far"
- + " D = number of tournaments left during draft phase"
- + " C = number of tournaments left during constructing phase"
- + " R = number of tournaments left during rounds";
- break;
- case 7:
- tooltipText = "Percent-Ratio of tournament matches played related to tournament matches quit"
- + " this calculation does not include non tournament matches";
- break;
- case 8:
- tooltipText = "Current activities of the player"
- + " the header itself shows the number of currently active games"
- + " T: = number of games threads "
- + " (that can vary from active games because of sideboarding or crashed games)"
- + " limt: the maximum of games the server is configured to"
- + " (if the number of started games exceed that limit, the games have to wait"
- + " until active games end)";
- break;
- case 9:
- tooltipText = "Latency of the user's connection to the server";
- break;
- }
- tips.setToolTip(c, tooltipText);
- }
- JTableHeader header = jTablePlayers.getTableHeader();
- header.addMouseMotionListener(tips);
}
@Override
public String getColumnName(int columnIndex) {
- String colName = "";
- if (columnIndex <= getColumnCount()) {
- colName = columnNames[columnIndex];
- }
-
- return colName;
+ return tableInfo.getColumnByIndex(columnIndex).getHeaderName();
}
@Override
public Class getColumnClass(int columnIndex) {
- switch (columnIndex) {
- case 0:
- return Icon.class;
- case 2:
- case 3:
- case 5:
- case 7:
- return Integer.class;
- default:
- return String.class;
- }
+ return tableInfo.getColumnByIndex(columnIndex).getColClass();
}
@Override
@@ -279,7 +219,7 @@ public class PlayersChatPanel extends javax.swing.JPanel {
jSpinner1 = new javax.swing.JSpinner();
jSplitPane1 = new javax.swing.JSplitPane();
jScrollPanePlayers = new javax.swing.JScrollPane();
- jTablePlayers = new javax.swing.JTable();
+ jTablePlayers = new MageTable(tableInfo);
jTabbedPaneText = new javax.swing.JTabbedPane();
jScrollPaneTalk = new mage.client.chat.ChatPanelSeparated();
jScrollPaneSystem = new javax.swing.JScrollPane();
@@ -332,14 +272,14 @@ public class PlayersChatPanel 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)
- .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 350, Short.MAX_VALUE)
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 350, Short.MAX_VALUE)
);
layout.setVerticalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addComponent(jSplitPane1)
- .addGap(0, 0, 0))
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addComponent(jSplitPane1)
+ .addGap(0, 0, 0))
);
}// //GEN-END:initComponents
@@ -350,6 +290,7 @@ public class PlayersChatPanel extends javax.swing.JPanel {
this.players.clear();
}
}
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private mage.client.components.ColorPane colorPaneSystem;
private javax.swing.JScrollPane jScrollPanePlayers;
@@ -358,45 +299,6 @@ public class PlayersChatPanel extends javax.swing.JPanel {
private javax.swing.JSpinner jSpinner1;
private javax.swing.JSplitPane jSplitPane1;
private javax.swing.JTabbedPane jTabbedPaneText;
- private javax.swing.JTable jTablePlayers;
+ private MageTable jTablePlayers;
// End of variables declaration//GEN-END:variables
-
- static class ColumnHeaderToolTips extends MouseMotionAdapter {
-
- int curCol;
- final Map tips = new HashMap<>();
-
- public void setToolTip(Integer mCol, String tooltip) {
- if (tooltip == null) {
- tips.remove(mCol);
- } else {
- tips.put(mCol, tooltip);
- }
- }
-
- @Override
- public void mouseMoved(MouseEvent evt) {
- JTableHeader header = (JTableHeader) evt.getSource();
- JTable table = header.getTable();
- TableColumnModel colModel = table.getColumnModel();
- int vColIndex = colModel.getColumnIndexAtX(evt.getX());
- TableColumn col = null;
- if (vColIndex >= 0) {
- col = colModel.getColumn(table.convertColumnIndexToModel(vColIndex));
- }
- if (table.convertColumnIndexToModel(vColIndex) != curCol) {
- if (col != null) {
- MageFrame.getInstance().getBalloonTip().setAttachedComponent(header);
- JLabel content = new JLabel(tips.get(table.convertColumnIndexToModel(vColIndex)));
- content.setFont(GUISizeHelper.balloonTooltipFont);
- MageFrame.getInstance().getBalloonTip().setContents(content);
- ToolTipUtils.balloonToToolTip(MageFrame.getInstance().getBalloonTip(), 600, 10000);
- } else {
- MageFrame.getInstance().getBalloonTip().setTextContents("");
- }
- curCol = table.convertColumnIndexToModel(vColIndex);
- }
- }
- }
-
}
diff --git a/Mage.Client/src/main/java/mage/client/table/TableInfo.java b/Mage.Client/src/main/java/mage/client/table/TableInfo.java
new file mode 100644
index 0000000000..a3570c4287
--- /dev/null
+++ b/Mage.Client/src/main/java/mage/client/table/TableInfo.java
@@ -0,0 +1,44 @@
+package mage.client.table;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author JayDi85
+ */
+public class TableInfo {
+
+ private List columns = new ArrayList<>();
+
+
+ public TableInfo addColumn(Integer index, Integer width, Class colClass, String headerName, String headerHint) {
+ this.columns.add(new ColumnInfo(index, width, colClass, headerName, headerHint));
+ return this;
+ }
+
+ public int[] getColumnsWidth() {
+ return this.columns.stream().mapToInt(ColumnInfo::getIndex).toArray();
+ }
+
+ public List getColumns() {
+ return this.columns;
+ }
+
+ public ColumnInfo getColumnByIndex(int index) {
+ for (ColumnInfo col : this.columns) {
+ if (col.getIndex().equals(index)) {
+ return col;
+ }
+ }
+ return null;
+ }
+
+ public ColumnInfo getColumnByName(String name) {
+ for (ColumnInfo col : this.columns) {
+ if (col.getHeaderName().equals(name)) {
+ return col;
+ }
+ }
+ return null;
+ }
+}
diff --git a/Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.java b/Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.java
index d18df6ef69..99d0dae109 100644
--- a/Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.java
@@ -8,7 +8,7 @@
package mage.client.table;
-import mage.cards.decks.importer.DeckImporterUtil;
+import mage.cards.decks.importer.DeckImporter;
import mage.client.SessionHandler;
import mage.client.util.Config;
import mage.client.util.Event;
@@ -53,7 +53,7 @@ public class TablePlayerPanel extends javax.swing.JPanel {
public boolean joinTable(UUID roomId, UUID tableId) throws IOException, ClassNotFoundException {
if (this.cbPlayerType.getSelectedItem() != PlayerType.HUMAN) {
- return SessionHandler.joinTable(roomId, tableId, this.newPlayerPanel.getPlayerName(), (PlayerType) this.cbPlayerType.getSelectedItem(), this.newPlayerPanel.getLevel(), DeckImporterUtil.importDeck(this.newPlayerPanel.getDeckFile()), "");
+ return SessionHandler.joinTable(roomId, tableId, this.newPlayerPanel.getPlayerName(), (PlayerType) this.cbPlayerType.getSelectedItem(), this.newPlayerPanel.getLevel(), DeckImporter.importDeckFromFile(this.newPlayerPanel.getDeckFile()), "");
}
return true;
}
diff --git a/Mage.Client/src/main/java/mage/client/util/ButtonColumn.java b/Mage.Client/src/main/java/mage/client/table/TablesButtonColumn.java
similarity index 88%
rename from Mage.Client/src/main/java/mage/client/util/ButtonColumn.java
rename to Mage.Client/src/main/java/mage/client/table/TablesButtonColumn.java
index 91e16d9d03..baaa57846e 100644
--- a/Mage.Client/src/main/java/mage/client/util/ButtonColumn.java
+++ b/Mage.Client/src/main/java/mage/client/table/TablesButtonColumn.java
@@ -1,25 +1,21 @@
+package mage.client.table;
-package mage.client.util;
+import mage.client.util.GUISizeHelper;
-import java.awt.Component;
+import javax.swing.*;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableColumnModel;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
-import javax.swing.AbstractCellEditor;
-import javax.swing.Action;
-import javax.swing.JButton;
-import javax.swing.JTable;
-import javax.swing.UIManager;
-import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableColumnModel;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
-public class ButtonColumn extends AbstractCellEditor implements TableCellRenderer, TableCellEditor, ActionListener, MouseListener {
+public class TablesButtonColumn extends AbstractCellEditor implements TableCellRenderer, TableCellEditor, ActionListener, MouseListener {
private final JTable table;
private final Action action;
@@ -28,7 +24,7 @@ public class ButtonColumn extends AbstractCellEditor implements TableCellRendere
private String text;
private boolean isButtonColumnEditor;
- public ButtonColumn(JTable table, Action action, int column) {
+ public TablesButtonColumn(JTable table, Action action, int column) {
super();
this.table = table;
this.action = action;
@@ -88,7 +84,7 @@ public class ButtonColumn extends AbstractCellEditor implements TableCellRendere
if (table.getRowCount() > 0 && table.getRowCount() >= table.getEditingRow() && table.getEditingRow() >= 0) {
int row = table.convertRowIndexToModel(table.getEditingRow());
fireEditingStopped();
- ActionEvent event = new ActionEvent(table, ActionEvent.ACTION_PERFORMED, String.valueOf(row));
+ ActionEvent event = new ActionEvent(table, ActionEvent.ACTION_PERFORMED, TablesUtil.getSearchIdFromTable(table, row));
action.actionPerformed(event);
}
}
diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPane.java b/Mage.Client/src/main/java/mage/client/table/TablesPane.java
index 3b6c6533b5..5e781aac79 100644
--- a/Mage.Client/src/main/java/mage/client/table/TablesPane.java
+++ b/Mage.Client/src/main/java/mage/client/table/TablesPane.java
@@ -105,7 +105,7 @@ public class TablesPane extends MagePane {
@Override
public void activated() {
- tablesPanel.startTasks();
+ tablesPanel.startUpdateTasks(false);
}
@Override
diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.form b/Mage.Client/src/main/java/mage/client/table/TablesPanel.form
index b764e01770..52b892737d 100644
--- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.form
+++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.form
@@ -44,7 +44,7 @@
-
+
@@ -265,6 +265,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -351,7 +387,23 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -544,6 +596,9 @@
+
+
+
@@ -613,18 +668,29 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -634,7 +700,7 @@
-
+
diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
index d28badf2f7..877fb9d9b4 100644
--- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
@@ -1,42 +1,11 @@
-
-
- /*
- * TablesPanel.java
- *
- * Created on 15-Dec-2009, 10:54:01 PM
- */
package mage.client.table;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.beans.PropertyVetoException;
-import java.io.File;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import javax.swing.*;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.TableCellRenderer;
-import mage.cards.decks.importer.DeckImporterUtil;
+import mage.cards.decks.importer.DeckImporter;
import mage.client.MageFrame;
import mage.client.SessionHandler;
import mage.client.chat.ChatPanelBasic;
import mage.client.components.MageComponents;
import mage.client.dialog.*;
-import static mage.client.dialog.PreferencesDialog.KEY_TABLES_COLUMNS_ORDER;
-import static mage.client.dialog.PreferencesDialog.KEY_TABLES_COLUMNS_WIDTH;
-import static mage.client.dialog.PreferencesDialog.KEY_TABLES_FILTER_SETTINGS;
-import static mage.client.dialog.PreferencesDialog.KEY_TABLES_DIVIDER_LOCATION_1;
-import static mage.client.dialog.PreferencesDialog.KEY_TABLES_DIVIDER_LOCATION_2;
-import static mage.client.dialog.PreferencesDialog.KEY_TABLES_DIVIDER_LOCATION_3;
-import mage.client.util.ButtonColumn;
import mage.client.util.GUISizeHelper;
import mage.client.util.IgnoreList;
import mage.client.util.MageTableRowSorter;
@@ -47,25 +16,59 @@ import mage.constants.*;
import mage.game.match.MatchOptions;
import mage.players.PlayerType;
import mage.remote.MageRemoteException;
+import mage.util.RandomUtil;
import mage.view.MatchView;
import mage.view.RoomUsersView;
import mage.view.TableView;
import mage.view.UserRequestMessage;
import org.apache.log4j.Logger;
+import org.mage.card.arcane.CardRendererUtils;
import org.ocpsoft.prettytime.Duration;
import org.ocpsoft.prettytime.PrettyTime;
+import org.ocpsoft.prettytime.TimeFormat;
import org.ocpsoft.prettytime.units.JustNow;
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.LineBorder;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.TableCellRenderer;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.beans.PropertyVetoException;
+import java.io.File;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.*;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import static mage.client.dialog.PreferencesDialog.*;
+
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class TablesPanel extends javax.swing.JPanel {
private static final Logger LOGGER = Logger.getLogger(TablesPanel.class);
- private static final int[] DEFAULT_COLUMNS_WIDTH = {35, 150, 120, 180, 80, 120, 80, 60, 40, 40, 60};
+ private static final int[] DEFAULT_COLUMNS_WIDTH = {35, 150, 100, 50, 120, 180, 80, 120, 80, 60, 40, 40, 60};
- private final TableTableModel tableModel;
+ // refresh timeouts for data downloads from server
+ public static final int REFRESH_ACTIVE_TABLES_SECS = 5;
+ public static final int REFRESH_FINISHED_TABLES_SECS = 30;
+ public static final int REFRESH_PLAYERS_SECS = 10;
+ public static final double REFRESH_TIMEOUTS_INCREASE_FACTOR = 0.8; // can increase timeouts by 80% (0.8)
+
+ private final TablesTableModel tableModel;
private final MatchesTableModel matchesModel;
private UUID roomId;
private UpdateTablesTask updateTablesTask;
@@ -80,13 +83,14 @@ public class TablesPanel extends javax.swing.JPanel {
private final MageTableRowSorter activeTablesSorter;
private final MageTableRowSorter completedTablesSorter;
- private final ButtonColumn actionButton1;
- private final ButtonColumn actionButton2;
+ private final TablesButtonColumn actionButton1;
+ private final TablesButtonColumn actionButton2;
+ private final Map tablesLastSelection = new HashMap<>();
final JToggleButton[] filterButtons;
// time formater
- private PrettyTime timeFormater = new PrettyTime();
+ private PrettyTime timeFormater = new PrettyTime(Locale.ENGLISH);
// time ago renderer
TableCellRenderer timeAgoCellRenderer = new DefaultTableCellRenderer() {
@@ -134,12 +138,94 @@ public class TablesPanel extends javax.swing.JPanel {
}
};
+ // skill renderer
+ TableCellRenderer skillCellRenderer = new DefaultTableCellRenderer() {
+
+ // base panel to render
+ private JPanel renderPanel = new JPanel();
+ private ImageIcon skillIcon = new ImageIcon(this.getClass().getResource("/info/yellow_star_16.png"));
+
+ @Override
+ public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+
+ // get table text cell settings
+ DefaultTableCellRenderer baseRenderer = (DefaultTableCellRenderer) table.getDefaultRenderer(String.class);
+ JLabel baseComp = (JLabel) baseRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+ String skillCode = baseComp.getText();
+
+ // apply settings to render panel from parent
+ renderPanel.setOpaque(baseComp.isOpaque());
+ renderPanel.setForeground(CardRendererUtils.copyColor(baseComp.getForeground()));
+ renderPanel.setBackground(CardRendererUtils.copyColor(baseComp.getBackground()));
+ renderPanel.setBorder(baseComp.getBorder());
+
+ // create each skill symbol as child label
+ renderPanel.removeAll();
+ renderPanel.setLayout(new BoxLayout(renderPanel, BoxLayout.X_AXIS));
+ for (char skillSymbol : skillCode.toCharArray()) {
+ JLabel symbolLabel = new JLabel();
+ symbolLabel.setBorder(new EmptyBorder(0, 3, 0, 0));
+ symbolLabel.setIcon(skillIcon);
+ renderPanel.add(symbolLabel);
+ }
+
+ return renderPanel;
+ }
+ };
+
+ // seats render
+ TableCellRenderer seatsCellRenderer = new DefaultTableCellRenderer() {
+
+ JLabel greenLabel = new JLabel();
+
+ @Override
+ public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+ JLabel defaultLabel = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+ defaultLabel.setHorizontalAlignment(JLabel.CENTER);
+ // colors
+ String val = (String) value;
+ int[] seats = parseSeatsInfo(val);
+ if (seats[0] != seats[1]) {
+ // green draw
+ Color defaultBack = defaultLabel.getBackground();
+ greenLabel.setText(val);
+ greenLabel.setHorizontalAlignment(JLabel.CENTER);
+ greenLabel.setFont(defaultLabel.getFont());
+ greenLabel.setForeground(Color.black);
+ greenLabel.setOpaque(true);
+ greenLabel.setBackground(new Color(156, 240, 146));
+ greenLabel.setBorder(new LineBorder(defaultBack, 1));
+ return greenLabel;
+ } else {
+ // default draw
+ return defaultLabel;
+ }
+ }
+ };
+
+ private int[] parseSeatsInfo(String info) {
+ String[] valsList = info.split("/");
+ int[] res = {0, 0};
+ if (valsList.length == 2) {
+ res[0] = Integer.parseInt(valsList[0]);
+ res[1] = Integer.parseInt(valsList[1]);
+ }
+ return res;
+ }
+
+ public static int randomizeTimout(int minTimout) {
+ // randomize timeouts to fix calls waves -- slow server can creates queue and moves all clients to same call window
+ int increase = (int) (minTimout * REFRESH_TIMEOUTS_INCREASE_FACTOR);
+ return minTimout + RandomUtil.nextInt(increase);
+ }
+
+
/**
* Creates new form TablesPanel
*/
public TablesPanel() {
- tableModel = new TableTableModel();
+ tableModel = new TablesTableModel();
matchesModel = new MatchesTableModel();
gameChooser = new GameChooser();
@@ -147,28 +233,77 @@ public class TablesPanel extends javax.swing.JPanel {
// tableModel.setSession(session);
// formater
- timeFormater.setLocale(Locale.ENGLISH);
- JustNow jn = timeFormater.getUnit(JustNow.class);
- jn.setMaxQuantity(1000L * 30L); // 30 seconds gap (show "just now" from 0 to 30 secs)
+ // change default just now from 60 to 30 secs
+ // see workaround for 4.0 versions: https://github.com/ocpsoft/prettytime/issues/152
+ TimeFormat timeFormat = timeFormater.removeUnit(JustNow.class);
+ JustNow newJustNow = new JustNow();
+ newJustNow.setMaxQuantity(1000L * 30L); // 30 seconds gap (show "just now" from 0 to 30 secs)
+ timeFormater.registerUnit(newJustNow, timeFormat);
// 1. TABLE CURRENT
tableTables.createDefaultColumnsFromModel();
- activeTablesSorter = new MageTableRowSorter(tableModel);
+ activeTablesSorter = new MageTableRowSorter(tableModel) {
+ @Override
+ public void toggleSortOrder(int column) {
+ // special sort for created and seat column
+ if (column == TablesTableModel.COLUMN_CREATED || column == TablesTableModel.COLUMN_SEATS) {
+ List sortKeys = getSortKeys();
+ if (!sortKeys.isEmpty() && sortKeys.size() == 2) {
+ // clear sort on second click
+ setSortKeys(null);
+ } else {
+ // setup sort on first click
+ List list = new ArrayList<>();
+ list.add(new RowSorter.SortKey(TablesTableModel.COLUMN_SEATS, SortOrder.ASCENDING));
+ list.add(new RowSorter.SortKey(TablesTableModel.COLUMN_CREATED, SortOrder.DESCENDING));
+ setSortKeys(list);
+ }
+ } else {
+ super.toggleSortOrder(column);
+ }
+ }
+ };
tableTables.setRowSorter(activeTablesSorter);
// time ago
- tableTables.getColumnModel().getColumn(TableTableModel.COLUMN_CREATED).setCellRenderer(timeAgoCellRenderer);
+ tableTables.getColumnModel().getColumn(TablesTableModel.COLUMN_CREATED).setCellRenderer(timeAgoCellRenderer);
+ // skill level
+ tableTables.getColumnModel().getColumn(TablesTableModel.COLUMN_SKILL).setCellRenderer(skillCellRenderer);
+ // seats
+ tableTables.getColumnModel().getColumn(TablesTableModel.COLUMN_SEATS).setCellRenderer(seatsCellRenderer);
+
/* date sorter (not need, default is good - see getColumnClass)
- activeTablesSorter.setComparator(TableTableModel.COLUMN_CREATED, new Comparator() {
+ activeTablesSorter.setComparator(TablesTableModel.COLUMN_CREATED, new Comparator() {
@Override
public int compare(Date v1, Date v2) {
return v1.compareTo(v2);
}
});*/
+
+ // seats sorter (free tables must be first)
+ activeTablesSorter.setComparator(TablesTableModel.COLUMN_SEATS, new Comparator() {
+ @Override
+ public int compare(String v1, String v2) {
+ int[] seats1 = parseSeatsInfo(v1);
+ int[] seats2 = parseSeatsInfo(v2);
+ boolean free1 = seats1[0] != seats1[1];
+ boolean free2 = seats2[0] != seats2[1];
+
+ // free seats go first
+ if (free1 || free2) {
+ return Boolean.compare(free2, free1);
+ }
+
+ // all other seats go without sorts
+ return 0;
+ }
+ });
+
// default sort by created date (last games from above)
- ArrayList list = new ArrayList();
- list.add(new RowSorter.SortKey(TableTableModel.COLUMN_CREATED, SortOrder.DESCENDING));
+ ArrayList list = new ArrayList<>();
+ list.add(new RowSorter.SortKey(TablesTableModel.COLUMN_SEATS, SortOrder.ASCENDING));
+ list.add(new RowSorter.SortKey(TablesTableModel.COLUMN_CREATED, SortOrder.DESCENDING));
activeTablesSorter.setSortKeys(list);
TableUtil.setColumnWidthAndOrder(tableTables, DEFAULT_COLUMNS_WIDTH, KEY_TABLES_COLUMNS_WIDTH, KEY_TABLES_COLUMNS_ORDER);
@@ -183,7 +318,7 @@ public class TablesPanel extends javax.swing.JPanel {
tableCompleted.getColumnModel().getColumn(MatchesTableModel.COLUMN_START).setCellRenderer(datetimeCellRenderer);
tableCompleted.getColumnModel().getColumn(MatchesTableModel.COLUMN_END).setCellRenderer(datetimeCellRenderer);
// default sort by ended date (last games from above)
- ArrayList list2 = new ArrayList();
+ ArrayList list2 = new ArrayList<>();
list2.add(new RowSorter.SortKey(MatchesTableModel.COLUMN_END, SortOrder.DESCENDING));
completedTablesSorter.setSortKeys(list2);
@@ -194,9 +329,9 @@ public class TablesPanel extends javax.swing.JPanel {
// 4. BUTTONS
filterButtons = new JToggleButton[]{btnStateWaiting, btnStateActive, btnStateFinished,
- btnTypeMatch, btnTypeTourneyConstructed, btnTypeTourneyLimited,
- btnFormatBlock, btnFormatStandard, btnFormatModern, btnFormatLegacy, btnFormatVintage, btnFormatCommander, btnFormatTinyLeader, btnFormatLimited, btnFormatOther,
- btnSkillBeginner, btnSkillCasual, btnSkillSerious, btnRated, btnUnrated, btnOpen, btnPassword};
+ btnTypeMatch, btnTypeTourneyConstructed, btnTypeTourneyLimited,
+ btnFormatBlock, btnFormatStandard, btnFormatModern, btnFormatLegacy, btnFormatVintage, btnFormatPremodern, btnFormatCommander, btnFormatTinyLeader, btnFormatLimited, btnFormatOther,
+ btnSkillBeginner, btnSkillCasual, btnSkillSerious, btnRated, btnUnrated, btnOpen, btnPassword};
JComponent[] components = new JComponent[]{chatPanelMain, jSplitPane1, jScrollPaneTablesActive, jScrollPaneTablesFinished, jPanelTop, jPanelTables};
for (JComponent component : components) {
@@ -213,14 +348,18 @@ public class TablesPanel extends javax.swing.JPanel {
openTableAction = new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
- int modelRow = Integer.valueOf(e.getActionCommand());
- UUID tableId = (UUID) tableModel.getValueAt(modelRow, TableTableModel.ACTION_COLUMN + 3);
- UUID gameId = (UUID) tableModel.getValueAt(modelRow, TableTableModel.ACTION_COLUMN + 2);
- String action = (String) tableModel.getValueAt(modelRow, TableTableModel.ACTION_COLUMN);
- String deckType = (String) tableModel.getValueAt(modelRow, TableTableModel.COLUMN_DECK_TYPE);
- boolean isTournament = (Boolean) tableModel.getValueAt(modelRow, TableTableModel.ACTION_COLUMN + 1);
- String owner = (String) tableModel.getValueAt(modelRow, TableTableModel.COLUMN_OWNER);
- String pwdColumn = (String) tableModel.getValueAt(modelRow, TableTableModel.COLUMN_PASSWORD);
+ String searchID = e.getActionCommand();
+ int modelRow = TablesUtil.findTableRowFromSearchId(tableModel, searchID);
+ if (modelRow == -1) {
+ return;
+ }
+ UUID tableId = (UUID) tableModel.getValueAt(modelRow, TablesTableModel.ACTION_COLUMN + 3);
+ UUID gameId = (UUID) tableModel.getValueAt(modelRow, TablesTableModel.ACTION_COLUMN + 2);
+ String action = (String) tableModel.getValueAt(modelRow, TablesTableModel.ACTION_COLUMN);
+ String deckType = (String) tableModel.getValueAt(modelRow, TablesTableModel.COLUMN_DECK_TYPE);
+ boolean isTournament = (Boolean) tableModel.getValueAt(modelRow, TablesTableModel.ACTION_COLUMN + 1);
+ String owner = (String) tableModel.getValueAt(modelRow, TablesTableModel.COLUMN_OWNER);
+ String pwdColumn = (String) tableModel.getValueAt(modelRow, TablesTableModel.COLUMN_PASSWORD);
switch (action) {
case "Join":
if (owner.equals(SessionHandler.getUserName()) || owner.startsWith(SessionHandler.getUserName() + ',')) {
@@ -247,7 +386,7 @@ public class TablesPanel extends javax.swing.JPanel {
if (isTournament) {
LOGGER.info("Joining tournament " + tableId);
if (deckType.startsWith("Limited")) {
- if (TableTableModel.PASSWORD_VALUE_YES.equals(pwdColumn)) {
+ if (TablesTableModel.PASSWORD_VALUE_YES.equals(pwdColumn)) {
joinTableDialog.showDialog(roomId, tableId, true, deckType.startsWith("Limited"));
} else {
SessionHandler.joinTournamentTable(roomId, tableId, SessionHandler.getUserName(), PlayerType.HUMAN, 1, null, "");
@@ -290,7 +429,11 @@ public class TablesPanel extends javax.swing.JPanel {
closedTableAction = new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
- int modelRow = Integer.valueOf(e.getActionCommand());
+ String searchID = e.getActionCommand();
+ int modelRow = TablesUtil.findTableRowFromSearchId(matchesModel, searchID);
+ if (modelRow == -1) {
+ return;
+ }
String action = (String) matchesModel.getValueAt(modelRow, MatchesTableModel.COLUMN_ACTION);
switch (action) {
case "Replay":
@@ -315,20 +458,61 @@ public class TablesPanel extends javax.swing.JPanel {
};
// !!!! adds action buttons to the table panel (don't delete this)
- actionButton1 = new ButtonColumn(tableTables, openTableAction, tableTables.convertColumnIndexToView(TableTableModel.ACTION_COLUMN));
- actionButton2 = new ButtonColumn(tableCompleted, closedTableAction, tableCompleted.convertColumnIndexToView(MatchesTableModel.COLUMN_ACTION));
- // !!!!
+ actionButton1 = new TablesButtonColumn(tableTables, openTableAction, tableTables.convertColumnIndexToView(TablesTableModel.ACTION_COLUMN));
+ actionButton2 = new TablesButtonColumn(tableCompleted, closedTableAction, tableCompleted.convertColumnIndexToView(MatchesTableModel.COLUMN_ACTION));
+ // selection
+ tablesLastSelection.put(tableTables, "");
+ tablesLastSelection.put(tableCompleted, "");
+ addTableSelectListener(tableTables);
+ addTableSelectListener(tableCompleted);
+ // double click
addTableDoubleClickListener(tableTables, openTableAction);
addTableDoubleClickListener(tableCompleted, closedTableAction);
}
+ private void addTableSelectListener(JTable table) {
+ // https://stackoverflow.com/a/26142800/1276632
+
+ // save last selection
+ table.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
+ int modelRow = TablesUtil.getSelectedModelRow(table);
+ if (modelRow != -1) {
+ // needs only selected
+ String rowId = TablesUtil.getSearchIdFromTable(table, modelRow);
+ tablesLastSelection.put(table, rowId);
+ }
+ }
+ });
+
+ // restore selection
+ table.getModel().addTableModelListener(new TableModelListener() {
+ @Override
+ public void tableChanged(TableModelEvent e) {
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ String lastRowID = tablesLastSelection.get(table);
+ int needModelRow = TablesUtil.findTableRowFromSearchId(table.getModel(), lastRowID);
+ int needViewRow = TablesUtil.getViewRowFromModel(table, needModelRow);
+ if (needViewRow != -1) {
+ table.clearSelection();
+ table.addRowSelectionInterval(needViewRow, needViewRow);
+ }
+ }
+ });
+ }
+ });
+ }
+
private void addTableDoubleClickListener(JTable table, Action action) {
table.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
- int row = table.rowAtPoint(e.getPoint());
- if (e.getClickCount() == 2 && row != -1) {
- action.actionPerformed(new ActionEvent(e.getSource(), e.getID(), "" + row));
+ int modelRow = TablesUtil.getSelectedModelRow(table);
+ if (e.getClickCount() == 2 && modelRow != -1) {
+ action.actionPerformed(new ActionEvent(table, ActionEvent.ACTION_PERFORMED, TablesUtil.getSearchIdFromTable(table, modelRow)));
}
}
});
@@ -337,6 +521,7 @@ public class TablesPanel extends javax.swing.JPanel {
public void cleanUp() {
saveGuiSettings();
chatPanelMain.cleanUp();
+ stopTasks();
}
public void changeGUISize() {
@@ -392,9 +577,9 @@ public class TablesPanel extends javax.swing.JPanel {
Dimension newDimension = new Dimension((int) jPanelBottom.getPreferredSize().getWidth(), GUISizeHelper.menuFont.getSize() + 28);
jPanelBottom.setMinimumSize(newDimension);
jPanelBottom.setPreferredSize(newDimension);
- jButtonFooterNext.setFont(GUISizeHelper.menuFont);
- jLabelFooterLabel.setFont(new Font(GUISizeHelper.menuFont.getName(), Font.BOLD, GUISizeHelper.menuFont.getSize()));
- jLabelFooterText.setFont(GUISizeHelper.menuFont);
+ buttonNextMessage.setFont(GUISizeHelper.menuFont);
+ labelMessageHeader.setFont(new Font(GUISizeHelper.menuFont.getName(), Font.BOLD, GUISizeHelper.menuFont.getSize()));
+ labelMessageText.setFont(GUISizeHelper.menuFont);
}
private void saveDividerLocations() {
@@ -456,23 +641,31 @@ public class TablesPanel extends javax.swing.JPanel {
}
}
- public void startTasks() {
+ public void startUpdateTasks(boolean refreshImmediately) {
if (SessionHandler.getSession() != null) {
- if (updateTablesTask == null || updateTablesTask.isDone()) {
+ // active tables and server messages
+ if (updateTablesTask == null || updateTablesTask.isDone() || refreshImmediately) {
+ if (updateTablesTask != null) updateTablesTask.cancel(true);
updateTablesTask = new UpdateTablesTask(roomId, this);
updateTablesTask.execute();
}
- if (updatePlayersTask == null || updatePlayersTask.isDone()) {
- updatePlayersTask = new UpdatePlayersTask(roomId, this.chatPanelMain);
- updatePlayersTask.execute();
- }
+
+ // finished tables
if (this.btnStateFinished.isSelected()) {
- if (updateMatchesTask == null || updateMatchesTask.isDone()) {
+ if (updateMatchesTask == null || updateMatchesTask.isDone() || refreshImmediately) {
+ if (updateMatchesTask != null) updateMatchesTask.cancel(true);
updateMatchesTask = new UpdateMatchesTask(roomId, this);
updateMatchesTask.execute();
}
- } else if (updateMatchesTask != null) {
- updateMatchesTask.cancel(true);
+ } else {
+ if (updateMatchesTask != null) updateMatchesTask.cancel(true);
+ }
+
+ // players list
+ if (updatePlayersTask == null || updatePlayersTask.isDone() || refreshImmediately) {
+ if (updatePlayersTask != null) updatePlayersTask.cancel(true);
+ updatePlayersTask = new UpdatePlayersTask(roomId, this.chatPanelMain);
+ updatePlayersTask.execute();
}
}
}
@@ -511,7 +704,7 @@ public class TablesPanel extends javax.swing.JPanel {
}
if (chatRoomId != null) {
this.chatPanelMain.getUserChatPanel().connect(chatRoomId);
- startTasks();
+ startUpdateTasks(true);
this.setVisible(true);
this.repaint();
} else {
@@ -519,7 +712,7 @@ public class TablesPanel extends javax.swing.JPanel {
}
//tableModel.setSession(session);
- reloadMessages();
+ reloadServerMessages();
MageFrame.getUI().addButton(MageComponents.NEW_GAME_BUTTON, btnNewTable);
@@ -528,20 +721,25 @@ public class TablesPanel extends javax.swing.JPanel {
}
- protected void reloadMessages() {
+ protected void reloadServerMessages() {
// reload server messages
java.util.List serverMessages = SessionHandler.getServerMessages();
synchronized (this) {
- this.messages = serverMessages;
+ if (serverMessages != null) {
+ this.messages = serverMessages;
+ } else {
+ this.messages = new ArrayList<>();
+ }
+
this.currentMessage = 0;
}
- if (serverMessages.isEmpty()) {
+ if (this.messages.isEmpty()) {
this.jPanelBottom.setVisible(false);
} else {
this.jPanelBottom.setVisible(true);
- URLHandler.RemoveMouseAdapter(jLabelFooterText);
- URLHandler.handleMessage(serverMessages.get(0), this.jLabelFooterText);
- this.jButtonFooterNext.setVisible(serverMessages.size() > 1);
+ URLHandler.RemoveMouseAdapter(labelMessageText);
+ URLHandler.handleMessage(this.messages.get(0), this.labelMessageText);
+ this.buttonNextMessage.setVisible(this.messages.size() > 1);
}
}
@@ -572,86 +770,90 @@ public class TablesPanel extends javax.swing.JPanel {
// state
java.util.List> stateFilterList = new ArrayList<>();
if (btnStateWaiting.isSelected()) {
- stateFilterList.add(RowFilter.regexFilter("Waiting", TableTableModel.COLUMN_STATUS));
+ stateFilterList.add(RowFilter.regexFilter("Waiting", TablesTableModel.COLUMN_STATUS));
}
if (btnStateActive.isSelected()) {
- stateFilterList.add(RowFilter.regexFilter("Dueling|Constructing|Drafting|Sideboard", TableTableModel.COLUMN_STATUS));
+ stateFilterList.add(RowFilter.regexFilter("Dueling|Constructing|Drafting|Sideboard", TablesTableModel.COLUMN_STATUS));
}
// type
java.util.List> typeFilterList = new ArrayList<>();
if (btnTypeMatch.isSelected()) {
- typeFilterList.add(RowFilter.regexFilter("Two|Commander|Free|Tiny|Momir", TableTableModel.COLUMN_GAME_TYPE));
+ typeFilterList.add(RowFilter.regexFilter("Two|Commander|Free|Tiny|Momir", TablesTableModel.COLUMN_GAME_TYPE));
}
if (btnTypeTourneyConstructed.isSelected()) {
- typeFilterList.add(RowFilter.regexFilter("Constructed", TableTableModel.COLUMN_GAME_TYPE));
+ typeFilterList.add(RowFilter.regexFilter("Constructed", TablesTableModel.COLUMN_GAME_TYPE));
}
if (btnTypeTourneyLimited.isSelected()) {
- typeFilterList.add(RowFilter.regexFilter("Booster|Sealed", TableTableModel.COLUMN_GAME_TYPE));
+ typeFilterList.add(RowFilter.regexFilter("Booster|Sealed", TablesTableModel.COLUMN_GAME_TYPE));
}
// format
java.util.List> formatFilterList = new ArrayList<>();
if (btnFormatBlock.isSelected()) {
- formatFilterList.add(RowFilter.regexFilter("^Constructed.*Block", TableTableModel.COLUMN_DECK_TYPE));
+ formatFilterList.add(RowFilter.regexFilter("^Constructed.*Block", TablesTableModel.COLUMN_DECK_TYPE));
}
if (btnFormatStandard.isSelected()) {
- formatFilterList.add(RowFilter.regexFilter("^Constructed - Standard", TableTableModel.COLUMN_DECK_TYPE));
+ formatFilterList.add(RowFilter.regexFilter("^Constructed - Standard", TablesTableModel.COLUMN_DECK_TYPE));
}
if (btnFormatModern.isSelected()) {
- formatFilterList.add(RowFilter.regexFilter("^Constructed - Modern", TableTableModel.COLUMN_DECK_TYPE));
+ formatFilterList.add(RowFilter.regexFilter("^Constructed - Modern", TablesTableModel.COLUMN_DECK_TYPE));
}
if (btnFormatLegacy.isSelected()) {
- formatFilterList.add(RowFilter.regexFilter("^Constructed - Legacy", TableTableModel.COLUMN_DECK_TYPE));
+ formatFilterList.add(RowFilter.regexFilter("^Constructed - Legacy", TablesTableModel.COLUMN_DECK_TYPE));
}
if (btnFormatVintage.isSelected()) {
- formatFilterList.add(RowFilter.regexFilter("^Constructed - Vintage", TableTableModel.COLUMN_DECK_TYPE));
+ formatFilterList.add(RowFilter.regexFilter("^Constructed - Vintage", TablesTableModel.COLUMN_DECK_TYPE));
+ }
+ if (btnFormatPremodern.isSelected()) {
+ formatFilterList.add(RowFilter.regexFilter("^Constructed - Premodern", TablesTableModel.COLUMN_DECK_TYPE));
}
if (btnFormatCommander.isSelected()) {
- formatFilterList.add(RowFilter.regexFilter("^Commander|^Duel Commander|^Penny Dreadful Commander|^Freeform Commander|^MTGO 1v1 Commander|^Duel Brawl|^Brawl", TableTableModel.COLUMN_DECK_TYPE));
+ formatFilterList.add(RowFilter.regexFilter("^Commander|^Duel Commander|^Penny Dreadful Commander|^Freeform Commander|^MTGO 1v1 Commander|^Duel Brawl|^Brawl", TablesTableModel.COLUMN_DECK_TYPE));
}
if (btnFormatTinyLeader.isSelected()) {
- formatFilterList.add(RowFilter.regexFilter("^Tiny", TableTableModel.COLUMN_DECK_TYPE));
+ formatFilterList.add(RowFilter.regexFilter("^Tiny", TablesTableModel.COLUMN_DECK_TYPE));
}
if (btnFormatLimited.isSelected()) {
- formatFilterList.add(RowFilter.regexFilter("^Limited", TableTableModel.COLUMN_DECK_TYPE));
+ formatFilterList.add(RowFilter.regexFilter("^Limited", TablesTableModel.COLUMN_DECK_TYPE));
}
if (btnFormatOther.isSelected()) {
- formatFilterList.add(RowFilter.regexFilter("^Momir Basic|^Constructed - Pauper|^Constructed - Frontier|^Constructed - Extended|^Constructed - Eternal|^Constructed - Historical|^Constructed - Super|^Constructed - Freeform|^Australian Highlander|^Canadian Highlander|^Constructed - Old", TableTableModel.COLUMN_DECK_TYPE));
+ formatFilterList.add(RowFilter.regexFilter("^Momir Basic|^Constructed - Pauper|^Constructed - Frontier|^Constructed - Extended|^Constructed - Eternal|^Constructed - Historical|^Constructed - Super|^Constructed - Freeform|^Australian Highlander|^Canadian Highlander|^Constructed - Old", TablesTableModel.COLUMN_DECK_TYPE));
}
+ // skill
java.util.List> skillFilterList = new ArrayList<>();
if (btnSkillBeginner.isSelected()) {
- skillFilterList.add(RowFilter.regexFilter(SkillLevel.BEGINNER.toString(), TableTableModel.COLUMN_SKILL));
+ skillFilterList.add(RowFilter.regexFilter(this.tableModel.getSkillLevelAsCode(SkillLevel.BEGINNER, true), TablesTableModel.COLUMN_SKILL));
}
if (btnSkillCasual.isSelected()) {
- skillFilterList.add(RowFilter.regexFilter(SkillLevel.CASUAL.toString(), TableTableModel.COLUMN_SKILL));
+ skillFilterList.add(RowFilter.regexFilter(this.tableModel.getSkillLevelAsCode(SkillLevel.CASUAL, true), TablesTableModel.COLUMN_SKILL));
}
if (btnSkillSerious.isSelected()) {
- skillFilterList.add(RowFilter.regexFilter(SkillLevel.SERIOUS.toString(), TableTableModel.COLUMN_SKILL));
+ skillFilterList.add(RowFilter.regexFilter(this.tableModel.getSkillLevelAsCode(SkillLevel.SERIOUS, true), TablesTableModel.COLUMN_SKILL));
}
- String ratedMark = TableTableModel.RATED_VALUE_YES;
+ String ratedMark = TablesTableModel.RATED_VALUE_YES;
java.util.List> ratingFilterList = new ArrayList<>();
if (btnRated.isSelected()) {
// yes word
- ratingFilterList.add(RowFilter.regexFilter("^" + ratedMark, TableTableModel.COLUMN_RATING));
+ ratingFilterList.add(RowFilter.regexFilter("^" + ratedMark, TablesTableModel.COLUMN_RATING));
}
if (btnUnrated.isSelected()) {
// not yes word, see https://stackoverflow.com/a/406408/1276632
- ratingFilterList.add(RowFilter.regexFilter("^((?!" + ratedMark + ").)*$", TableTableModel.COLUMN_RATING));
+ ratingFilterList.add(RowFilter.regexFilter("^((?!" + ratedMark + ").)*$", TablesTableModel.COLUMN_RATING));
}
// Password
- String passwordMark = TableTableModel.PASSWORD_VALUE_YES;
+ String passwordMark = TablesTableModel.PASSWORD_VALUE_YES;
java.util.List> passwordFilterList = new ArrayList<>();
if (btnPassword.isSelected()) {
// yes
- passwordFilterList.add(RowFilter.regexFilter("^" + passwordMark, TableTableModel.COLUMN_PASSWORD));
+ passwordFilterList.add(RowFilter.regexFilter("^" + passwordMark, TablesTableModel.COLUMN_PASSWORD));
}
if (btnOpen.isSelected()) {
// no
- passwordFilterList.add(RowFilter.regexFilter("^((?!" + passwordMark + ").)*$", TableTableModel.COLUMN_PASSWORD));
+ passwordFilterList.add(RowFilter.regexFilter("^((?!" + passwordMark + ").)*$", TablesTableModel.COLUMN_PASSWORD));
}
// Hide games of ignored players
@@ -662,7 +864,7 @@ public class TablesPanel extends javax.swing.JPanel {
ignoreListFilterList.add(new RowFilter() {
@Override
public boolean include(Entry entry) {
- final String owner = entry.getStringValue(TableTableModel.COLUMN_OWNER);
+ final String owner = entry.getStringValue(TablesTableModel.COLUMN_OWNER);
return !ignoreListCopy.contains(owner);
}
});
@@ -671,7 +873,7 @@ public class TablesPanel extends javax.swing.JPanel {
if (stateFilterList.isEmpty() || typeFilterList.isEmpty() || formatFilterList.isEmpty()
|| skillFilterList.isEmpty() || ratingFilterList.isEmpty()
|| passwordFilterList.isEmpty()) { // no selection
- activeTablesSorter.setRowFilter(RowFilter.regexFilter("Nothing", TableTableModel.COLUMN_SKILL));
+ activeTablesSorter.setRowFilter(RowFilter.regexFilter("Nothing", TablesTableModel.COLUMN_SKILL));
} else {
java.util.List> filterList = new ArrayList<>();
@@ -750,7 +952,7 @@ public class TablesPanel extends javax.swing.JPanel {
btnSkillBeginner = new javax.swing.JToggleButton();
btnSkillCasual = new javax.swing.JToggleButton();
btnSkillSerious = new javax.swing.JToggleButton();
- jSeparator5 = new javax.swing.JToolBar.Separator();
+ jSeparator6 = new javax.swing.JToolBar.Separator();
btnRated = new javax.swing.JToggleButton();
btnUnrated = new javax.swing.JToggleButton();
filterBar2 = new javax.swing.JToolBar();
@@ -759,6 +961,7 @@ public class TablesPanel extends javax.swing.JPanel {
btnFormatModern = new javax.swing.JToggleButton();
btnFormatLegacy = new javax.swing.JToggleButton();
btnFormatVintage = new javax.swing.JToggleButton();
+ btnFormatPremodern = new javax.swing.JToggleButton();
jSeparator3 = new javax.swing.JToolBar.Separator();
btnFormatCommander = new javax.swing.JToggleButton();
btnFormatTinyLeader = new javax.swing.JToggleButton();
@@ -773,14 +976,15 @@ public class TablesPanel extends javax.swing.JPanel {
jPanelTables = new javax.swing.JPanel();
jSplitPaneTables = new javax.swing.JSplitPane();
jScrollPaneTablesActive = new javax.swing.JScrollPane();
- tableTables = new javax.swing.JTable();
+ tableTables = new MageTable();
jScrollPaneTablesFinished = new javax.swing.JScrollPane();
tableCompleted = new javax.swing.JTable();
chatPanelMain = new mage.client.table.PlayersChatPanel();
jPanelBottom = new javax.swing.JPanel();
- jButtonFooterNext = new javax.swing.JButton();
- jLabelFooterLabel = new javax.swing.JLabel();
- jLabelFooterText = new javax.swing.JLabel();
+ buttonWhatsNew = new javax.swing.JButton();
+ buttonNextMessage = new javax.swing.JButton();
+ labelMessageHeader = new javax.swing.JLabel();
+ labelMessageText = new javax.swing.JLabel();
setLayout(new java.awt.GridBagLayout());
@@ -790,12 +994,20 @@ public class TablesPanel extends javax.swing.JPanel {
btnNewTable.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/match_new.png"))); // NOI18N
btnNewTable.setToolTipText("Creates a new match table.");
btnNewTable.setMargin(new java.awt.Insets(2, 2, 2, 2));
- btnNewTable.addActionListener(evt -> btnNewTableActionPerformed(evt));
+ btnNewTable.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnNewTableActionPerformed(evt);
+ }
+ });
btnNewTournament.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/tourney_new.png"))); // NOI18N
btnNewTournament.setToolTipText("Creates a new tourney table.");
btnNewTournament.setMargin(new java.awt.Insets(2, 2, 2, 2));
- btnNewTournament.addActionListener(evt -> btnNewTournamentActionPerformed(evt));
+ btnNewTournament.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnNewTournamentActionPerformed(evt);
+ }
+ });
filterBar1.setFloatable(false);
filterBar1.setForeground(new java.awt.Color(102, 102, 255));
@@ -811,7 +1023,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnStateWaiting.setRequestFocusEnabled(false);
btnStateWaiting.setVerifyInputWhenFocusTarget(false);
btnStateWaiting.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnStateWaiting.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnStateWaiting.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar1.add(btnStateWaiting);
btnStateActive.setSelected(true);
@@ -823,7 +1039,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnStateActive.setRequestFocusEnabled(false);
btnStateActive.setVerifyInputWhenFocusTarget(false);
btnStateActive.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnStateActive.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnStateActive.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar1.add(btnStateActive);
btnStateFinished.setSelected(true);
@@ -835,7 +1055,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnStateFinished.setRequestFocusEnabled(false);
btnStateFinished.setVerifyInputWhenFocusTarget(false);
btnStateFinished.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnStateFinished.addActionListener(evt -> btnStateFinishedActionPerformed(evt));
+ btnStateFinished.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnStateFinishedActionPerformed(evt);
+ }
+ });
filterBar1.add(btnStateFinished);
filterBar1.add(jSeparator1);
@@ -849,7 +1073,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnTypeMatch.setRequestFocusEnabled(false);
btnTypeMatch.setVerifyInputWhenFocusTarget(false);
btnTypeMatch.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnTypeMatch.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnTypeMatch.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar1.add(btnTypeMatch);
btnTypeTourneyConstructed.setSelected(true);
@@ -860,7 +1088,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnTypeTourneyConstructed.setFocusable(false);
btnTypeTourneyConstructed.setRequestFocusEnabled(false);
btnTypeTourneyConstructed.setVerifyInputWhenFocusTarget(false);
- btnTypeTourneyConstructed.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnTypeTourneyConstructed.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar1.add(btnTypeTourneyConstructed);
btnTypeTourneyLimited.setSelected(true);
@@ -872,7 +1104,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnTypeTourneyLimited.setMaximumSize(new java.awt.Dimension(72, 20));
btnTypeTourneyLimited.setRequestFocusEnabled(false);
btnTypeTourneyLimited.setVerifyInputWhenFocusTarget(false);
- btnTypeTourneyLimited.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnTypeTourneyLimited.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar1.add(btnTypeTourneyLimited);
filterBar1.add(jSeparator4);
@@ -886,7 +1122,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnSkillBeginner.setRequestFocusEnabled(false);
btnSkillBeginner.setVerifyInputWhenFocusTarget(false);
btnSkillBeginner.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnSkillBeginner.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnSkillBeginner.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar1.add(btnSkillBeginner);
btnSkillCasual.setSelected(true);
@@ -899,7 +1139,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnSkillCasual.setRequestFocusEnabled(false);
btnSkillCasual.setVerifyInputWhenFocusTarget(false);
btnSkillCasual.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnSkillCasual.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnSkillCasual.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar1.add(btnSkillCasual);
btnSkillSerious.setSelected(true);
@@ -912,36 +1156,48 @@ public class TablesPanel extends javax.swing.JPanel {
btnSkillSerious.setRequestFocusEnabled(false);
btnSkillSerious.setVerifyInputWhenFocusTarget(false);
btnSkillSerious.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnSkillSerious.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnSkillSerious.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar1.add(btnSkillSerious);
-
- filterBar1.add(jSeparator4);
+ filterBar1.add(jSeparator6);
btnRated.setSelected(true);
btnRated.setText("Rated");
btnRated.setToolTipText("Shows all rated tables.");
+ btnRated.setActionCommand("typeMatch");
btnRated.setFocusPainted(false);
btnRated.setFocusable(false);
btnRated.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
btnRated.setRequestFocusEnabled(false);
btnRated.setVerifyInputWhenFocusTarget(false);
btnRated.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnRated.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnRated.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnRatedbtnFilterActionPerformed(evt);
+ }
+ });
filterBar1.add(btnRated);
btnUnrated.setSelected(true);
btnUnrated.setText("Unrated");
btnUnrated.setToolTipText("Shows all unrated tables.");
+ btnUnrated.setActionCommand("typeMatch");
btnUnrated.setFocusPainted(false);
btnUnrated.setFocusable(false);
btnUnrated.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
btnUnrated.setRequestFocusEnabled(false);
btnUnrated.setVerifyInputWhenFocusTarget(false);
btnUnrated.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnUnrated.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnUnrated.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnUnratedbtnFilterActionPerformed(evt);
+ }
+ });
filterBar1.add(btnUnrated);
- // second filter line
filterBar2.setFloatable(false);
filterBar2.setFocusable(false);
filterBar2.setOpaque(false);
@@ -955,7 +1211,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnFormatBlock.setRequestFocusEnabled(false);
btnFormatBlock.setVerifyInputWhenFocusTarget(false);
btnFormatBlock.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnFormatBlock.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnFormatBlock.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar2.add(btnFormatBlock);
btnFormatStandard.setSelected(true);
@@ -967,7 +1227,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnFormatStandard.setRequestFocusEnabled(false);
btnFormatStandard.setVerifyInputWhenFocusTarget(false);
btnFormatStandard.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnFormatStandard.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnFormatStandard.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar2.add(btnFormatStandard);
btnFormatModern.setSelected(true);
@@ -977,7 +1241,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnFormatModern.setFocusable(false);
btnFormatModern.setRequestFocusEnabled(false);
btnFormatModern.setVerifyInputWhenFocusTarget(false);
- btnFormatModern.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnFormatModern.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar2.add(btnFormatModern);
btnFormatLegacy.setSelected(true);
@@ -989,7 +1257,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnFormatLegacy.setRequestFocusEnabled(false);
btnFormatLegacy.setVerifyInputWhenFocusTarget(false);
btnFormatLegacy.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnFormatLegacy.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnFormatLegacy.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar2.add(btnFormatLegacy);
btnFormatVintage.setSelected(true);
@@ -1001,8 +1273,28 @@ public class TablesPanel extends javax.swing.JPanel {
btnFormatVintage.setRequestFocusEnabled(false);
btnFormatVintage.setVerifyInputWhenFocusTarget(false);
btnFormatVintage.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnFormatVintage.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnFormatVintage.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFormatVintageActionPerformed(evt);
+ }
+ });
filterBar2.add(btnFormatVintage);
+
+ btnFormatPremodern.setSelected(true);
+ btnFormatPremodern.setText("Premodern");
+ btnFormatPremodern.setToolTipText("Premodern format.");
+ btnFormatPremodern.setFocusPainted(false);
+ btnFormatPremodern.setFocusable(false);
+ btnFormatPremodern.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ btnFormatPremodern.setRequestFocusEnabled(false);
+ btnFormatPremodern.setVerifyInputWhenFocusTarget(false);
+ btnFormatPremodern.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+ btnFormatPremodern.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFormatPremodernActionPerformed(evt);
+ }
+ });
+ filterBar2.add(btnFormatPremodern);
filterBar2.add(jSeparator3);
btnFormatCommander.setSelected(true);
@@ -1014,7 +1306,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnFormatCommander.setRequestFocusEnabled(false);
btnFormatCommander.setVerifyInputWhenFocusTarget(false);
btnFormatCommander.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnFormatCommander.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnFormatCommander.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar2.add(btnFormatCommander);
btnFormatTinyLeader.setSelected(true);
@@ -1024,7 +1320,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnFormatTinyLeader.setFocusable(false);
btnFormatTinyLeader.setRequestFocusEnabled(false);
btnFormatTinyLeader.setVerifyInputWhenFocusTarget(false);
- btnFormatTinyLeader.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnFormatTinyLeader.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar2.add(btnFormatTinyLeader);
filterBar2.add(jSeparator2);
@@ -1037,7 +1337,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnFormatLimited.setRequestFocusEnabled(false);
btnFormatLimited.setVerifyInputWhenFocusTarget(false);
btnFormatLimited.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnFormatLimited.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnFormatLimited.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar2.add(btnFormatLimited);
btnFormatOther.setSelected(true);
@@ -1047,7 +1351,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnFormatOther.setFocusable(false);
btnFormatOther.setRequestFocusEnabled(false);
btnFormatOther.setVerifyInputWhenFocusTarget(false);
- btnFormatOther.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnFormatOther.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar2.add(btnFormatOther);
filterBar2.add(jSeparator5);
@@ -1060,7 +1368,11 @@ public class TablesPanel extends javax.swing.JPanel {
btnOpen.setRequestFocusEnabled(false);
btnOpen.setVerifyInputWhenFocusTarget(false);
btnOpen.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnOpen.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnOpen.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar2.add(btnOpen);
btnPassword.setSelected(true);
@@ -1072,47 +1384,55 @@ public class TablesPanel extends javax.swing.JPanel {
btnPassword.setRequestFocusEnabled(false);
btnPassword.setVerifyInputWhenFocusTarget(false);
btnPassword.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnPassword.addActionListener(evt -> btnFilterActionPerformed(evt));
+ btnPassword.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnFilterActionPerformed(evt);
+ }
+ });
filterBar2.add(btnPassword);
btnQuickStart.setText("Quick Start");
btnQuickStart.setFocusable(false);
btnQuickStart.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
btnQuickStart.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- btnQuickStart.addActionListener(evt -> btnQuickStartActionPerformed(evt));
+ btnQuickStart.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnQuickStartActionPerformed(evt);
+ }
+ });
javax.swing.GroupLayout jPanelTopLayout = new javax.swing.GroupLayout(jPanelTop);
jPanelTop.setLayout(jPanelTopLayout);
jPanelTopLayout.setHorizontalGroup(
- jPanelTopLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanelTopLayout.createSequentialGroup()
- .addContainerGap()
- .addComponent(btnNewTable)
- .addGap(6, 6, 6)
- .addComponent(btnNewTournament)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(jPanelTopLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(filterBar1, javax.swing.GroupLayout.DEFAULT_SIZE, 491, Short.MAX_VALUE)
- .addComponent(filterBar2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(btnQuickStart)
- .addContainerGap(835, Short.MAX_VALUE))
+ jPanelTopLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanelTopLayout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(btnNewTable)
+ .addGap(6, 6, 6)
+ .addComponent(btnNewTournament)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanelTopLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(filterBar1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(filterBar2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(btnQuickStart)
+ .addContainerGap(792, Short.MAX_VALUE))
);
jPanelTopLayout.setVerticalGroup(
- jPanelTopLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanelTopLayout.createSequentialGroup()
- .addContainerGap()
- .addGroup(jPanelTopLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(jPanelTopLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(btnNewTable)
- .addComponent(btnNewTournament))
- .addGroup(jPanelTopLayout.createSequentialGroup()
- .addGroup(jPanelTopLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(filterBar1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(btnQuickStart))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(filterBar2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
- .addContainerGap())
+ jPanelTopLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanelTopLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(jPanelTopLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanelTopLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(btnNewTable)
+ .addComponent(btnNewTournament))
+ .addGroup(jPanelTopLayout.createSequentialGroup()
+ .addGroup(jPanelTopLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(filterBar1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(btnQuickStart))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(filterBar2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ .addContainerGap())
);
gridBagConstraints = new java.awt.GridBagConstraints();
@@ -1149,12 +1469,12 @@ public class TablesPanel extends javax.swing.JPanel {
javax.swing.GroupLayout jPanelTablesLayout = new javax.swing.GroupLayout(jPanelTables);
jPanelTables.setLayout(jPanelTablesLayout);
jPanelTablesLayout.setHorizontalGroup(
- jPanelTablesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jSplitPaneTables, javax.swing.GroupLayout.PREFERRED_SIZE, 23, Short.MAX_VALUE)
+ jPanelTablesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jSplitPaneTables, javax.swing.GroupLayout.DEFAULT_SIZE, 23, Short.MAX_VALUE)
);
jPanelTablesLayout.setVerticalGroup(
- jPanelTablesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jSplitPaneTables, javax.swing.GroupLayout.DEFAULT_SIZE, 672, Short.MAX_VALUE)
+ jPanelTablesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jSplitPaneTables, javax.swing.GroupLayout.DEFAULT_SIZE, 672, Short.MAX_VALUE)
);
jSplitPane1.setLeftComponent(jPanelTables);
@@ -1172,22 +1492,37 @@ public class TablesPanel extends javax.swing.JPanel {
jPanelBottom.setPreferredSize(new java.awt.Dimension(516, 37));
jPanelBottom.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.LEFT));
- jButtonFooterNext.setText("Next");
- jButtonFooterNext.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
- jButtonFooterNext.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
- jButtonFooterNext.setOpaque(false);
- jButtonFooterNext.addActionListener(evt -> jButtonFooterNextActionPerformed(evt));
- jPanelBottom.add(jButtonFooterNext);
+ buttonWhatsNew.setText("Show that's new");
+ buttonWhatsNew.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
+ buttonWhatsNew.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonWhatsNew.setOpaque(false);
+ buttonWhatsNew.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonWhatsNewActionPerformed(evt);
+ }
+ });
+ jPanelBottom.add(buttonWhatsNew);
- jLabelFooterLabel.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N
- jLabelFooterLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
- jLabelFooterLabel.setText("Message of the Day:");
- jLabelFooterLabel.setAlignmentY(0.3F);
- jPanelBottom.add(jLabelFooterLabel);
+ buttonNextMessage.setText("Next message");
+ buttonNextMessage.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
+ buttonNextMessage.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonNextMessage.setOpaque(false);
+ buttonNextMessage.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonNextMessageActionPerformed(evt);
+ }
+ });
+ jPanelBottom.add(buttonNextMessage);
- jLabelFooterText.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
- jLabelFooterText.setText("You are playing Mage version 0.7.5. Welcome! -- Mage dev team --");
- jPanelBottom.add(jLabelFooterText);
+ labelMessageHeader.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N
+ labelMessageHeader.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
+ labelMessageHeader.setText("Message of the Day:");
+ labelMessageHeader.setAlignmentY(0.3F);
+ jPanelBottom.add(labelMessageHeader);
+
+ labelMessageText.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
+ labelMessageText.setText("You are playing Mage version 0.7.5. Welcome! -- Mage dev team --");
+ jPanelBottom.add(labelMessageText);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridy = 2;
@@ -1196,11 +1531,11 @@ public class TablesPanel extends javax.swing.JPanel {
add(jPanelBottom, gridBagConstraints);
}// //GEN-END:initComponents
- private void btnNewTournamentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnNewTournamentActionPerformed
+ private void btnNewTournamentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnNewTournamentActionPerformed
newTournamentDialog.showDialog(roomId);
-}//GEN-LAST:event_btnNewTournamentActionPerformed
+ }//GEN-LAST:event_btnNewTournamentActionPerformed
- private void btnQuickStartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnQuickStartActionPerformed
+ private void btnQuickStartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnQuickStartActionPerformed
TableView table;
try {
File f = new File("test.dck");
@@ -1221,23 +1556,24 @@ public class TablesPanel extends javax.swing.JPanel {
options.setSkillLevel(SkillLevel.CASUAL);
options.setRollbackTurnsAllowed(true);
options.setQuitRatio(100);
+ options.setMinimumRating(0);
String serverAddress = SessionHandler.getSession().getServerHostname().orElseGet(() -> "");
options.setBannedUsers(IgnoreList.ignoreList(serverAddress));
table = SessionHandler.createTable(roomId, options);
- SessionHandler.joinTable(roomId, table.getTableId(), "Human", PlayerType.HUMAN, 1, DeckImporterUtil.importDeck("test.dck"), "");
- SessionHandler.joinTable(roomId, table.getTableId(), "Computer", PlayerType.COMPUTER_MAD, 5, DeckImporterUtil.importDeck("test.dck"), "");
+ SessionHandler.joinTable(roomId, table.getTableId(), "Human", PlayerType.HUMAN, 1, DeckImporter.importDeckFromFile("test.dck"), "");
+ SessionHandler.joinTable(roomId, table.getTableId(), "Computer", PlayerType.COMPUTER_MAD, 5, DeckImporter.importDeckFromFile("test.dck"), "");
SessionHandler.startMatch(roomId, table.getTableId());
} catch (HeadlessException ex) {
handleError(ex);
}
-}//GEN-LAST:event_btnQuickStartActionPerformed
+ }//GEN-LAST:event_btnQuickStartActionPerformed
private void btnNewTableActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnNewTableActionPerformed
newTableDialog.showDialog(roomId);
}//GEN-LAST:event_btnNewTableActionPerformed
- private void jButtonFooterNextActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonFooterNextActionPerformed
+ private void buttonNextMessageActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonNextMessageActionPerformed
synchronized (this) {
if (messages != null && !messages.isEmpty()) {
currentMessage++;
@@ -1245,11 +1581,11 @@ public class TablesPanel extends javax.swing.JPanel {
currentMessage = 0;
}
- URLHandler.RemoveMouseAdapter(jLabelFooterText);
- URLHandler.handleMessage(messages.get(currentMessage), this.jLabelFooterText);
+ URLHandler.RemoveMouseAdapter(labelMessageText);
+ URLHandler.handleMessage(messages.get(currentMessage), this.labelMessageText);
}
}
- }//GEN-LAST:event_jButtonFooterNextActionPerformed
+ }//GEN-LAST:event_buttonNextMessageActionPerformed
private void btnFilterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnFilterActionPerformed
setTableFilter();
@@ -1261,9 +1597,29 @@ public class TablesPanel extends javax.swing.JPanel {
} else {
this.jSplitPaneTables.setDividerLocation(this.jPanelTables.getHeight());
}
- this.startTasks();
+ this.startUpdateTasks(true);
}//GEN-LAST:event_btnStateFinishedActionPerformed
+ private void btnRatedbtnFilterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRatedbtnFilterActionPerformed
+ setTableFilter();
+ }//GEN-LAST:event_btnRatedbtnFilterActionPerformed
+
+ private void btnUnratedbtnFilterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnUnratedbtnFilterActionPerformed
+ setTableFilter();
+ }//GEN-LAST:event_btnUnratedbtnFilterActionPerformed
+
+ private void btnFormatPremodernActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnFormatPremodernActionPerformed
+ setTableFilter();
+ }//GEN-LAST:event_btnFormatPremodernActionPerformed
+
+ private void btnFormatVintageActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnFormatVintageActionPerformed
+ setTableFilter();
+ }//GEN-LAST:event_btnFormatVintageActionPerformed
+
+ private void buttonWhatsNewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonWhatsNewActionPerformed
+ MageFrame.getInstance().showWhatsNewDialog(true);
+ }//GEN-LAST:event_buttonWhatsNewActionPerformed
+
private void handleError(Exception ex) {
LOGGER.fatal("Error loading deck: ", ex);
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Error loading deck.", "Error", JOptionPane.ERROR_MESSAGE);
@@ -1276,6 +1632,7 @@ public class TablesPanel extends javax.swing.JPanel {
private javax.swing.JToggleButton btnFormatLimited;
private javax.swing.JToggleButton btnFormatModern;
private javax.swing.JToggleButton btnFormatOther;
+ private javax.swing.JToggleButton btnFormatPremodern;
private javax.swing.JToggleButton btnFormatStandard;
private javax.swing.JToggleButton btnFormatTinyLeader;
private javax.swing.JToggleButton btnFormatVintage;
@@ -1284,23 +1641,22 @@ public class TablesPanel extends javax.swing.JPanel {
private javax.swing.JToggleButton btnOpen;
private javax.swing.JToggleButton btnPassword;
private javax.swing.JButton btnQuickStart;
+ private javax.swing.JToggleButton btnRated;
private javax.swing.JToggleButton btnSkillBeginner;
private javax.swing.JToggleButton btnSkillCasual;
private javax.swing.JToggleButton btnSkillSerious;
- private javax.swing.JToggleButton btnRated;
- private javax.swing.JToggleButton btnUnrated;
private javax.swing.JToggleButton btnStateActive;
private javax.swing.JToggleButton btnStateFinished;
private javax.swing.JToggleButton btnStateWaiting;
private javax.swing.JToggleButton btnTypeMatch;
private javax.swing.JToggleButton btnTypeTourneyConstructed;
private javax.swing.JToggleButton btnTypeTourneyLimited;
+ private javax.swing.JToggleButton btnUnrated;
+ private javax.swing.JButton buttonNextMessage;
+ private javax.swing.JButton buttonWhatsNew;
private mage.client.table.PlayersChatPanel chatPanelMain;
private javax.swing.JToolBar filterBar1;
private javax.swing.JToolBar filterBar2;
- private javax.swing.JButton jButtonFooterNext;
- private javax.swing.JLabel jLabelFooterLabel;
- private javax.swing.JLabel jLabelFooterText;
private javax.swing.JPanel jPanelBottom;
private javax.swing.JPanel jPanelTables;
private javax.swing.JPanel jPanelTop;
@@ -1311,163 +1667,22 @@ public class TablesPanel extends javax.swing.JPanel {
private javax.swing.JToolBar.Separator jSeparator3;
private javax.swing.JToolBar.Separator jSeparator4;
private javax.swing.JToolBar.Separator jSeparator5;
+ private javax.swing.JToolBar.Separator jSeparator6;
private javax.swing.JSplitPane jSplitPane1;
private javax.swing.JSplitPane jSplitPaneTables;
+ private javax.swing.JLabel labelMessageHeader;
+ private javax.swing.JLabel labelMessageText;
private javax.swing.JTable tableCompleted;
private javax.swing.JTable tableTables;
// End of variables declaration//GEN-END:variables
}
-class TableTableModel extends AbstractTableModel {
-
- final ImageIcon tourneyIcon = new javax.swing.ImageIcon(getClass().getResource("/tables/tourney_icon.png"));
- final ImageIcon matchIcon = new javax.swing.ImageIcon(getClass().getResource("/tables/match_icon.png"));
-
- public static final int COLUMN_ICON = 0;
- public static final int COLUMN_DECK_TYPE = 1; // column the deck type is located (starting with 0) Start string is used to check for Limited
- public static final int COLUMN_OWNER = 2;
- public static final int COLUMN_GAME_TYPE = 3;
- public static final int COLUMN_INFO = 4;
- public static final int COLUMN_STATUS = 5;
- public static final int COLUMN_PASSWORD = 6;
- public static final int COLUMN_CREATED = 7;
- public static final int COLUMN_SKILL = 8;
- public static final int COLUMN_RATING = 9;
- public static final int COLUMN_QUIT_RATIO = 10;
- public static final int ACTION_COLUMN = 11; // column the action is located (starting with 0)
-
- public static final String RATED_VALUE_YES = "YES";
- public static final String RATED_VALUE_NO = "";
-
- public static final String PASSWORD_VALUE_YES = "YES";
-
- private final String[] columnNames = new String[]{"M/T", "Deck Type", "Owner / Players", "Game Type", "Info", "Status", "Password", "Created / Started", "Skill Level", "Rating", "Quit %", "Action"};
-
- private TableView[] tables = new TableView[0];
-
- TableTableModel() {
- }
-
- public void loadData(Collection tables) throws MageRemoteException {
- this.tables = tables.toArray(new TableView[0]);
- this.fireTableDataChanged();
- }
-
- @Override
- public int getRowCount() {
- return tables.length;
- }
-
- @Override
- public int getColumnCount() {
- return columnNames.length;
- }
-
- @Override
- public Object getValueAt(int arg0, int arg1) {
- switch (arg1) {
- case 0:
- return tables[arg0].isTournament() ? tourneyIcon : matchIcon;
- case 1:
- return tables[arg0].getDeckType();
- case 2:
- return tables[arg0].getControllerName();
- case 3:
- return tables[arg0].getGameType();
- case 4:
- return tables[arg0].getAdditionalInfo();
- case 5:
- return tables[arg0].getTableStateText();
- case 6:
- return tables[arg0].isPassworded() ? PASSWORD_VALUE_YES : "";
- case 7:
- return tables[arg0].getCreateTime(); // use cell render, not format here
- case 8:
- return tables[arg0].getSkillLevel();
- case 9:
- return tables[arg0].isRated() ? RATED_VALUE_YES : RATED_VALUE_NO;
- case 10:
- return tables[arg0].getQuitRatio();
- case 11:
- switch (tables[arg0].getTableState()) {
-
- case WAITING:
- String owner = tables[arg0].getControllerName();
- if (SessionHandler.getSession() != null && owner.equals(SessionHandler.getUserName())) {
- return "";
- }
- return "Join";
- case CONSTRUCTING:
- case DRAFTING:
- if (tables[arg0].isTournament()) {
- return "Show";
- }
- case DUELING:
- if (tables[arg0].isTournament()) {
- return "Show";
- } else {
- owner = tables[arg0].getControllerName();
- if (SessionHandler.getSession() != null && owner.equals(SessionHandler.getUserName())) {
- return "";
- }
- if (tables[arg0].getSpectatorsAllowed()) {
- return "Watch";
- }
- return "";
- }
- default:
- return "";
- }
- case 12:
- return tables[arg0].isTournament();
- case 13:
- if (!tables[arg0].getGames().isEmpty()) {
- return tables[arg0].getGames().get(0);
- }
- return null;
- case 14:
- return tables[arg0].getTableId();
- }
- return "";
- }
-
- @Override
- public String getColumnName(int columnIndex) {
- String colName = "";
-
- if (columnIndex <= getColumnCount()) {
- colName = columnNames[columnIndex];
- }
-
- return colName;
- }
-
- @Override
- public Class getColumnClass(int columnIndex) {
- switch (columnIndex) {
- case COLUMN_ICON:
- return Icon.class;
- case COLUMN_SKILL:
- return SkillLevel.class;
- case COLUMN_CREATED:
- return Date.class;
- default:
- return String.class;
- }
- }
-
- @Override
- public boolean isCellEditable(int rowIndex, int columnIndex) {
- return columnIndex == ACTION_COLUMN;
- }
-
-}
-
class UpdateTablesTask extends SwingWorker> {
private final UUID roomId;
private final TablesPanel panel;
+ private boolean isFirstRun = true;
private static final Logger logger = Logger.getLogger(UpdateTablesTask.class);
@@ -1486,7 +1701,7 @@ class UpdateTablesTask extends SwingWorker> {
if (tables != null) {
this.publish(tables);
}
- TimeUnit.SECONDS.sleep(3);
+ TimeUnit.SECONDS.sleep(TablesPanel.randomizeTimout(TablesPanel.REFRESH_ACTIVE_TABLES_SECS));
}
return null;
}
@@ -1494,10 +1709,13 @@ class UpdateTablesTask extends SwingWorker> {
@Override
protected void process(java.util.List> view) {
panel.updateTables(view.get(0));
+
+ // update server messages
count++;
- if (count > 60) {
+ if (isFirstRun || count > 60) {
count = 0;
- panel.reloadMessages();
+ isFirstRun = false;
+ panel.reloadServerMessages();
}
}
@@ -1530,7 +1748,7 @@ class UpdatePlayersTask extends SwingWorker> {
protected Void doInBackground() throws Exception {
while (!isCancelled()) {
this.publish(SessionHandler.getRoomUsers(roomId));
- TimeUnit.SECONDS.sleep(3);
+ TimeUnit.SECONDS.sleep(TablesPanel.randomizeTimout(TablesPanel.REFRESH_PLAYERS_SECS));
}
return null;
}
@@ -1552,119 +1770,6 @@ class UpdatePlayersTask extends SwingWorker> {
}
-class MatchesTableModel extends AbstractTableModel {
-
- private final String[] columnNames = new String[]{"Deck Type", "Players", "Game Type", "Rating", "Result", "Duration", "Start Time", "End Time", "Action"};
- public static final int COLUMN_DURATION = 5;
- public static final int COLUMN_START = 6;
- public static final int COLUMN_END = 7;
- public static final int COLUMN_ACTION = 8; // column the action is located (starting with 0)
-
- private MatchView[] matches = new MatchView[0];
-
- public void loadData(Collection matches) throws MageRemoteException {
- this.matches = matches.toArray(new MatchView[0]);
- this.fireTableDataChanged();
- }
-
- MatchesTableModel() {
- }
-
- @Override
- public int getRowCount() {
- return matches.length;
- }
-
- @Override
- public int getColumnCount() {
- return columnNames.length;
- }
-
- @Override
- public Object getValueAt(int arg0, int arg1) {
- switch (arg1) {
- case 0:
- return matches[arg0].getDeckType();
- case 1:
- return matches[arg0].getPlayers();
- case 2:
- return matches[arg0].getGameType();
- case 3:
- return matches[arg0].isRated() ? TableTableModel.RATED_VALUE_YES : TableTableModel.RATED_VALUE_NO;
- case 4:
- return matches[arg0].getResult();
- case 5:
- if (matches[arg0].getEndTime() != null) {
- return matches[arg0].getEndTime().getTime() - matches[arg0].getStartTime().getTime() + new Date().getTime();
- } else {
- return 0L;
- }
- case 6:
- return matches[arg0].getStartTime();
- case 7:
- return matches[arg0].getEndTime();
- case 8:
- if (matches[arg0].isTournament()) {
- return "Show";
- } else if (matches[arg0].isReplayAvailable()) {
- return "Replay";
- } else {
- return "None";
- }
- case 9:
- return matches[arg0].getGames();
- }
- return "";
- }
-
- public java.util.List getListofGames(int row) {
- return matches[row].getGames();
- }
-
- public boolean isTournament(int row) {
- return matches[row].isTournament();
- }
-
- public UUID getMatchId(int row) {
- return matches[row].getMatchId();
- }
-
- public UUID getTableId(int row) {
- return matches[row].getTableId();
- }
-
- @Override
- public String getColumnName(int columnIndex) {
- String colName = "";
-
- if (columnIndex <= getColumnCount()) {
- colName = columnNames[columnIndex];
- }
-
- return colName;
- }
-
- @Override
- public Class getColumnClass(int columnIndex) {
- switch (columnIndex) {
- case COLUMN_DURATION:
- return Long.class;
- case COLUMN_START:
- return Date.class;
- case COLUMN_END:
- return Date.class;
- default:
- return String.class;
- }
- }
-
- @Override
- public boolean isCellEditable(int rowIndex, int columnIndex) {
- return columnIndex == COLUMN_ACTION;
- }
-
-}
-
class UpdateMatchesTask extends SwingWorker> {
private final UUID roomId;
@@ -1680,11 +1785,8 @@ class UpdateMatchesTask extends SwingWorker> {
@Override
protected Void doInBackground() throws Exception {
while (!isCancelled()) {
- Collection matches = SessionHandler.getFinishedMatches(roomId);
- if (!matches.isEmpty()) {
- this.publish(matches);
- }
- TimeUnit.SECONDS.sleep(10);
+ this.publish(SessionHandler.getFinishedMatches(roomId));
+ TimeUnit.SECONDS.sleep(TablesPanel.randomizeTimout(TablesPanel.REFRESH_FINISHED_TABLES_SECS));
}
return null;
}
@@ -1740,5 +1842,4 @@ class GameChooser extends JPopupMenu {
}
}
-
}
diff --git a/Mage.Client/src/main/java/mage/client/table/TablesTableModel.java b/Mage.Client/src/main/java/mage/client/table/TablesTableModel.java
new file mode 100644
index 0000000000..1348887d81
--- /dev/null
+++ b/Mage.Client/src/main/java/mage/client/table/TablesTableModel.java
@@ -0,0 +1,223 @@
+package mage.client.table;
+
+import mage.client.SessionHandler;
+import mage.constants.SkillLevel;
+import mage.remote.MageRemoteException;
+import mage.view.TableView;
+
+import javax.swing.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Collection;
+import java.util.Date;
+
+public class TablesTableModel extends AbstractTableModel {
+
+ // icons with tostring for tables hints
+ final ImageIcon tourneyIcon = new ImageIcon(getClass().getResource("/tables/tourney_icon.png")) {
+ @Override
+ public String toString() {
+ return "Tourney";
+ }
+ };
+ final ImageIcon matchIcon = new ImageIcon(getClass().getResource("/tables/match_icon.png")) {
+ @Override
+ public String toString() {
+ return "Match";
+ }
+ };
+
+ public static final int COLUMN_ICON = 0;
+ public static final int COLUMN_DECK_TYPE = 1; // column the deck type is located (starting with 0) Start string is used to check for Limited
+ public static final int COLUMN_NAME = 2;
+ public static final int COLUMN_SEATS = 3;
+ public static final int COLUMN_OWNER = 4;
+ public static final int COLUMN_GAME_TYPE = 5;
+ public static final int COLUMN_INFO = 6;
+ public static final int COLUMN_STATUS = 7;
+ public static final int COLUMN_PASSWORD = 8;
+ public static final int COLUMN_CREATED = 9;
+ public static final int COLUMN_SKILL = 10;
+ public static final int COLUMN_RATING = 11;
+ public static final int COLUMN_QUIT_RATIO = 12;
+ public static final int COLUMN_MINIMUM_RATING = 13;
+ public static final int ACTION_COLUMN = 14; // column the action is located (starting with 0)
+
+ public static final String RATED_VALUE_YES = "YES";
+ public static final String RATED_VALUE_NO = "";
+
+ public static final String PASSWORD_VALUE_YES = "YES";
+
+ private final String[] columnNames = new String[]{"M/T", "Deck Type", "Name", "Seats", "Owner / Players", "Game Type", "Info", "Status", "Password", "Created / Started", "Skill Level", "Rated", "Quit %", "Min Rating", "Action"};
+
+ private TableView[] tables = new TableView[0];
+
+ TablesTableModel() {
+ }
+
+ public void loadData(Collection tables) throws MageRemoteException {
+ this.tables = tables.toArray(new TableView[0]);
+ this.fireTableDataChanged();
+ }
+
+ public String getTableAndGameInfo(int row) {
+ return this.tables[row].getTableId().toString() + ";" + (!tables[row].getGames().isEmpty() ? tables[row].getGames().get(0).toString() : "null");
+ }
+
+ public String findTableAndGameInfoByRow(int row) {
+ if (row >= 0 && row < this.tables.length) {
+ return getTableAndGameInfo(row);
+ } else {
+ return null;
+ }
+ }
+
+ public int findRowByTableAndGameInfo(String tableAndGame) {
+ for (int i = 0; i < this.tables.length; i++) {
+ String rowID = this.tables[i].getTableId().toString() + ";" + (!this.tables[i].getGames().isEmpty() ? this.tables[i].getGames().get(0).toString() : "null");
+ if (tableAndGame.equals(rowID)) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ public String getSkillLevelAsCode(SkillLevel skill, boolean asRegExp) {
+ String res;
+ switch (skill) {
+ case BEGINNER:
+ res = "*";
+ break;
+ case CASUAL:
+ res = "**";
+ break;
+ case SERIOUS:
+ res = "***";
+ break;
+ default:
+ res = "";
+ break;
+ }
+
+ // regexp format for search table rows
+ if (asRegExp) {
+ res = String.format("^%s$", res.replace("*", "\\*"));
+ }
+
+ return res;
+ }
+
+ @Override
+ public int getRowCount() {
+ return tables.length;
+ }
+
+ @Override
+ public int getColumnCount() {
+ return columnNames.length;
+ }
+
+ @Override
+ public Object getValueAt(int rowIndex, int columnIndex) {
+ switch (columnIndex) {
+ case 0:
+ return tables[rowIndex].isTournament() ? tourneyIcon : matchIcon;
+ case 1:
+ return tables[rowIndex].getDeckType();
+ case 2:
+ return tables[rowIndex].getTableName();
+ case 3:
+ return tables[rowIndex].getSeatsInfo();
+ case 4:
+ return tables[rowIndex].getControllerName();
+ case 5:
+ return tables[rowIndex].getGameType();
+ case 6:
+ return tables[rowIndex].getAdditionalInfo();
+ case 7:
+ return tables[rowIndex].getTableStateText();
+ case 8:
+ return tables[rowIndex].isPassworded() ? PASSWORD_VALUE_YES : "";
+ case 9:
+ return tables[rowIndex].getCreateTime(); // use cell render, not format here
+ case 10:
+ return this.getSkillLevelAsCode(tables[rowIndex].getSkillLevel(), false);
+ case 11:
+ return tables[rowIndex].isRated() ? RATED_VALUE_YES : RATED_VALUE_NO;
+ case 12:
+ return tables[rowIndex].getQuitRatio();
+ case 13:
+ return tables[rowIndex].getMinimumRating();
+ case 14:
+ switch (tables[rowIndex].getTableState()) {
+
+ case WAITING:
+ String owner = tables[rowIndex].getControllerName();
+ if (SessionHandler.getSession() != null && owner.equals(SessionHandler.getUserName())) {
+ return "";
+ }
+ return "Join";
+ case CONSTRUCTING:
+ case DRAFTING:
+ if (tables[rowIndex].isTournament()) {
+ return "Show";
+ }
+ case DUELING:
+ if (tables[rowIndex].isTournament()) {
+ return "Show";
+ } else {
+ owner = tables[rowIndex].getControllerName();
+ if (SessionHandler.getSession() != null && owner.equals(SessionHandler.getUserName())) {
+ return "";
+ }
+ if (tables[rowIndex].getSpectatorsAllowed()) {
+ return "Watch";
+ }
+ return "";
+ }
+ default:
+ return "";
+ }
+ case 15:
+ return tables[rowIndex].isTournament();
+ case 16:
+ if (!tables[rowIndex].getGames().isEmpty()) {
+ return tables[rowIndex].getGames().get(0);
+ }
+ return null;
+ case 17:
+ return tables[rowIndex].getTableId();
+ }
+ return "";
+ }
+
+ @Override
+ public String getColumnName(int columnIndex) {
+ String colName = "";
+
+ if (columnIndex <= getColumnCount()) {
+ colName = columnNames[columnIndex];
+ }
+
+ return colName;
+ }
+
+ @Override
+ public Class getColumnClass(int columnIndex) {
+ switch (columnIndex) {
+ case COLUMN_ICON:
+ return Icon.class;
+ case COLUMN_SKILL:
+ return SkillLevel.class;
+ case COLUMN_CREATED:
+ return Date.class;
+ default:
+ return String.class;
+ }
+ }
+
+ @Override
+ public boolean isCellEditable(int rowIndex, int columnIndex) {
+ return columnIndex == ACTION_COLUMN;
+ }
+
+}
diff --git a/Mage.Client/src/main/java/mage/client/table/TablesUtil.java b/Mage.Client/src/main/java/mage/client/table/TablesUtil.java
new file mode 100644
index 0000000000..6fd2b8445e
--- /dev/null
+++ b/Mage.Client/src/main/java/mage/client/table/TablesUtil.java
@@ -0,0 +1,63 @@
+package mage.client.table;
+
+import org.apache.log4j.Logger;
+
+import javax.swing.*;
+
+/**
+ * @author JayDi85
+ */
+public class TablesUtil {
+
+ private static final Logger logger = Logger.getLogger(TablesUtil.class);
+
+ public static String getSearchIdFromTable(JTable table, int row) {
+ // tableUUID;gameUUID
+ String searchId = null;
+ if (table.getModel() instanceof TablesTableModel) {
+ searchId = ((TablesTableModel) table.getModel()).findTableAndGameInfoByRow(row);
+ } else if (table.getModel() instanceof MatchesTableModel) {
+ searchId = ((MatchesTableModel) table.getModel()).findTableAndGameInfoByRow(row);
+ } else if (table.getModel() instanceof TournamentMatchesTableModel) {
+ searchId = ((TournamentMatchesTableModel) table.getModel()).findTableAndGameInfoByRow(row);
+ } else {
+ logger.error("Not supported tables model " + table.getModel().getClass().toString());
+ }
+ return searchId;
+ }
+
+ public static int findTableRowFromSearchId(Object tableModel, String searchId) {
+ // tableUUID;gameUUID
+ int row = -1;
+ if (searchId != null) {
+ if (tableModel instanceof TablesTableModel) {
+ row = ((TablesTableModel) tableModel).findRowByTableAndGameInfo(searchId);
+ } else if (tableModel instanceof MatchesTableModel) {
+ row = ((MatchesTableModel) tableModel).findRowByTableAndGameInfo(searchId);
+ } else if (tableModel instanceof TournamentMatchesTableModel) {
+ row = ((TournamentMatchesTableModel) tableModel).findRowByTableAndGameInfo(searchId);
+ } else {
+ logger.error("Not supported tables model " + tableModel.getClass().toString());
+ }
+ }
+ return row;
+ }
+
+ public static int getSelectedModelRow(JTable table) {
+ return getModelRowFromView(table, table.getSelectedRow());
+ }
+
+ public static int getModelRowFromView(JTable table, int viewRow) {
+ if (viewRow != -1 && viewRow < table.getModel().getRowCount()) {
+ return table.convertRowIndexToModel(viewRow);
+ }
+ return -1;
+ }
+
+ public static int getViewRowFromModel(JTable table, int modelRow) {
+ if (modelRow != -1 && modelRow < table.getModel().getRowCount()) {
+ return table.convertRowIndexToView(modelRow);
+ }
+ return -1;
+ }
+}
diff --git a/Mage.Client/src/main/java/mage/client/table/TournamentMatchesTableModel.java b/Mage.Client/src/main/java/mage/client/table/TournamentMatchesTableModel.java
new file mode 100644
index 0000000000..288a5c70f7
--- /dev/null
+++ b/Mage.Client/src/main/java/mage/client/table/TournamentMatchesTableModel.java
@@ -0,0 +1,116 @@
+package mage.client.table;
+
+import mage.view.RoundView;
+import mage.view.TournamentGameView;
+import mage.view.TournamentView;
+
+import javax.swing.table.AbstractTableModel;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author JayDi85
+ */
+public class TournamentMatchesTableModel extends AbstractTableModel {
+ public static final int ACTION_COLUMN = 4; // column the action is located
+
+ private final String[] columnNames = new String[]{"Round Number", "Players", "State", "Result", "Action"};
+ private TournamentGameView[] games = new TournamentGameView[0];
+ private boolean watchingAllowed;
+
+ public void loadData(TournamentView tournament) {
+ List views = new ArrayList<>();
+ watchingAllowed = tournament.isWatchingAllowed();
+ for (RoundView round : tournament.getRounds()) {
+ for (TournamentGameView game : round.getGames()) {
+ views.add(game);
+ }
+ }
+ games = views.toArray(new TournamentGameView[0]);
+ this.fireTableDataChanged();
+ }
+
+ public String getTableAndGameInfo(int row) {
+ return this.games[row].getTableId().toString() + ";" + games[row].toString();
+ }
+
+ public String findTableAndGameInfoByRow(int row) {
+ if (row >= 0 && row < this.games.length) {
+ return getTableAndGameInfo(row);
+ } else {
+ return null;
+ }
+ }
+
+ public int findRowByTableAndGameInfo(String tableAndGame) {
+ for (int i = 0; i < this.games.length; i++) {
+ String rowID = this.games[i].getTableId().toString() + ";" + this.games[i].toString();
+ if (tableAndGame.equals(rowID)) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ @Override
+ public int getRowCount() {
+ return games.length;
+ }
+
+ @Override
+ public int getColumnCount() {
+ return columnNames.length;
+ }
+
+ @Override
+ public Object getValueAt(int arg0, int arg1) {
+ switch (arg1) {
+ case 0:
+ return Integer.toString(games[arg0].getRoundNum());
+ case 1:
+ return games[arg0].getPlayers();
+ case 2:
+ return games[arg0].getState();
+ case 3:
+ return games[arg0].getResult();
+ case 4:
+// if (games[arg0].getState().equals("Finished")) {
+// return "Replay";
+// }
+ if (watchingAllowed && games[arg0].getState().startsWith("Dueling")) {
+ return "Watch";
+ }
+ return "";
+ case 5:
+ return games[arg0].getTableId().toString();
+ case 6:
+ return games[arg0].getMatchId().toString();
+ case 7:
+ return games[arg0].getGameId().toString();
+
+ }
+ return "";
+ }
+
+ @Override
+ public String getColumnName(int columnIndex) {
+ String colName = "";
+
+ if (columnIndex <= getColumnCount()) {
+ colName = columnNames[columnIndex];
+ }
+
+ return colName;
+ }
+
+ @Override
+ public Class getColumnClass(int columnIndex) {
+ return String.class;
+ }
+
+ @Override
+ public boolean isCellEditable(int rowIndex, int columnIndex) {
+ return columnIndex == ACTION_COLUMN;
+ }
+
+}
\ No newline at end of file
diff --git a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java
index 3965214f35..19eeb84fdb 100644
--- a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java
+++ b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java
@@ -1,52 +1,37 @@
-
-
- /*
- * TournamentPanel.java
- *
- * Created on 20-Jan-2011, 9:18:30 PM
- */
package mage.client.tournament;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Rectangle;
+import mage.client.MageFrame;
+import mage.client.SessionHandler;
+import mage.client.chat.ChatPanelBasic;
+import mage.client.dialog.PreferencesDialog;
+import mage.client.table.TablesButtonColumn;
+import mage.client.table.TablesUtil;
+import mage.client.table.TournamentMatchesTableModel;
+import mage.client.util.Format;
+import mage.client.util.GUISizeHelper;
+import mage.client.util.gui.TableUtil;
+import mage.client.util.gui.countryBox.CountryCellRenderer;
+import mage.constants.PlayerAction;
+import mage.view.TournamentPlayerView;
+import mage.view.TournamentView;
+import mage.view.UserRequestMessage;
+import org.apache.log4j.Logger;
+
+import javax.swing.*;
+import javax.swing.table.AbstractTableModel;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.text.DateFormat;
-import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.Icon;
-import javax.swing.SwingWorker;
-import javax.swing.table.AbstractTableModel;
-import mage.client.MageFrame;
-import mage.client.SessionHandler;
-import mage.client.chat.ChatPanelBasic;
-import mage.client.dialog.PreferencesDialog;
-import static mage.client.dialog.PreferencesDialog.KEY_TOURNAMENT_MATCH_COLUMNS_ORDER;
-import static mage.client.dialog.PreferencesDialog.KEY_TOURNAMENT_MATCH_COLUMNS_WIDTH;
-import static mage.client.dialog.PreferencesDialog.KEY_TOURNAMENT_PLAYER_COLUMNS_ORDER;
-import static mage.client.dialog.PreferencesDialog.KEY_TOURNAMENT_PLAYER_COLUMNS_WIDTH;
-import mage.client.util.ButtonColumn;
-import mage.client.util.Format;
-import mage.client.util.GUISizeHelper;
-import mage.client.util.gui.TableUtil;
-import mage.client.util.gui.countryBox.CountryCellRenderer;
-import mage.constants.PlayerAction;
-import mage.view.RoundView;
-import mage.view.TournamentGameView;
-import mage.view.TournamentPlayerView;
-import mage.view.TournamentView;
-import mage.view.UserRequestMessage;
-import org.apache.log4j.Logger;
+
+import static mage.client.dialog.PreferencesDialog.*;
/**
- *
* @author BetaSteward_at_googlemail.com
*/
public class TournamentPanel extends javax.swing.JPanel {
@@ -64,7 +49,7 @@ public class TournamentPanel extends javax.swing.JPanel {
private UpdateTournamentTask updateTask;
private final DateFormat df;
- private final ButtonColumn actionButtonColumn1;
+ private final TablesButtonColumn actionButtonColumn1;
/**
* Creates new form TournamentPanel
@@ -92,7 +77,11 @@ public class TournamentPanel extends javax.swing.JPanel {
Action action = new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
- int modelRow = Integer.valueOf(e.getActionCommand());
+ String searchID = e.getActionCommand();
+ int modelRow = TablesUtil.findTableRowFromSearchId(matchesModel, searchID);
+ if (modelRow == -1) {
+ return;
+ }
String state = (String) tableMatches.getValueAt(modelRow, tableMatches.convertColumnIndexToView(2));
String actionText = (String) tableMatches.getValueAt(modelRow, tableMatches.convertColumnIndexToView(TournamentMatchesTableModel.ACTION_COLUMN));
@@ -111,7 +100,7 @@ public class TournamentPanel extends javax.swing.JPanel {
};
// action button, don't delete this
- actionButtonColumn1 = new ButtonColumn(tableMatches, action, tableMatches.convertColumnIndexToView(TournamentMatchesTableModel.ACTION_COLUMN));
+ actionButtonColumn1 = new TablesButtonColumn(tableMatches, action, tableMatches.convertColumnIndexToView(TournamentMatchesTableModel.ACTION_COLUMN));
setGUISize();
}
@@ -150,7 +139,7 @@ public class TournamentPanel extends javax.swing.JPanel {
private void saveDividerLocations() {
// save panel sizes and divider locations.
Rectangle rec = MageFrame.getDesktop().getBounds();
- String sb = Double.toString(rec.getWidth()) + 'x' + Double.toString(rec.getHeight());
+ String sb = Double.toString(rec.getWidth()) + 'x' + rec.getHeight();
PreferencesDialog.saveValue(PreferencesDialog.KEY_MAGE_PANEL_LAST_SIZE, sb);
PreferencesDialog.saveValue(PreferencesDialog.KEY_TOURNAMENT_DIVIDER_LOCATION_1, Integer.toString(this.jSplitPane1.getDividerLocation()));
PreferencesDialog.saveValue(PreferencesDialog.KEY_TOURNAMENT_DIVIDER_LOCATION_2, Integer.toString(this.jSplitPane2.getDividerLocation()));
@@ -160,7 +149,7 @@ public class TournamentPanel extends javax.swing.JPanel {
Rectangle rec = MageFrame.getDesktop().getBounds();
if (rec != null) {
String size = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_MAGE_PANEL_LAST_SIZE, null);
- String sb = Double.toString(rec.getWidth()) + 'x' + Double.toString(rec.getHeight());
+ String sb = Double.toString(rec.getWidth()) + 'x' + rec.getHeight();
// use divider positions only if screen size is the same as it was the time the settings were saved
if (size != null && size.equals(sb)) {
String location = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_TOURNAMENT_DIVIDER_LOCATION_1, null);
@@ -390,67 +379,67 @@ public class TournamentPanel extends javax.swing.JPanel {
javax.swing.GroupLayout actionPanelLayout = new javax.swing.GroupLayout(actionPanel);
actionPanel.setLayout(actionPanelLayout);
actionPanelLayout.setHorizontalGroup(
- actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(actionPanelLayout.createSequentialGroup()
- .addContainerGap()
- .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(lblName)
- .addComponent(lblState)
- .addComponent(txtName, javax.swing.GroupLayout.DEFAULT_SIZE, 260, Short.MAX_VALUE)
- .addComponent(txtTournamentState))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(lblType)
- .addComponent(txtType, javax.swing.GroupLayout.PREFERRED_SIZE, 440, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGroup(actionPanelLayout.createSequentialGroup()
- .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(txtStartTime, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(lblStartTime))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(lblEndTime)
- .addComponent(txtEndTime))))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 126, Short.MAX_VALUE)
- .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(btnQuitTournament, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(btnCloseWindow, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addContainerGap())
+ actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(actionPanelLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(lblName)
+ .addComponent(lblState)
+ .addComponent(txtName, javax.swing.GroupLayout.DEFAULT_SIZE, 260, Short.MAX_VALUE)
+ .addComponent(txtTournamentState))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(lblType)
+ .addComponent(txtType, javax.swing.GroupLayout.PREFERRED_SIZE, 440, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGroup(actionPanelLayout.createSequentialGroup()
+ .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(txtStartTime, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(lblStartTime))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(lblEndTime)
+ .addComponent(txtEndTime))))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 126, Short.MAX_VALUE)
+ .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(btnQuitTournament, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(btnCloseWindow, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap())
);
actionPanelLayout.setVerticalGroup(
- actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(actionPanelLayout.createSequentialGroup()
- .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(actionPanelLayout.createSequentialGroup()
- .addGap(7, 7, 7)
- .addComponent(lblName))
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, actionPanelLayout.createSequentialGroup()
- .addContainerGap()
- .addComponent(lblType)))
- .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(actionPanelLayout.createSequentialGroup()
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(txtType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(btnQuitTournament))
- .addGap(13, 13, 13)
- .addComponent(btnCloseWindow))
- .addGroup(actionPanelLayout.createSequentialGroup()
- .addGap(6, 6, 6)
- .addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(lblState)
- .addComponent(lblStartTime)
- .addComponent(lblEndTime))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(actionPanelLayout.createSequentialGroup()
- .addComponent(txtTournamentState, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(0, 0, Short.MAX_VALUE))
- .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(txtStartTime)
- .addComponent(txtEndTime, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))))
- .addContainerGap())
+ actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(actionPanelLayout.createSequentialGroup()
+ .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(actionPanelLayout.createSequentialGroup()
+ .addGap(7, 7, 7)
+ .addComponent(lblName))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, actionPanelLayout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(lblType)))
+ .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(actionPanelLayout.createSequentialGroup()
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(txtType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(btnQuitTournament))
+ .addGap(13, 13, 13)
+ .addComponent(btnCloseWindow))
+ .addGroup(actionPanelLayout.createSequentialGroup()
+ .addGap(6, 6, 6)
+ .addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(lblState)
+ .addComponent(lblStartTime)
+ .addComponent(lblEndTime))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(actionPanelLayout.createSequentialGroup()
+ .addComponent(txtTournamentState, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(0, 0, Short.MAX_VALUE))
+ .addGroup(actionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(txtStartTime)
+ .addComponent(txtEndTime, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))))
+ .addContainerGap())
);
jSplitPane2.setResizeWeight(1.0);
@@ -481,17 +470,17 @@ public class TournamentPanel 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)
- .addComponent(actionPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(jSplitPane2, javax.swing.GroupLayout.Alignment.TRAILING)
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(actionPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(jSplitPane2, javax.swing.GroupLayout.Alignment.TRAILING)
);
layout.setVerticalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addComponent(actionPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jSplitPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 454, Short.MAX_VALUE)
- .addContainerGap())
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(actionPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jSplitPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 454, Short.MAX_VALUE)
+ .addContainerGap())
);
}// //GEN-END:initComponents
@@ -603,88 +592,6 @@ class TournamentPlayersTableModel extends AbstractTableModel {
}
-class TournamentMatchesTableModel extends AbstractTableModel {
-
- public static final int ACTION_COLUMN = 4; // column the action is located
-
- private final String[] columnNames = new String[]{"Round Number", "Players", "State", "Result", "Action"};
- private TournamentGameView[] games = new TournamentGameView[0];
- private boolean watchingAllowed;
-
- public void loadData(TournamentView tournament) {
- List views = new ArrayList<>();
- watchingAllowed = tournament.isWatchingAllowed();
- for (RoundView round : tournament.getRounds()) {
- for (TournamentGameView game : round.getGames()) {
- views.add(game);
- }
- }
- games = views.toArray(new TournamentGameView[0]);
- this.fireTableDataChanged();
- }
-
- @Override
- public int getRowCount() {
- return games.length;
- }
-
- @Override
- public int getColumnCount() {
- return columnNames.length;
- }
-
- @Override
- public Object getValueAt(int arg0, int arg1) {
- switch (arg1) {
- case 0:
- return Integer.toString(games[arg0].getRoundNum());
- case 1:
- return games[arg0].getPlayers();
- case 2:
- return games[arg0].getState();
- case 3:
- return games[arg0].getResult();
- case 4:
-// if (games[arg0].getState().equals("Finished")) {
-// return "Replay";
-// }
- if (watchingAllowed && games[arg0].getState().startsWith("Dueling")) {
- return "Watch";
- }
- return "";
- case 5:
- return games[arg0].getTableId().toString();
- case 6:
- return games[arg0].getMatchId().toString();
- case 7:
- return games[arg0].getGameId().toString();
-
- }
- return "";
- }
-
- @Override
- public String getColumnName(int columnIndex) {
- String colName = "";
-
- if (columnIndex <= getColumnCount()) {
- colName = columnNames[columnIndex];
- }
-
- return colName;
- }
-
- @Override
- public Class getColumnClass(int columnIndex) {
- return String.class;
- }
-
- @Override
- public boolean isCellEditable(int rowIndex, int columnIndex) {
- return columnIndex == ACTION_COLUMN;
- }
-
-}
class UpdateTournamentTask extends SwingWorker {
@@ -727,4 +634,4 @@ class UpdateTournamentTask extends SwingWorker {
}
}
-}
+}
\ No newline at end of file
diff --git a/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java b/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java
index c1f7d8df52..f3f8e826a4 100644
--- a/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java
+++ b/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java
@@ -1,7 +1,7 @@
/*
- * CombatDialog.java
+ * COMBAT.java
*
* Created on Feb 10, 2010, 3:35:02 PM
*/
@@ -33,7 +33,7 @@ public class CombatDialog extends MageDialog {
private int lastX = 500;
private int lastY = 300;
- /** Creates new form CombatDialog */
+ /** Creates new form COMBAT */
public CombatDialog() {
JPanel contentPane = new JPanel() {
diff --git a/Mage.Client/src/main/java/mage/client/unusedFiles/CombatGroup.java b/Mage.Client/src/main/java/mage/client/unusedFiles/CombatGroup.java
index d6bef0a6a1..da6b77dae1 100644
--- a/Mage.Client/src/main/java/mage/client/unusedFiles/CombatGroup.java
+++ b/Mage.Client/src/main/java/mage/client/unusedFiles/CombatGroup.java
@@ -61,9 +61,9 @@ public class CombatGroup extends javax.swing.JPanel {
attackers = new mage.client.cards.Cards();
lblDefender = new javax.swing.JLabel();
- blockers.setPreferredSize(new java.awt.Dimension(Config.dimensions.frameWidth + 8, Config.dimensions.frameHeight + 25));
+ blockers.setPreferredSize(new java.awt.Dimension(Config.dimensions.getFrameWidth() + 8, Config.dimensions.getFrameHeight() + 25));
- attackers.setPreferredSize(new java.awt.Dimension(Config.dimensions.frameWidth + 8, Config.dimensions.frameHeight + 25));
+ attackers.setPreferredSize(new java.awt.Dimension(Config.dimensions.getFrameWidth() + 8, Config.dimensions.getFrameHeight() + 25));
lblDefender.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
lblDefender.setText("Defender");
diff --git a/Mage.Client/src/main/java/mage/client/util/CardLanguage.java b/Mage.Client/src/main/java/mage/client/util/CardLanguage.java
new file mode 100644
index 0000000000..2be99682c2
--- /dev/null
+++ b/Mage.Client/src/main/java/mage/client/util/CardLanguage.java
@@ -0,0 +1,68 @@
+package mage.client.util;
+
+import java.util.ArrayList;
+
+/**
+ * @author JayDi85
+ */
+public enum CardLanguage {
+
+ ENGLISH("en", "English"),
+ SPANISH("es", "Spanish"),
+ FRENCH("fr", "French"),
+ GERMAN("de", "German"),
+ ITALIAN("it", "Italian"),
+ PORTUGUESE("pt", "Portuguese"),
+ JAPANESE("jp", "Japanese"),
+ KOREAN("ko", "Korean"),
+ RUSSIAN("ru", "Russian"),
+ CHINES_SIMPLE("cns", "Chinese Simplified"),
+ CHINES_TRADITION("cnt", "Chinese Traditional");
+
+ private final String code;
+ private final String text;
+
+ CardLanguage(String code, String text) {
+ this.code = code;
+ this.text = text;
+ }
+
+ @Override
+ public String toString() {
+ return code;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public static String[] toList() {
+ ArrayList res = new ArrayList<>();
+ for (CardLanguage l : values()) {
+ res.add(l.toString());
+ }
+ return res.toArray(new String[0]);
+ }
+
+ public static CardLanguage valueByText(String text) {
+ for (CardLanguage type : values()) {
+ if (type.text.equals(text)) {
+ return type;
+ }
+ }
+ return CardLanguage.ENGLISH;
+ }
+
+ public static CardLanguage valueByCode(String code) {
+ for (CardLanguage type : values()) {
+ if (type.code.equals(code)) {
+ return type;
+ }
+ }
+ return CardLanguage.ENGLISH;
+ }
+}
diff --git a/Mage.Client/src/main/java/mage/client/util/CardViewColorIdentityComparator.java b/Mage.Client/src/main/java/mage/client/util/CardViewColorIdentityComparator.java
index 162ea9182b..60ce0dda9a 100644
--- a/Mage.Client/src/main/java/mage/client/util/CardViewColorIdentityComparator.java
+++ b/Mage.Client/src/main/java/mage/client/util/CardViewColorIdentityComparator.java
@@ -2,7 +2,7 @@
package mage.client.util;
import java.util.Comparator;
-import mage.utils.CardUtil;
+import mage.utils.CardColorUtil;
import mage.view.CardView;
/**
@@ -13,7 +13,7 @@ public class CardViewColorIdentityComparator implements Comparator {
@Override
public int compare(CardView o1, CardView o2) {
- return CardUtil.getColorIdentitySortValue(o1.getManaCost(), o1.getColor(), o1.getRules())
- - CardUtil.getColorIdentitySortValue(o2.getManaCost(), o2.getColor(), o2.getRules());
+ return CardColorUtil.getColorIdentitySortValue(o1.getManaCost(), o1.getColor(), o1.getRules())
+ - CardColorUtil.getColorIdentitySortValue(o2.getManaCost(), o2.getColor(), o2.getRules());
}
}
diff --git a/Mage.Client/src/main/java/mage/client/util/CardViewEDHPowerLevelComparator.java b/Mage.Client/src/main/java/mage/client/util/CardViewEDHPowerLevelComparator.java
index 31239d1d95..9d4f614020 100644
--- a/Mage.Client/src/main/java/mage/client/util/CardViewEDHPowerLevelComparator.java
+++ b/Mage.Client/src/main/java/mage/client/util/CardViewEDHPowerLevelComparator.java
@@ -428,7 +428,7 @@ public class CardViewEDHPowerLevelComparator implements Comparator {
|| cn.equals("krosan restorer") || cn.equals("laboratory maniac")
|| cn.equals("leovold, emissary of trest")
|| cn.equals("leonin relic-warder") || cn.equals("leyline of the void")
- || cn.equals("memnarch") || cn.equals("memnarch")
+ || cn.equals("memnarch")
|| cn.equals("meren of clan nel toth") || cn.equals("mikaeus, the unhallowed")
|| cn.equals("mindcrank") || cn.equals("mindslaver")
|| cn.equals("minion reflector") || cn.equals("mycosynth lattice")
@@ -446,7 +446,7 @@ public class CardViewEDHPowerLevelComparator implements Comparator {
|| cn.equals("sunder")
|| cn.equals("storm cauldron") || cn.equals("teferi's puzzle box")
|| cn.equals("tangle wire")
- || cn.equals("teferi, mage of zhalfir") || cn.equals("teferi, mage of zhalfir")
+ || cn.equals("teferi, mage of zhalfir")
|| cn.equals("tezzeret the seeker") || cn.equals("time stretch")
|| cn.equals("time warp") || cn.equals("training grounds")
|| cn.equals("triskelavus") || cn.equals("triskelion")
diff --git a/Mage.Client/src/main/java/mage/client/util/Config.java b/Mage.Client/src/main/java/mage/client/util/Config.java
index 466f2ad08c..459ee469b9 100644
--- a/Mage.Client/src/main/java/mage/client/util/Config.java
+++ b/Mage.Client/src/main/java/mage/client/util/Config.java
@@ -1,4 +1,3 @@
-
package mage.client.util;
import java.io.File;
@@ -33,38 +32,41 @@ public final class Config {
static {
Properties p = new Properties();
- try(FileInputStream fis =new FileInputStream(new File("config/config.properties"))) {
+ boolean fileFound = true;
+ try (FileInputStream fis = new FileInputStream(new File("config/config.properties"))) {
p.load(fis);
} catch (IOException ex) {
- logger.fatal("Config error ", ex);
+ fileFound = false;
}
- serverName = p.getProperty("server-name");
- port = Integer.parseInt(p.getProperty("port"));
- remoteServer = p.getProperty("remote-server");
- cardScalingFactor = Double.valueOf(p.getProperty("card-scaling-factor"));
- cardScalingFactorEnlarged = Double.valueOf(p.getProperty("card-scaling-factor-enlarged"));
- handScalingFactor = Double.valueOf(p.getProperty("hand-scaling-factor"));
- defaultGameType = p.getProperty("default-game-type", "Human");
- defaultDeckPath = p.getProperty("default-deck-path");
- defaultOtherPlayerIndex = p.getProperty("default-other-player-index");
- defaultComputerName = p.getProperty("default-computer-name");
+ if (fileFound) {
+ serverName = p.getProperty("server-name");
+ port = Integer.parseInt(p.getProperty("port"));
+ remoteServer = p.getProperty("remote-server");
+ cardScalingFactor = Double.valueOf(p.getProperty("card-scaling-factor"));
+ cardScalingFactorEnlarged = Double.valueOf(p.getProperty("card-scaling-factor-enlarged"));
+ handScalingFactor = Double.valueOf(p.getProperty("hand-scaling-factor"));
+ defaultGameType = p.getProperty("default-game-type", "Human");
+ defaultDeckPath = p.getProperty("default-deck-path");
+ defaultOtherPlayerIndex = p.getProperty("default-other-player-index");
+ defaultComputerName = p.getProperty("default-computer-name");
- dimensions = new CardDimensions(cardScalingFactor);
- dimensionsEnlarged = new CardDimensions(cardScalingFactorEnlarged);
-// activate instead this part, to run the UI editor for some panels without error
-// serverName = "localhost";
-// port = 17171;
-// remoteServer = "mage-server";
-// cardScalingFactor = 0.4;
-// cardScalingFactorEnlarged = 0.5;
-// handScalingFactor = 1.3;
-// defaultGameType = p.getProperty("default-game-type", "Human");
-// defaultDeckPath = "";
-// defaultOtherPlayerIndex = "1";
-// defaultComputerName = "Computer";
-//
-// dimensions = new CardDimensions(cardScalingFactor);
-// dimensionsEnlarged = new CardDimensions(cardScalingFactorEnlarged);
+ dimensions = new CardDimensions(cardScalingFactor);
+ dimensionsEnlarged = new CardDimensions(cardScalingFactorEnlarged);
+ } else { // Take some default valies for netbeans design view
+ serverName = "localhost";
+ port = 17171;
+ remoteServer = "mage-server";
+ cardScalingFactor = 0.4;
+ cardScalingFactorEnlarged = 0.5;
+ handScalingFactor = 1.3;
+ defaultGameType = p.getProperty("default-game-type", "Human");
+ defaultDeckPath = "";
+ defaultOtherPlayerIndex = "1";
+ defaultComputerName = "AI Computer";
+
+ dimensions = new CardDimensions(cardScalingFactor);
+ dimensionsEnlarged = new CardDimensions(cardScalingFactorEnlarged);
+ }
}
diff --git a/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java b/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java
index 790fe34e03..3f187e19f4 100644
--- a/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java
+++ b/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java
@@ -8,6 +8,7 @@ package mage.client.util;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
+import java.util.Locale;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
@@ -22,9 +23,9 @@ import org.mage.card.arcane.CardRenderer;
public final class GUISizeHelper {
// relate the native image card size to a value of the size scale
- final static int CARD_IMAGE_WIDTH = 312;
- final static int CARD_IMAGE_HEIGHT = 445;
- final static int CARD_IMAG_VALUE = 42;
+ static final int CARD_IMAGE_WIDTH = 312;
+ static final int CARD_IMAGE_HEIGHT = 445;
+ static final int CARD_IMAG_VALUE = 42;
public static String basicSymbolSize = "small";
@@ -178,4 +179,11 @@ public final class GUISizeHelper {
}
}
}
+
+ public static String textToHtmlWithSize(String text, Font font) {
+ if (text != null && !text.toLowerCase(Locale.ENGLISH).startsWith("")) {
+ return "
" + text + "
";
+ }
+ return text;
+ }
}
diff --git a/Mage.Client/src/main/java/mage/client/util/IgnoreList.java b/Mage.Client/src/main/java/mage/client/util/IgnoreList.java
index 89906031fa..7249cac157 100644
--- a/Mage.Client/src/main/java/mage/client/util/IgnoreList.java
+++ b/Mage.Client/src/main/java/mage/client/util/IgnoreList.java
@@ -9,12 +9,12 @@ import mage.view.ChatMessage;
public final class IgnoreList {
- private static final String USAGE = " \\ignore - shows current ignore list on this server."
- + " \\ignore [username] - add a username to your ignore list on this server."
+ private static final String USAGE = " \\ignore - shows your ignore list on this server."
+ + " \\ignore [username] - add username to ignore list (they won't be able to chat or join to your game)."
+ " \\unignore [username] - remove a username from your ignore list on this server.";
public static final int MAX_IGNORE_LIST_SIZE = 50;
- public static Set IGNORED_MESSAGE_TYPES
+ public static final Set IGNORED_MESSAGE_TYPES
= ImmutableSet.of(ChatMessage.MessageType.TALK,
ChatMessage.MessageType.WHISPER_FROM);
diff --git a/Mage.Client/src/main/java/mage/client/util/ImageCaches.java b/Mage.Client/src/main/java/mage/client/util/ImageCaches.java
index cf22680495..479370288a 100644
--- a/Mage.Client/src/main/java/mage/client/util/ImageCaches.java
+++ b/Mage.Client/src/main/java/mage/client/util/ImageCaches.java
@@ -2,7 +2,8 @@
package mage.client.util;
import java.util.ArrayList;
-import java.util.Map;
+
+import com.google.common.cache.Cache;
/**
*
@@ -10,20 +11,20 @@ import java.util.Map;
*/
public final class ImageCaches {
- private final static ArrayList