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

Fix broken threading in CardPanel

Browse source 
The current code is broken, can't touch the UI in a thread pool thread,
UI.invokeLater must be used to get back on the UI thread.

Also, it must check whether the card has been changed again before setting
the image and do nothing in that case.
This commit is contained in:
draxdyn 2016-06-01 21:02:22 +02:00
parent a9744b2d04
commit 1dddda6599
1 changed files with 36 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

76
Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
View file

@ -311,37 +311,19 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
String cardType = getType(newGameCard);
tooltipText.setText(getText(cardType, newGameCard));
Util.threadPool.submit(new Runnable() {
@Override
public void run() {
try {
tappedAngle = isTapped() ? CardPanel.TAPPED_ANGLE : 0;
flippedAngle = isFlipped() ? CardPanel.FLIPPED_ANGLE : 0;
if (!loadImage) {
return;
}
BufferedImage srcImage;
if (gameCard.isFaceDown()) {
srcImage = getFaceDownImage();
} else {
srcImage = ImageCache.getImage(gameCard, getCardWidth(), getCardHeight());
}
if (srcImage != null) {
hasImage = true;
setText(gameCard);
setImage(srcImage);
}
if (gameCard.isTransformed()) {
toggleTransformed();
}
setText(gameCard);
} catch (Exception e) {
LOGGER.fatal("Problem during image animation", e);
} catch (Error err) {
LOGGER.error("Problem during image animation", err);
}
}
});
tappedAngle = isTapped() ? CardPanel.TAPPED_ANGLE : 0;
flippedAngle = isFlipped() ? CardPanel.FLIPPED_ANGLE : 0;
if (!loadImage) {
return;
}
if (gameCard.isTransformed()) {
// this calls updateImage
toggleTransformed();
} else {
updateImage();
}
}
private void setTypeIcon(BufferedImage bufferedImage, String toolTipText) {
@ -389,7 +371,10 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
private void setImage(Image srcImage) {
synchronized (imagePanel) {
imagePanel.setImage(srcImage);
if(srcImage != null)
imagePanel.setImage(srcImage);
else
imagePanel.clearImage();
repaint();
}
doLayout();
@ -734,15 +719,21 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
return cardYOffset;
}
private int updateImageStamp;
@Override
public void updateImage() {
tappedAngle = isTapped() ? CardPanel.TAPPED_ANGLE : 0;
flippedAngle = isFlipped() ? CardPanel.FLIPPED_ANGLE : 0;
final CardView gameCard = this.gameCard;
final int stamp = ++updateImageStamp;
Util.threadPool.submit(new Runnable() {
@Override
public void run() {
try {
tappedAngle = isTapped() ? CardPanel.TAPPED_ANGLE : 0;
flippedAngle = isFlipped() ? CardPanel.FLIPPED_ANGLE : 0;
BufferedImage srcImage;
final BufferedImage srcImage;
if (gameCard.isFaceDown()) {
srcImage = getFaceDownImage();
} else if (cardWidth > THUMBNAIL_SIZE_FULL.width) {
@ -750,11 +741,16 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
} else {
srcImage = ImageCache.getThumbnail(gameCard);
}
if (srcImage != null) {
hasImage = true;
setText(gameCard);
setImage(srcImage);
}
UI.invokeLater(new Runnable() {
@Override
public void run () {
if(stamp == updateImageStamp) {
hasImage = srcImage != null;
setText(gameCard);
setImage(srcImage);
}
}
});
} catch (Exception e) {
e.printStackTrace();
} catch (Error err) {