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

Narrowed variables scope.

Browse source
This commit is contained in:
vraskulin 2017-02-15 16:05:18 +03:00
parent 09da478b38
commit f1ef3bf68b
20 changed files with 42 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
View file

@ -240,12 +240,9 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
private static List<CardDownloadData> getNeededCards(List<CardInfo> allCards) {
List<CardDownloadData> cardsToDownload = Collections.synchronizedList(new ArrayList<>());
/**
* read all card names and urls
*/
List<CardDownloadData> allCardsUrls = Collections.synchronizedList(new ArrayList<>());
HashSet<String> ignoreUrls = SettingsManager.getIntance().getIgnoreUrls();
/**
@ -261,6 +258,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
int numberCardImages = allCards.size();
int numberWithoutTokens = 0;
List<CardDownloadData> allCardsUrls = Collections.synchronizedList(new ArrayList<>());
try {
offlineMode = true;
allCards.parallelStream().forEach(card -> {
@ -290,11 +288,11 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
if (card.getFlipCardName() == null || card.getFlipCardName().trim().isEmpty()) {
throw new IllegalStateException("Flipped card can't have empty name.");
}
url = new CardDownloadData(card.getFlipCardName(), card.getSetCode(), card.getCardNumber(), card.usesVariousArt(), 0, "", "", false, card.isDoubleFaced(), card.isNightCard());
url.setFlipCard(true);
url.setFlippedSide(true);
url.setType2(isType2);
allCardsUrls.add(url);
CardDownloadData cardDownloadData = new CardDownloadData(card.getFlipCardName(), card.getSetCode(), card.getCardNumber(), card.usesVariousArt(), 0, "", "", false, card.isDoubleFaced(), card.isNightCard());
cardDownloadData.setFlipCard(true);
cardDownloadData.setFlippedSide(true);
cardDownloadData.setType2(isType2);
allCardsUrls.add(cardDownloadData);
}
} else if (card.getCardNumber().isEmpty() || "0".equals(card.getCardNumber())) {
System.err.println("There was a critical error!");
@ -315,6 +313,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
/**
* check to see which cards we already have
*/
List<CardDownloadData> cardsToDownload = Collections.synchronizedList(new ArrayList<>());
allCardsUrls.parallelStream().forEach(card -> {
TFile file = new TFile(CardImageUtils.generateImagePath(card));
if (!file.exists()) {
@ -348,19 +347,18 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
try(InputStreamReader input = new InputStreamReader(in);
BufferedReader reader = new BufferedReader(input)) {
String line;
line = reader.readLine();
String line = reader.readLine();
while (line != null) {
line = line.trim();
if (line.startsWith("|")) { // new format
String[] params = line.split("\\|", -1);
if (params.length >= 5) {
int type = 0;
String fileName = "";
if (params[4] != null && !params[4].isEmpty()) {
type = Integer.parseInt(params[4].trim());
}
String fileName = "";
if (params.length > 5 && params[5] != null && !params[5].isEmpty()) {
fileName = params[5].trim();
}
@ -516,7 +514,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
private final String actualFilename;
private final boolean useSpecifiedPaths;
public DownloadTask(CardDownloadData card, URL url, int count) {
DownloadTask(CardDownloadData card, URL url, int count) {
this.card = card;
this.url = url;
this.count = count;
@ -524,7 +522,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
useSpecifiedPaths = false;
}
public DownloadTask(CardDownloadData card, URL url, String actualFilename, int count) {
DownloadTask(CardDownloadData card, URL url, String actualFilename, int count) {
this.card = card;
this.url = url;
this.count = count;
@ -583,7 +581,6 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
}
return;
}
BufferedOutputStream out;
// Logger.getLogger(this.getClass()).info(url.toString());
boolean useTempFile = false;
@ -602,6 +599,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
if (responseCode == 200 || useTempFile) {
if (!useTempFile) {
BufferedOutputStream out;
try (BufferedInputStream in = new BufferedInputStream(httpConn.getInputStream())) {
//try (BufferedInputStream in = new BufferedInputStream(url.openConnection(p).getInputStream())) {
out = new BufferedOutputStream(new TFileOutputStream(temporaryFile));

19
Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
View file

@ -39,7 +39,7 @@ import org.mage.plugins.card.utils.CardImageUtils;
* look</li>
* </ul>
*/
public class ImageCache {
public final class ImageCache {
private static final Logger LOGGER = Logger.getLogger(ImageCache.class);
@ -157,6 +157,9 @@ public class ImageCache {
});
}
private ImageCache() {
}
public static BufferedImage getMorphImage() {
CardDownloadData info = new CardDownloadData("Morph", "KTK", "0", false, 0, "KTK", "");
info.setToken(true);
@ -222,8 +225,7 @@ public class ImageCache {
*/
private static BufferedImage getImage(String key) {
try {
BufferedImage image = IMAGE_CACHE.get(key);
return image;
return IMAGE_CACHE.get(key);
} catch (NullPointerException ex) {
// unfortunately NullOutputException, thrown when apply() returns
// null, is not public
@ -244,11 +246,7 @@ public class ImageCache {
* the cache.
*/
private static BufferedImage tryGetImage(String key) {
if (IMAGE_CACHE.containsKey(key)) {
return IMAGE_CACHE.get(key);
} else {
return null;
}
return IMAGE_CACHE.containsKey(key) ? IMAGE_CACHE.get(key) : null;
}
/**
@ -279,11 +277,11 @@ public class ImageCache {
if (file == null) {
return null;
}
BufferedImage image = null;
if (!file.exists()) {
LOGGER.debug("File does not exist: " + file.toString());
return null;
}
BufferedImage image = null;
try {
try (TFileInputStream inputStream = new TFileInputStream(file)) {
image = ImageIO.read(inputStream);
@ -395,8 +393,7 @@ public class ImageCache {
public static TFile getTFile(String path) {
try {
TFile file = new TFile(path);
return file;
return new TFile(path);
} catch (NullPointerException ex) {
LOGGER.warn("Imagefile does not exist: " + path);
}