Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Big refactoring

Browse source 
I used Intellij IDEA to automatically refactor code to achive 3 goals.
1) get rid of anonymouse classes, and replace the with lamba to get more readeable and clean code (like in TableWaitingDialog).
2) make effectively final  variables actually final to avoid inadvertent changes on it in further releases and keep objects as immutable, as possible.
3)  Get rid of unused imports (most of the changes) in whole project classes.
This commit is contained in:
vraskulin 2017-01-09 19:16:47 +03:00
parent a9f2c8c407
commit 076840df53
247 changed files with 1919 additions and 3682 deletions
Download patch file Download diff file Expand all files Collapse all files

78
Mage.Client/src/main/java/mage/client/game/HelperPanel.java
View file

@ -48,7 +48,7 @@ import javax.swing.ScrollPaneConstants;
import javax.swing.SwingUtilities;
import javax.swing.ToolTipManager;
import javax.swing.UIManager;
import mage.client.MageFrame;
import mage.client.SessionHandler;
import mage.client.components.MageTextArea;
import mage.client.game.FeedbackPanel.FeedbackMode;
@ -59,7 +59,6 @@ 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 mage.remote.Session;
/**
* Panel with buttons that copy the state of feedback panel.
@ -200,52 +199,30 @@ public class HelperPanel extends JPanel {
};
btnLeft.addMouseListener(checkPopupAdapter);
btnLeft.addActionListener(new ActionListener() {
@Override
public void actionPerformed(java.awt.event.ActionEvent evt) {
if (linkLeft != null) {
clickButton(linkLeft);
}
btnLeft.addActionListener(evt -> {
if (linkLeft != null) {
clickButton(linkLeft);
}
});
btnRight.addMouseListener(checkPopupAdapter);
btnRight.addActionListener(new ActionListener() {
@Override
public void actionPerformed(java.awt.event.ActionEvent evt) {
if (linkRight != null) {
clickButton(linkRight);
}
btnRight.addActionListener(evt -> {
if (linkRight != null) {
clickButton(linkRight);
}
});
btnSpecial.addActionListener(new ActionListener() {
@Override
public void actionPerformed(java.awt.event.ActionEvent evt) {
if (linkSpecial != null) {
clickButton(linkSpecial);
}
btnSpecial.addActionListener(evt -> {
if (linkSpecial != null) {
clickButton(linkSpecial);
}
});
btnUndo.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(java.awt.event.ActionEvent evt) {
if (linkUndo != null) {
{
Thread worker = new Thread() {
@Override
public void run() {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
linkUndo.doClick();
}
});
}
};
worker.start();
}
btnUndo.addActionListener(evt -> {
if (linkUndo != null) {
{
Thread worker = new Thread(() -> SwingUtilities.invokeLater(() -> linkUndo.doClick()));
worker.start();
}
}
});
@ -279,19 +256,11 @@ public class HelperPanel extends JPanel {
}
private void clickButton(final JButton button) {
Thread worker = new Thread() {
@Override
public void run() {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
setState("", false, "", false, null);
setSpecial("", false);
button.doClick();
}
});
}
};
Thread worker = new Thread(() -> SwingUtilities.invokeLater(() -> {
setState("", false, "", false, null);
setSpecial("", false);
button.doClick();
}));
worker.start();
}
@ -363,12 +332,7 @@ public class HelperPanel extends JPanel {
private void initPopupMenuTriggerOrder() {
ActionListener actionListener = new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
handleAutoAnswerPopupMenuEvent(e);
}
};
ActionListener actionListener = e -> handleAutoAnswerPopupMenuEvent(e);
popupMenuAskYes = new JPopupMenu();
popupMenuAskNo = new JPopupMenu();