- CheckStyle.

This commit is contained in:
Chris
2012-02-25 19:46:03 +00:00
parent 8e4de8d41a
commit 930e85d2a5
20 changed files with 48 additions and 54 deletions

View File

@@ -120,7 +120,7 @@ public final class GameFormat {
return this.name + " (format)"; return this.name + " (format)";
} }
public static final Lambda1<String,GameFormat> FN_GET_NAME = new Lambda1<String, GameFormat>() { public static final Lambda1<String, GameFormat> FN_GET_NAME = new Lambda1<String, GameFormat>() {
@Override @Override
public String apply(GameFormat arg1) { public String apply(GameFormat arg1) {
return arg1.getName(); return arg1.getName();

View File

@@ -99,9 +99,6 @@ public class BoosterPack extends OpenablePack {
return myCards; return myCards;
} }
@Override @Override
public final String getType() { public final String getType() {
return "Booster Pack"; return "Booster Pack";

View File

@@ -139,7 +139,6 @@ public enum FModel {
this.tournaments = new StorageView<BoosterData>(new BoosterData.Reader("res/blockdata/starters.txt")); this.tournaments = new StorageView<BoosterData>(new BoosterData.Reader("res/blockdata/starters.txt"));
this.blocks = new StorageView<CardBlock>(new CardBlock.Reader("res/blockdata/blocks.txt", editions)); this.blocks = new StorageView<CardBlock>(new CardBlock.Reader("res/blockdata/blocks.txt", editions));
// TODO this single setting from preferences should not be here, or, // TODO this single setting from preferences should not be here, or,
// it should be here with all the other settings at the same time. // it should be here with all the other settings at the same time.
// Unfortunately, they're tied up in legacy code in the Display // Unfortunately, they're tied up in legacy code in the Display

View File

@@ -209,7 +209,6 @@ public final class QuestUtilCards {
} }
} }
/** /**
* Buy precon deck. * Buy precon deck.
* *
@@ -357,7 +356,7 @@ public final class QuestUtilCards {
*/ */
public void generateTournamentsInShop(final int count) { public void generateTournamentsInShop(final int count) {
Predicate<CardEdition> hasTournament = CardEdition.Predicates.HAS_TOURNAMENT_PACK; Predicate<CardEdition> hasTournament = CardEdition.Predicates.HAS_TOURNAMENT_PACK;
this.q.getShopList().addAllFlat( hasTournament.random(Singletons.getModel().getEditions(), count, TournamentPack.FN_FROM_SET)); this.q.getShopList().addAllFlat(hasTournament.random(Singletons.getModel().getEditions(), count, TournamentPack.FN_FROM_SET));
} }
/** /**

View File

@@ -36,19 +36,18 @@ import org.apache.commons.lang3.StringUtils;
public abstract class StorageReaderFile<T> implements IItemReader<T> { public abstract class StorageReaderFile<T> implements IItemReader<T> {
private final File file; private final File file;
private final Lambda1<String,T> keySelector; private final Lambda1<String, T> keySelector;
/** /**
* Instantiates a new storage reader file. * Instantiates a new storage reader file.
* *
* @param file0 the file0 * @param file0 the file0
*/ */
public StorageReaderFile(final String pathname, Lambda1<String,T> keySelector0) { public StorageReaderFile(final String pathname, Lambda1<String, T> keySelector0) {
this(new File(pathname), keySelector0); this(new File(pathname), keySelector0);
} }
public StorageReaderFile(final File file0, Lambda1<String, T> keySelector0) {
public StorageReaderFile(final File file0, Lambda1<String,T> keySelector0) {
this.file = file0; this.file = file0;
keySelector = keySelector0; keySelector = keySelector0;
} }

View File

@@ -45,7 +45,7 @@ import forge.error.ErrorViewer;
public abstract class StorageReaderFolder<T> implements IItemReader<T> { public abstract class StorageReaderFolder<T> implements IItemReader<T> {
private final File directory; private final File directory;
private final Lambda1<String,T> keySelector; private final Lambda1<String, T> keySelector;
/** /**
* Gets the directory. * Gets the directory.
@@ -61,7 +61,7 @@ public abstract class StorageReaderFolder<T> implements IItemReader<T> {
* *
* @param deckDir0 the deck dir0 * @param deckDir0 the deck dir0
*/ */
public StorageReaderFolder(final File deckDir0, Lambda1<String,T> keySelector0) { public StorageReaderFolder(final File deckDir0, Lambda1<String, T> keySelector0) {
this.directory = deckDir0; this.directory = deckDir0;
keySelector = keySelector0; keySelector = keySelector0;