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

Fixed equal or == errors -- 23 cards and more (see #4407)

Browse source
This commit is contained in:
Oleg Agafonov 2018-04-28 21:24:48 +04:00
parent 15fa8fa124
commit c24ba742f6
36 changed files with 115 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,12 +6,7 @@ import java.awt.Point;
import java.awt.event.MouseEvent;
import java.awt.event.MouseWheelEvent;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.*;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
@ -400,10 +395,10 @@ public class MageActionCallback implements ActionCallback {
private void handlePopup(TransferData transferData) {
MageCard mageCard = (MageCard) transferData.component;
if (!popupTextWindowOpen
|| mageCard.getOriginal().getId() != bigCard.getCardId()) {
|| !Objects.equals(mageCard.getOriginal().getId(), bigCard.getCardId())) {
if (bigCard.getWidth() > 0) {
synchronized (MageActionCallback.class) {
if (!popupTextWindowOpen || mageCard.getOriginal().getId() != bigCard.getCardId()) {
if (!popupTextWindowOpen || !Objects.equals(mageCard.getOriginal().getId(), bigCard.getCardId())) {
if (!popupTextWindowOpen) {
bigCard.resetCardId();
}

2
Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java
View file

@ -84,7 +84,7 @@ public class CardDownloadData {
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
if (!getClass().equals(obj.getClass())) {
return false;
}
final CardDownloadData other = (CardDownloadData) obj;