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

Code cleanup

Browse Source
This commit is contained in:
drdev
2016-01-03 00:15:52 +00:00
parent bbc80914ab
commit 4bc6797992
6 changed files with 13 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java
View File

@@ -26,12 +26,6 @@ public class ConquestDeckEditor extends FDeckEditor {
return false;
}
@Override
public void onActivate() {
super.onActivate();
FModel.getConquest().getModel().updateDecksForEachCard();
}
@Override
protected Map<ColumnDef, ItemColumn> getColOverrides(ItemManagerConfig config) {
return FModel.getConquest().getModel().getColOverrides(config);

2
forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java
View File

@@ -82,7 +82,7 @@ public class ConquestMenu extends FPopupMenu {
@Override
@SuppressWarnings("unchecked")
public void run() {
FModel.getConquest().load(new ConquestData(data));
FModel.getConquest().setModel(new ConquestData(data));
((DeckController<Deck>)EditorType.PlanarConquest.getController()).setRootFolder(FModel.getConquest().getDecks());
if (reason == LaunchReason.StartPlanarConquest) {
Forge.openScreen(multiverseScreen);

4
forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java
View File

@@ -114,10 +114,10 @@ public class LoadConquestScreen extends LaunchScreen {
}
// Drop into AllZone.
qc.load(lstConquests.getSelectedConquest());
qc.setModel(lstConquests.getSelectedConquest());
}
else {
qc.load(null);
qc.setModel(null);
}
Gdx.app.postRunnable(new Runnable() {
@Override

4
forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
View File

@@ -61,9 +61,9 @@ public class NewConquestScreen extends MultiStepWizardScreen<NewConquestScreenMo
@Override
public void run() {
ConquestController qc = FModel.getConquest();
qc.load(new ConquestData(conquestName, model.planeswalker, model.startingPlane, model.startingCommander));
qc.setModel(new ConquestData(conquestName, model.planeswalker, model.startingPlane, model.startingCommander));
qc.getDecks().add(Iterables.getFirst(qc.getModel().getCommanders(), null).getDeck()); //ensure starting deck is saved
qc.save();
qc.getModel().saveData();
// Save in preferences.
FModel.getConquestPreferences().setPref(CQPref.CURRENT_CONQUEST, conquestName + ".dat");

19
forge-gui/src/main/java/forge/planarconquest/ConquestController.java
View File

@@ -65,13 +65,12 @@ public class ConquestController {
public ConquestData getModel() {
return model;
}
public IStorage<Deck> getDecks() {
return decks;
}
public void load(final ConquestData model0) {
public void setModel(final ConquestData model0) {
model = model0;
if (model == null) {
decks = null;
return;
}
File decksDir = new File(model.getDirectory(), "decks");
FileUtil.ensureDirectoryExists(decksDir);
@@ -79,10 +78,8 @@ public class ConquestController {
decks = new StorageImmediatelySerialized<Deck>(model.getName() + " decks", storage);
}
public void save() {
if (model != null) {
model.saveData();
}
public IStorage<Deck> getDecks() {
return decks;
}
public void launchEvent(final IConquestEventLauncher launcher0, final ConquestCommander commander0, final ConquestEvent event0) {
@@ -243,7 +240,7 @@ public class ConquestController {
model.addLoss(gameRunner.event);
}
FModel.getConquest().save();
model.saveData();
FModel.getConquestPreferences().save();
gameRunner.finish();

26
forge-gui/src/main/java/forge/planarconquest/ConquestData.java
View File

@@ -20,7 +20,6 @@ package forge.planarconquest;
import forge.achievement.PlaneswalkerAchievements;
import forge.assets.ISkinImage;
import forge.card.CardDb;
import forge.deck.Deck;
import forge.item.InventoryItem;
import forge.item.PaperCard;
import forge.itemmanager.ColumnDef;
@@ -63,7 +62,6 @@ public final class ConquestData {
private final EnumMap<ConquestPlane, ConquestPlaneData> planeDataMap = new EnumMap<ConquestPlane, ConquestPlaneData>(ConquestPlane.class);
private final HashSet<PaperCard> unlockedCards = new HashSet<PaperCard>();
private final List<ConquestCommander> commanders = new ArrayList<ConquestCommander>();
private final ItemPool<InventoryItem> decksUsingMyCards = new ItemPool<InventoryItem>(InventoryItem.class);
private final HashSet<PaperCard> newCards = new HashSet<PaperCard>();
public ConquestData(String name0, PaperCard planeswalker0, ConquestPlane startingPlane0, PaperCard startingCommander0) {
@@ -245,15 +243,6 @@ public final class ConquestData {
directory.renameTo(new File(ForgeConstants.CONQUEST_SAVE_DIR, name));
}
public void updateDecksForEachCard() {
decksUsingMyCards.clear();
for (final Deck deck : FModel.getConquest().getDecks()) {
for (final Entry<PaperCard, Integer> e : deck.getMain()) {
decksUsingMyCards.add(e.getKey());
}
}
}
public HashSet<PaperCard> getNewCards() {
return newCards;
}
@@ -272,25 +261,10 @@ public final class ConquestData {
return newCards.contains(from.getKey()) ? "NEW" : "";
}
};
private final Function<Entry<InventoryItem, Integer>, Comparable<?>> fnDeckCompare = new Function<Entry<InventoryItem, Integer>, Comparable<?>>() {
@Override
public Comparable<?> apply(final Entry<InventoryItem, Integer> from) {
final Integer iValue = decksUsingMyCards.count(from.getKey());
return iValue == null ? Integer.valueOf(0) : iValue;
}
};
private final Function<Entry<? extends InventoryItem, Integer>, Object> fnDeckGet = new Function<Entry<? extends InventoryItem, Integer>, Object>() {
@Override
public Object apply(final Entry<? extends InventoryItem, Integer> from) {
final Integer iValue = decksUsingMyCards.count(from.getKey());
return iValue == null ? "" : iValue.toString();
}
};
public Map<ColumnDef, ItemColumn> getColOverrides(ItemManagerConfig config) {
Map<ColumnDef, ItemColumn> colOverrides = new HashMap<ColumnDef, ItemColumn>();
ItemColumn.addColOverride(config, colOverrides, ColumnDef.NEW, fnNewCompare, fnNewGet);
ItemColumn.addColOverride(config, colOverrides, ColumnDef.DECKS, fnDeckCompare, fnDeckGet);
return colOverrides;
}