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

* Fixed client crush on old systems without JavaFX supports like MacOS 10.9;

Browse source
This commit is contained in:
Oleg Agafonov 2019-04-02 08:20:48 +04:00
parent 3e18305890
commit b7e68f3e0a
4 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,7 +93,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
private static MageFrame instance; private static MageFrame instance;
private final ConnectDialog connectDialog; private final ConnectDialog connectDialog;
private final WhatsNewDialog whatsNewDialog; private WhatsNewDialog whatsNewDialog; // can be null
private final ErrorDialog errorDialog; private final ErrorDialog errorDialog;
private static CallbackClient callbackClient; private static CallbackClient callbackClient;
private static final Preferences PREFS = Preferences.userNodeForPackage(MageFrame.class); private static final Preferences PREFS = Preferences.userNodeForPackage(MageFrame.class);
@ -246,7 +246,15 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
SessionHandler.startSession(this); SessionHandler.startSession(this);
callbackClient = new CallbackClientImpl(this); callbackClient = new CallbackClientImpl(this);
connectDialog = new ConnectDialog(); connectDialog = new ConnectDialog();
whatsNewDialog = new WhatsNewDialog(); try
{
whatsNewDialog = new WhatsNewDialog();
} catch (NoClassDefFoundError e) {
// JavaFX is not supported on old MacOS with OpenJDK
// https://bugs.openjdk.java.net/browse/JDK-8202132
LOGGER.error("JavaFX is not supported by your system. What's new page will be disabled.", e);
whatsNewDialog = null;
}
desktopPane.add(connectDialog, JLayeredPane.MODAL_LAYER); desktopPane.add(connectDialog, JLayeredPane.MODAL_LAYER);
errorDialog = new ErrorDialog(); errorDialog = new ErrorDialog();
errorDialog.setLocation(100, 100); errorDialog.setLocation(100, 100);
@ -336,7 +344,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
// run what's new checks (loading in background) // run what's new checks (loading in background)
SwingUtilities.invokeLater(() -> { SwingUtilities.invokeLater(() -> {
whatsNewDialog.checkUpdatesAndShow(false); showWhatsNewDialog(false);
}); });
} }
@ -1578,8 +1586,10 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
addTooltipContainer(); addTooltipContainer();
} }
public WhatsNewDialog getWhatsNewDialog() { public void showWhatsNewDialog(boolean forceToShowPage) {
return whatsNewDialog; if (whatsNewDialog != null) {
whatsNewDialog.checkUpdatesAndShow(forceToShowPage);
}
} }
} }

2
Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java
View file

@ -136,7 +136,7 @@ public class AboutDialog extends MageDialog {
}//GEN-LAST:event_btnOkActionPerformed }//GEN-LAST:event_btnOkActionPerformed
private void btnWhatsNewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnWhatsNewActionPerformed private void btnWhatsNewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnWhatsNewActionPerformed
MageFrame.getInstance().getWhatsNewDialog().checkUpdatesAndShow(true); MageFrame.getInstance().showWhatsNewDialog(true);
}//GEN-LAST:event_btnWhatsNewActionPerformed }//GEN-LAST:event_btnWhatsNewActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables

2
Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
View file

@ -794,7 +794,7 @@ public class ConnectDialog extends MageDialog {
}//GEN-LAST:event_btnCheckStatusActionPerformed }//GEN-LAST:event_btnCheckStatusActionPerformed
private void btnWhatsNewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnWhatsNewActionPerformed private void btnWhatsNewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnWhatsNewActionPerformed
MageFrame.getInstance().getWhatsNewDialog().checkUpdatesAndShow(true); MageFrame.getInstance().showWhatsNewDialog(true);
}//GEN-LAST:event_btnWhatsNewActionPerformed }//GEN-LAST:event_btnWhatsNewActionPerformed
private void doFastFlagSearch() { private void doFastFlagSearch() {

2
Mage.Client/src/main/java/mage/client/table/TablesPanel.java
View file

@ -1600,7 +1600,7 @@ public class TablesPanel extends javax.swing.JPanel {
}//GEN-LAST:event_btnFormatVintageActionPerformed }//GEN-LAST:event_btnFormatVintageActionPerformed
private void buttonWhatsNewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonWhatsNewActionPerformed private void buttonWhatsNewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonWhatsNewActionPerformed
MageFrame.getInstance().getWhatsNewDialog().checkUpdatesAndShow(true); MageFrame.getInstance().showWhatsNewDialog(true);
}//GEN-LAST:event_buttonWhatsNewActionPerformed }//GEN-LAST:event_buttonWhatsNewActionPerformed
private void handleError(Exception ex) { private void handleError(Exception ex) {