diff --git a/.gitattributes b/.gitattributes index 01432ca7ab9..12d4dcc1b7c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15518,7 +15518,6 @@ src/test/java/forge/GuiDownloadPicturesLQTest.java svneol=native#text/plain src/test/java/forge/GuiDownloadSetPicturesLQTest.java svneol=native#text/plain src/test/java/forge/GuiProgressBarWindowTest.java svneol=native#text/plain src/test/java/forge/PanelTest.java svneol=native#text/plain -src/test/java/forge/ReadDraftRankingsTest.java -text src/test/java/forge/RunTest.java svneol=native#text/plain src/test/java/forge/TinyTest.java svneol=native#text/plain src/test/java/forge/card/mana/ManaPartTest.java svneol=native#text/plain diff --git a/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java b/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java index 465446583c0..4515b52d22e 100644 --- a/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java +++ b/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java @@ -20,7 +20,6 @@ package forge.gui.toolbox.itemmanager; import java.awt.Toolkit; import java.awt.event.KeyEvent; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/forge/item/ItemPool.java b/src/main/java/forge/item/ItemPool.java index b6fa215a32a..e63d8a284ae 100644 --- a/src/main/java/forge/item/ItemPool.java +++ b/src/main/java/forge/item/ItemPool.java @@ -111,12 +111,12 @@ public class ItemPool extends ItemPoolView { return; } this.getItems().put(item, Integer.valueOf(this.count(item) + amount)); - this.setListInSync(false); + this.isListInSync = false; } private void put(final T item, final int amount) { this.getItems().put(item, amount); - this.setListInSync(false); + this.isListInSync = false; } /** @@ -134,7 +134,7 @@ public class ItemPool extends ItemPoolView { this.add((T) cr); } } - this.setListInSync(false); + this.isListInSync = false; } /** @@ -153,7 +153,7 @@ public class ItemPool extends ItemPoolView { this.add((T) e.getKey(), e.getValue()); } } - this.setListInSync(false); + this.isListInSync = false; } /** @@ -186,7 +186,7 @@ public class ItemPool extends ItemPoolView { } else { this.getItems().put(item, count - amount); } - this.setListInSync(false); + this.isListInSync = false; return true; } @@ -222,6 +222,6 @@ public class ItemPool extends ItemPoolView { */ public void clear() { this.getItems().clear(); - this.setListInSync(false); + this.isListInSync = false; } } diff --git a/src/main/java/forge/item/ItemPoolView.java b/src/main/java/forge/item/ItemPoolView.java index 153f2da1b2c..b9056d87f3f 100644 --- a/src/main/java/forge/item/ItemPoolView.java +++ b/src/main/java/forge/item/ItemPoolView.java @@ -88,7 +88,7 @@ public class ItemPoolView implements Iterable> itemsOrdered = new ArrayList>(); /** Whether list is in sync. */ - private transient boolean isListInSync = false; + protected transient boolean isListInSync = false; /** * iterator. @@ -188,7 +188,7 @@ public class ItemPoolView implements Iterable> */ public final List> getOrderedList() { - if (!this.isListInSync()) { + if (!this.isListInSync) { this.rebuildOrderedList(); } return this.itemsOrdered; @@ -201,7 +201,7 @@ public class ItemPoolView implements Iterable implements Iterable cardLines = FileUtil.readFile(new File(NewConstants.CARD_DATA_DIR + "/g", "garruk_primal_hunter.txt")); - CardRules c = cr.readCard(cardLines); - // Assert.assertEquals(1.0 / 234.0, rdr.getRanking(c.getName(), "M13").doubleValue()); - - cardLines = FileUtil.readFile(new File(NewConstants.CARD_DATA_DIR + "/c", "clone.txt")); - c = cr.readCard(cardLines); - // Assert.assertEquals(38.0 / 234.0, rdr.getRanking(c.getName(), "M13").doubleValue()); - - cardLines = FileUtil.readFile(new File(NewConstants.CARD_DATA_DIR + "/t", "tamiyo_the_moon_sage.txt")); - c = cr.readCard(cardLines); - // Assert.assertEquals(1.0 / 234.0, rdr.getRanking(c.getName(), "AVR").doubleValue()); - - // Mikaeus, the Lunarch has a comma in its name in the rankings file - cardLines = FileUtil.readFile(new File(NewConstants.CARD_DATA_DIR + "/m", "mikaeus_the_lunarch.txt")); - c = cr.readCard(cardLines); - // Assert.assertEquals(4.0 / 255.0, rdr.getRanking(c.getName(), "ISD").doubleValue()); - - } -}