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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-11-30 02:03:43 +00:00
parent f21f7b7738
commit bac295df03
16 changed files with 105 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/gui/CardPicturePanel.java
View File

@@ -106,7 +106,7 @@ public final class CardPicturePanel extends JPanel implements CardContainer {
this.card = null;
this.inventoryItem = cp;
if (!this.isShowing()) {
// This line didn't seem to be helping, and doesn't exist down there
// This line didn't seem to be helping, and doesn't exist down there
// return;
}

2
src/main/java/forge/gui/DualListBox.java
View File

@@ -99,7 +99,7 @@ public class DualListBox<T> extends JPanel {
private void fillListModel(UnsortedListModel<T> model, ListModel newValues) {
int size = newValues.getSize();
for (int i = 0; i < size; i++) {
model.add((T)newValues.getElementAt(i));
model.add((T) newValues.getElementAt(i));
}
}

2
src/main/java/forge/gui/GuiChoose.java
View File

@@ -190,7 +190,7 @@ public class GuiChoose {
CMatchUI.SINGLETON_INSTANCE.setCard((Card) list.getSelectedValue());
GuiUtils.clearPanelSelections();
GuiUtils.setPanelSelection((Card)list.getSelectedValue());
GuiUtils.setPanelSelection((Card) list.getSelectedValue());
}
if (list.getSelectedValue() instanceof InventoryItem) {
CMatchUI.SINGLETON_INSTANCE.setCard((InventoryItem) list.getSelectedValue());

28
src/main/java/forge/gui/GuiDisplayUtil.java
View File

@@ -338,8 +338,8 @@ public final class GuiDisplayUtil {
* </p>
*/
public static void updateGUI() {
for( Player p : Singletons.getModel().getGame().getRegisteredPlayers())
{
for (Player p : Singletons.getModel().getGame().getRegisteredPlayers()) {
// why was it written twice?
p.getZone(ZoneType.Battlefield).updateObservers();
}
@@ -751,14 +751,18 @@ public final class GuiDisplayUtil {
public static void devModeCardToHand() {
final List<Player> players = Singletons.getModel().getGame().getPlayers();
final Player p = GuiChoose.oneOrNone("Put card in play for which player?", players);
if (null == p) return;
if (null == p) {
return;
}
final List<CardPrinted> cards = Lists.newArrayList(CardDb.instance().getAllUniqueCards());
Collections.sort(cards);
// use standard forge's list selection dialog
final CardPrinted c = GuiChoose.oneOrNone("Name the card", cards);
if (c == null) return;
if (c == null) {
return;
}
Card forgeCard = c.toForgeCard(p);
Singletons.getModel().getGame().getAction().moveToHand(forgeCard);
@@ -768,22 +772,30 @@ public final class GuiDisplayUtil {
public static void devModeCardToBattlefield() {
final List<Player> players = Singletons.getModel().getGame().getPlayers();
final Player p = GuiChoose.oneOrNone("Put card in play for which player?", players);
if (null == p) return;
if (null == p) {
return;
}
final List<CardPrinted> cards = Lists.newArrayList(CardDb.instance().getAllUniqueCards());
Collections.sort(cards);
// use standard forge's list selection dialog
final CardPrinted c = GuiChoose.oneOrNone("Name the card", cards);
if (c == null) return;
if (c == null) {
return;
}
Card forgeCard = c.toForgeCard(p);
final List<SpellAbility> choices = forgeCard.getBasicSpells();
if (choices.isEmpty()) return; // when would it happen?
if (choices.isEmpty()) {
return; // when would it happen?
}
final SpellAbility sa = choices.size() == 1 ? choices.get(0) : GuiChoose.oneOrNone("Choose", choices);
if (sa == null) return; // happens if cancelled
if (sa == null) {
return; // happens if cancelled
}
sa.setActivatingPlayer(p);

2
src/main/java/forge/gui/GuiInput.java
View File

@@ -52,7 +52,7 @@ public class GuiInput extends MyObservable implements Observer {
if (tmp != null) {
// System.out.println(ph.getPlayerTurn() + "'s " + ph.getPhase() + ", priority of " + ph.getPriorityPlayer() + " @ input is " + tmp.getClass().getName() );
this.setInput(tmp);
} else if ( !ph.mayPlayerHavePriority() ) {
} else if (!ph.mayPlayerHavePriority()) {
//System.out.println("cannot have priority, forced to pass");
ph.passPriority();
}

6
src/main/java/forge/gui/GuiMigrateLocalMWSSetPicturesHQ.java
View File

@@ -491,8 +491,8 @@ public final class GuiMigrateLocalMWSSetPicturesHQ extends DefaultBoundedRangeMo
final String urlBase = "C:\\MTGForge\\HQPICS\\";
String imgFN = "";
for (final CardPrinted cp : CardDb.instance().getAllTraditionalCards())
{
for (final CardPrinted cp : CardDb.instance().getAllTraditionalCards()) {
// String url = c.getSVar("Picture");
// String[] URLs = url.split("\\\\");
String edCode = cp.getEdition();
@@ -505,7 +505,7 @@ public final class GuiMigrateLocalMWSSetPicturesHQ extends DefaultBoundedRangeMo
String k = maxIndex > 1 ? Integer.valueOf(cp.getArtIndex() + 1).toString() : "";
final String fn = GuiDisplayUtil.cleanStringMWS(cp.getName()) + k + ".full.jpg";
final String destFn = imgBase + File.pathSeparator + edCode + File.pathSeparator + imgFN + k + ".jpg";
cList.add(new MCard( destFn, urlBase + setCode2 + "\\" + fn, edCode));
cList.add(new MCard(destFn, urlBase + setCode2 + "\\" + fn, edCode));
}
// Log.error(iName + ".jpg" + "\t" + URLs[0]);

3
src/main/java/forge/gui/UnsortedListModel.java
View File

@@ -33,8 +33,9 @@ public class UnsortedListModel<T> extends AbstractListModel { // Java 7 has a ge
}
public void addAll(T[] elements) {
for(T e : elements)
for (T e : elements) {
model.add(e);
}
fireContentsChanged(this, 0, getSize());
}

2
src/main/java/forge/gui/deckeditor/CDeckEditorUI.java
View File

@@ -60,7 +60,7 @@ public enum CDeckEditorUI implements CardContainer {
}
/**
* Set Pack, for when Packs can be shown in the CardPicturePanel
* Set Pack, for when Packs can be shown in the CardPicturePanel.
* @param item
*/
public void setCard(final InventoryItem item) {

19
src/main/java/forge/gui/deckeditor/SFilterUtil.java
View File

@@ -200,8 +200,9 @@ public class SFilterUtil {
Predicate<CardRules> preFinal = colors.isEmpty() && wantMulticolor ? CardRulesPredicates.Presets.IS_MULTICOLOR : optimizedAnd(preExceptMulti, preColors);
if ( null == preFinal)
if (null == preFinal) {
return Predicates.alwaysTrue();
}
return Predicates.compose(preFinal, CardPrinted.FN_GET_RULES);
}
@@ -246,8 +247,9 @@ public class SFilterUtil {
if (MAP_TYPE_CHECKBOXES.get(FilterProperty.PLANESWALKER).getCheckBox().isSelected()) { ors.add(CardRulesPredicates.Presets.IS_PLANESWALKER); }
if (MAP_TYPE_CHECKBOXES.get(FilterProperty.SORCERY).getCheckBox().isSelected()) { ors.add(CardRulesPredicates.Presets.IS_SORCERY); }
if (ors.size() == 7)
if (ors.size() == 7) {
return Predicates.alwaysTrue();
}
return Predicates.compose(Predicates.or(ors), CardPrinted.FN_GET_RULES);
}
@@ -312,7 +314,9 @@ public class SFilterUtil {
filterNot = Predicates.not(Predicates.or(nots));
}
Predicate<CardRules> preResult = optimizedAnd(filterAnd, filterNot);
if ( preResult == null ) return Predicates.alwaysTrue();
if (preResult == null) {
return Predicates.alwaysTrue();
}
return Predicates.compose(preResult, CardPrinted.FN_GET_RULES);
}
@@ -328,7 +332,7 @@ public class SFilterUtil {
private static <T> Predicate<T> optimizedAnd(Predicate<T> p1, Predicate<T> p2)
{
return p1 == null ? p2 : ( p2 == null ? p1 : Predicates.and(p1, p2) );
return p1 == null ? p2 : (p2 == null ? p1 : Predicates.and(p1, p2));
}
/**
@@ -346,13 +350,14 @@ public class SFilterUtil {
Predicate<CardRules> preCMC = getCardRulesFieldPredicate(view.getCbxCMCLow().getSelectedItem().toString(), view.getCbxCMCHigh().getSelectedItem().toString(), CardRulesPredicates.LeafNumber.CardField.CMC);
Predicate<CardRules> preCreature = optimizedAnd(preToughness, prePower);
preCreature = preCreature == null ? null : Predicates.and( preCreature, CardRulesPredicates.Presets.IS_CREATURE );
preCreature = preCreature == null ? null : Predicates.and(preCreature, CardRulesPredicates.Presets.IS_CREATURE);
Predicate<CardRules> preFinal = optimizedAnd(preCMC, preCreature);
if (preFinal == null)
if (preFinal == null) {
return Predicates.alwaysTrue();
else
} else {
return Predicates.compose(preFinal, CardPrinted.FN_GET_RULES);
}
}
//========== Custom class handling

4
src/main/java/forge/gui/deckeditor/controllers/CDeckgen.java
View File

@@ -80,9 +80,9 @@ public enum CDeckgen implements ICDoc {
final Deck randomDeck = new Deck();
Predicate<CardPrinted> notBasicLand = Predicates.not(Predicates.compose(CardRulesPredicates.Presets.IS_BASIC_LAND,CardPrinted.FN_GET_RULES));
Predicate<CardPrinted> notBasicLand = Predicates.not(Predicates.compose(CardRulesPredicates.Presets.IS_BASIC_LAND, CardPrinted.FN_GET_RULES));
Iterable<CardPrinted> source = Iterables.filter(CardDb.instance().getAllUniqueCards(), notBasicLand);
randomDeck.getMain().addAllFlat(Aggregates.random(source, 15*5));
randomDeck.getMain().addAllFlat(Aggregates.random(source, 15 * 5));
randomDeck.getMain().add("Plains");
randomDeck.getMain().add("Island");

30
src/main/java/forge/gui/deckeditor/controllers/CStatistics.java
View File

@@ -61,7 +61,7 @@ public enum CStatistics implements ICDoc {
private void setLabelValue(JLabel label, ItemPoolView<CardPrinted> deck, Predicate<CardRules> predicate, int total) {
int tmp = Aggregates.sum(Iterables.filter(deck, Predicates.compose(predicate, deck.getFnToCard())), deck.getFnToCount());
label.setText( tmp + " (" + SEditorUtil.calculatePercentage(tmp, total) + "%)");
label.setText(tmp + " (" + SEditorUtil.calculatePercentage(tmp, total) + "%)");
}
@@ -82,21 +82,21 @@ public enum CStatistics implements ICDoc {
if (total == 0) { total = 1; }
setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblCreature(), deck, CardRulesPredicates.Presets.IS_CREATURE, total );
setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblLand(), deck, CardRulesPredicates.Presets.IS_LAND, total );
setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblEnchantment(), deck, CardRulesPredicates.Presets.IS_ENCHANTMENT, total );
setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblArtifact(), deck, CardRulesPredicates.Presets.IS_ARTIFACT, total );
setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblInstant(), deck, CardRulesPredicates.Presets.IS_INSTANT, total );
setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblSorcery(), deck, CardRulesPredicates.Presets.IS_SORCERY, total );
setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblPlaneswalker(), deck, CardRulesPredicates.Presets.IS_PLANESWALKER, total );
setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblCreature(), deck, CardRulesPredicates.Presets.IS_CREATURE, total);
setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblLand(), deck, CardRulesPredicates.Presets.IS_LAND, total);
setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblEnchantment(), deck, CardRulesPredicates.Presets.IS_ENCHANTMENT, total);
setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblArtifact(), deck, CardRulesPredicates.Presets.IS_ARTIFACT, total);
setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblInstant(), deck, CardRulesPredicates.Presets.IS_INSTANT, total);
setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblSorcery(), deck, CardRulesPredicates.Presets.IS_SORCERY, total);
setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblPlaneswalker(), deck, CardRulesPredicates.Presets.IS_PLANESWALKER, total);
setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblMulti(), deck, CardRulesPredicates.Presets.IS_MULTICOLOR, total );
setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblColorless(), deck, CardRulesPredicates.Presets.IS_COLORLESS, total );
setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblBlack(), deck, CardRulesPredicates.isMonoColor(CardColor.BLACK), total );
setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblBlue(), deck, CardRulesPredicates.isMonoColor(CardColor.BLUE), total );
setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblGreen(), deck, CardRulesPredicates.isMonoColor(CardColor.GREEN), total );
setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblRed(), deck, CardRulesPredicates.isMonoColor(CardColor.RED), total );
setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblWhite(), deck, CardRulesPredicates.isMonoColor(CardColor.WHITE), total );
setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblMulti(), deck, CardRulesPredicates.Presets.IS_MULTICOLOR, total);
setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblColorless(), deck, CardRulesPredicates.Presets.IS_COLORLESS, total);
setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblBlack(), deck, CardRulesPredicates.isMonoColor(CardColor.BLACK), total);
setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblBlue(), deck, CardRulesPredicates.isMonoColor(CardColor.BLUE), total);
setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblGreen(), deck, CardRulesPredicates.isMonoColor(CardColor.GREEN), total);
setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblRed(), deck, CardRulesPredicates.isMonoColor(CardColor.RED), total);
setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblWhite(), deck, CardRulesPredicates.isMonoColor(CardColor.WHITE), total);
int cmc0 = 0, cmc1 = 0, cmc2 = 0, cmc3 = 0, cmc4 = 0, cmc5 = 0, cmc6 = 0;
int tmc = 0;