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

updated references to org.apache.commons.lang version 2.6 to use version 3 ('cause forge used to import both 2.6 and 3.x versions of the named artifact)

Browse Source
This commit is contained in:
Maxmtg
2013-11-20 08:47:06 +00:00
parent 4d3945f5a4
commit 22caa0a408
29 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui/pom.xml
View File

@@ -236,11 +236,6 @@
<artifactId>commons-lang3</artifactId>
<version>3.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>

5
forge-gui/src/main/java/forge/card/ability/ai/BalanceAi.java
View File

@@ -2,8 +2,6 @@ package forge.card.ability.ai;
import java.util.List;
import org.apache.commons.lang.math.RandomUtils;
import forge.Card;
import forge.CardLists;
import forge.CardPredicates;
@@ -11,6 +9,7 @@ import forge.card.ability.SpellAbilityAi;
import forge.card.spellability.SpellAbility;
import forge.game.player.Player;
import forge.game.zone.ZoneType;
import forge.util.MyRandom;
public class BalanceAi extends SpellAbilityAi {
@@ -48,6 +47,6 @@ public class BalanceAi extends SpellAbilityAi {
diff += 0.5 * (humHand.size() - compHand.size());
// Larger differential == more chance to actually cast this spell
return diff > 2 && RandomUtils.nextInt(100) < diff*10;
return diff > 2 && MyRandom.getRandom().nextInt(100) < diff*10;
}
}

2
forge-gui/src/main/java/forge/card/ability/effects/ChooseNumberEffect.java
View File

@@ -3,7 +3,7 @@ package forge.card.ability.effects;
import java.util.List;
import java.util.Random;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import forge.Card;
import forge.card.ability.SpellAbilityEffect;

2
forge-gui/src/main/java/forge/card/ability/effects/DiscardEffect.java
View File

@@ -3,7 +3,7 @@ package forge.card.ability.effects;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.Lists;

2
forge-gui/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -20,7 +20,7 @@ package forge.card.cardfactory;
import java.util.*;
import java.util.Map.Entry;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;

2
forge-gui/src/main/java/forge/card/cardfactory/CardStorageReader.java
View File

@@ -35,7 +35,7 @@ import java.util.concurrent.Future;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import org.apache.commons.lang.time.StopWatch;
import org.apache.commons.lang3.time.StopWatch;
import forge.FThreads;
import forge.ICardStorageReader;

2
forge-gui/src/main/java/forge/card/cost/CostAddMana.java
View File

@@ -18,7 +18,7 @@
package forge.card.cost;
import java.util.ArrayList;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import forge.Card;
import forge.card.ColorSet;

2
forge-gui/src/main/java/forge/card/spellability/TargetRestrictions.java
View File

@@ -22,7 +22,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import forge.Card;
import forge.GameObject;

2
forge-gui/src/main/java/forge/control/FControl.java
View File

@@ -35,7 +35,7 @@ import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import javax.swing.WindowConstants;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import forge.Card;
import forge.Constant.Preferences;

2
forge-gui/src/main/java/forge/deck/CardCollections.java
View File

@@ -19,7 +19,7 @@ package forge.deck;
import java.io.File;
import org.apache.commons.lang.time.StopWatch;
import org.apache.commons.lang3.time.StopWatch;
import forge.deck.io.DeckGroupSerializer;
import forge.deck.io.DeckSerializer;

2
forge-gui/src/main/java/forge/game/GameActionUtil.java
View File

@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;

2
forge-gui/src/main/java/forge/game/ai/AiProfileUtil.java
View File

@@ -28,7 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.ArrayList;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang3.ArrayUtils;
/**
* Holds default AI personality profile values in an enum.

2
forge-gui/src/main/java/forge/game/ai/ComputerUtil.java
View File

@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;

2
forge-gui/src/main/java/forge/game/ai/ComputerUtilMana.java
View File

@@ -10,7 +10,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Predicate;
import forge.Card;

2
forge-gui/src/main/java/forge/game/event/GameEventCardStatsChanged.java
View File

@@ -2,7 +2,7 @@ package forge.game.event;
import java.util.Arrays;
import java.util.Collection;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.Iterables;

2
forge-gui/src/main/java/forge/game/limited/BoosterDraft.java
View File

@@ -29,7 +29,7 @@ import java.util.TreeMap;
import javax.swing.JOptionPane;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang3.ArrayUtils;
import com.google.common.base.Supplier;
import forge.Card;

2
forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java
View File

@@ -24,7 +24,7 @@ import java.util.Stack;
import javax.swing.JOptionPane;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang3.ArrayUtils;
import forge.Singletons;
import forge.card.CardBlock;

2
forge-gui/src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Stack;
import org.apache.commons.lang.time.StopWatch;
import org.apache.commons.lang3.time.StopWatch;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;

6
forge-gui/src/main/java/forge/game/player/LobbyPlayerRemote.java
View File

@@ -1,7 +1,5 @@
package forge.game.player;
import org.apache.commons.lang.NotImplementedException;
import forge.game.Game;
import forge.net.client.INetClient;
import forge.net.protocol.toclient.ChatPacketClt;
@@ -26,7 +24,7 @@ public class LobbyPlayerRemote extends LobbyPlayer {
@Override
public Player getPlayer(Game gameState) {
// Cannot create remote players yet
throw new NotImplementedException();
throw new UnsupportedOperationException("method is not implemented");
}
@Override
@@ -40,6 +38,6 @@ public class LobbyPlayerRemote extends LobbyPlayer {
@Override
public PlayerController createControllerFor(Player p) {
// Cannot create remote players yet
throw new NotImplementedException();
throw new UnsupportedOperationException("method is not implemented");
}
}

2
forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java
View File

@@ -16,7 +16,7 @@ import javax.swing.ScrollPaneConstants;
import net.miginfocom.swing.MigLayout;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import forge.Command;

4
forge-gui/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java
View File

@@ -43,8 +43,8 @@ import javax.swing.Timer;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import org.apache.commons.lang.CharUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.CharUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.common.primitives.Ints;

2
forge-gui/src/main/java/forge/gui/deckeditor/SEditorIO.java
View File

@@ -2,7 +2,7 @@ package forge.gui.deckeditor;
import javax.swing.JOptionPane;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import forge.Singletons;
import forge.deck.DeckBase;

2
forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java
View File

@@ -9,7 +9,7 @@ import javax.swing.JCheckBox;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import forge.Command;

2
forge-gui/src/main/java/forge/gui/home/settings/GamePlayerUtil.java
View File

@@ -2,7 +2,7 @@ package forge.gui.home.settings;
import javax.swing.JOptionPane;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import forge.Singletons;
import forge.properties.ForgePreferences;

2
forge-gui/src/main/java/forge/gui/match/QuestWinLose.java
View File

@@ -28,7 +28,7 @@ import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.SwingConstants;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import forge.Card;
import forge.Singletons;

2
forge-gui/src/main/java/forge/gui/toolbox/FSkin.java
View File

@@ -53,7 +53,7 @@ import javax.swing.border.Border;
import javax.swing.border.LineBorder;
import javax.swing.text.JTextComponent;
import org.apache.commons.lang.WordUtils;
import org.apache.commons.lang3.text.WordUtils;
import forge.FThreads;
import forge.Singletons;

2
forge-gui/src/main/java/forge/net/FServer.java
View File

@@ -6,7 +6,7 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import org.apache.commons.lang.time.StopWatch;
import org.apache.commons.lang3.time.StopWatch;
import forge.GameLogEntry;
import forge.Singletons;

2
forge-gui/src/main/java/forge/properties/ForgeProfileProperties.java
View File

@@ -23,7 +23,7 @@ import java.io.IOException;
import java.util.Map;
import java.util.Properties;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import forge.util.FileSection;

4
forge-gui/src/main/java/forge/util/storage/StorageNestedFolders.java
View File

@@ -3,8 +3,6 @@ package forge.util.storage;
import java.io.File;
import java.util.HashMap;
import org.apache.commons.lang.NotImplementedException;
import com.google.common.base.Function;
@@ -30,7 +28,7 @@ public class StorageNestedFolders<T> extends StorageBase<IStorage<T>> {
subdir.mkdir();
// TODO: save recursivelly the passed IStorage
throw new NotImplementedException();
throw new UnsupportedOperationException("method is not implemented");
}
@Override