external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed the FCollection from forge-core

Browse Source
This commit is contained in:
Maxmtg
2015-02-01 03:13:08 +00:00
parent 6db238833d
commit 36bc0d08e1
7 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitattributes vendored
View File

@@ -237,8 +237,6 @@ forge-core/src/main/java/forge/util/BinaryUtil.java -text
forge-core/src/main/java/forge/util/BuildInfo.java -text
forge-core/src/main/java/forge/util/CollectionSuppliers.java -text
forge-core/src/main/java/forge/util/ComparableOp.java -text
forge-core/src/main/java/forge/util/FCollection.java -text
forge-core/src/main/java/forge/util/FCollectionView.java -text
forge-core/src/main/java/forge/util/FileSection.java -text
forge-core/src/main/java/forge/util/FileSectionManual.java -text
forge-core/src/main/java/forge/util/FileUtil.java svneol=native#text/plain
@@ -265,7 +263,6 @@ forge-core/src/main/java/forge/util/maps/HashMapOfLists.java -text
forge-core/src/main/java/forge/util/maps/LinkedHashMapToAmount.java -text
forge-core/src/main/java/forge/util/maps/MapOfLists.java -text
forge-core/src/main/java/forge/util/maps/MapToAmount.java -text
forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java -text
forge-core/src/main/java/forge/util/maps/package-info.java -text
forge-core/src/main/java/forge/util/storage/IStorage.java -text
forge-core/src/main/java/forge/util/storage/StorageBase.java -text
@@ -717,6 +714,9 @@ forge-game/src/main/java/forge/trackable/TrackableSerializer.java -text
forge-game/src/main/java/forge/trackable/TrackableTypes.java -text
forge-game/src/main/java/forge/trackable/Tracker.java -text
forge-game/src/main/java/forge/util/Expressions.java -text
forge-game/src/main/java/forge/util/FCollection.java -text
forge-game/src/main/java/forge/util/FCollectionView.java -text
forge-game/src/main/java/forge/util/MapToAmountUtil.java -text
forge-game/src/main/java/forge/util/MessageUtil.java -text
forge-game/src/test/java/forge/game/mana/ManaCostBeingPaidTest.java -text
forge-gui-android/.classpath -text

2
forge-game/src/main/java/forge/game/combat/AttackConstraints.java
View File

@@ -33,9 +33,9 @@ import forge.game.card.CounterType;
import forge.game.zone.ZoneType;
import forge.util.FCollection;
import forge.util.FCollectionView;
import forge.util.MapToAmountUtil;
import forge.util.maps.LinkedHashMapToAmount;
import forge.util.maps.MapToAmount;
import forge.util.maps.MapToAmountUtil;
public class AttackConstraints {

2
forge-game/src/main/java/forge/game/combat/AttackRequirement.java
View File

@@ -15,9 +15,9 @@ import forge.game.card.Card;
import forge.game.player.Player;
import forge.game.zone.ZoneType;
import forge.util.FCollectionView;
import forge.util.MapToAmountUtil;
import forge.util.maps.LinkedHashMapToAmount;
import forge.util.maps.MapToAmount;
import forge.util.maps.MapToAmountUtil;
public class AttackRequirement {

2
forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java
View File

@@ -12,9 +12,9 @@ import forge.game.card.Card;
import forge.game.player.Player;
import forge.game.zone.ZoneType;
import forge.util.FCollectionView;
import forge.util.MapToAmountUtil;
import forge.util.maps.LinkedHashMapToAmount;
import forge.util.maps.MapToAmount;
import forge.util.maps.MapToAmountUtil;
public class GlobalAttackRestrictions {

0
forge-core/src/main/java/forge/util/FCollection.java → forge-game/src/main/java/forge/util/FCollection.java
View File

0
forge-core/src/main/java/forge/util/FCollectionView.java → forge-game/src/main/java/forge/util/FCollectionView.java
View File

7
forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java → forge-game/src/main/java/forge/util/MapToAmountUtil.java
View File

@@ -1,4 +1,4 @@
package forge.util.maps;
package forge.util;
import java.util.Collections;
import java.util.Comparator;
@@ -10,8 +10,9 @@ import org.apache.commons.lang3.tuple.Pair;
import com.google.common.collect.Lists;
import forge.util.FCollection;
import forge.util.FCollectionView;
import forge.util.maps.LinkedHashMapToAmount;
import forge.util.maps.MapToAmount;
public final class MapToAmountUtil {