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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-03-24 14:50:10 +00:00
parent 2630c9f1ba
commit cc729bcf7c
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/deck/Deck.java
View File

@@ -210,7 +210,7 @@ public class Deck extends DeckBase implements Serializable {
final Iterator<String> lineIterator = lines.iterator(); final Iterator<String> lineIterator = lines.iterator();
while (lineIterator.hasNext()) { while (lineIterator.hasNext()) {
final String line = lineIterator.next(); final String line = lineIterator.next();
if (line.startsWith(";")) { continue; } // that is a comment or not-yet-supported card if (line.startsWith(";")) { continue; } // that is a comment or not-yet-supported card
if (line.startsWith("[")) { break; } // there comes another section if (line.startsWith("[")) { break; } // there comes another section
final Matcher m = p.matcher(line.trim()); final Matcher m = p.matcher(line.trim());

16
src/main/java/forge/quest/QuestController.java
View File

@@ -74,7 +74,7 @@ public class QuestController {
private QuestEventManager challengesManager = null; private QuestEventManager challengesManager = null;
private QuestBazaarManager bazaar = null; private QuestBazaarManager bazaar = null;
private QuestPetStorage pets = null; private QuestPetStorage pets = null;
// This is used by shop. Had no idea where else to place this // This is used by shop. Had no idea where else to place this
@@ -100,12 +100,11 @@ public class QuestController {
public void selectPet(Integer slot, String name) { public void selectPet(Integer slot, String name) {
selectedPets.put(slot, name); selectedPets.put(slot, name);
} }
public String getSelectedPet(Integer slot) { public String getSelectedPet(Integer slot) {
return selectedPets.get(slot); return selectedPets.get(slot);
} }
// Cards - class uses data from here // Cards - class uses data from here
/** /**
* Gets the cards. * Gets the cards.
@@ -332,13 +331,12 @@ public class QuestController {
} }
return this.challengesManager; return this.challengesManager;
} }
public QuestPetStorage getPetsStorage() { public QuestPetStorage getPetsStorage() {
if ( this.pets == null ) { if (this.pets == null) {
this.pets = new QuestPetStorage(ForgeProps.getFile(NewConstants.Quest.BAZAAR)); this.pets = new QuestPetStorage(ForgeProps.getFile(NewConstants.Quest.BAZAAR));
} }
return this.pets; return this.pets;
} }