diff --git a/src/main/java/forge/quest/io/QuestDataIO.java b/src/main/java/forge/quest/io/QuestDataIO.java index 62ee3e13514..8a00c35095a 100644 --- a/src/main/java/forge/quest/io/QuestDataIO.java +++ b/src/main/java/forge/quest/io/QuestDataIO.java @@ -121,7 +121,7 @@ public class QuestDataIO { } zin.close(); - + data = (QuestData) getSerializer(true).fromXML(xml.toString()); if (data.getVersionNumber() != QuestData.CURRENT_VERSION_NUMBER) { @@ -140,7 +140,7 @@ public class QuestDataIO { field.setAccessible(true); field.set(instance, newValue); // no difference here (used only to set initial lives) } - + /** *
* updateSaveFile.
@@ -158,16 +158,16 @@ public class QuestDataIO {
is.setCharacterStream(new StringReader(input));
final Document document = builder.parse(is);
- final int saveVersion = newData.getVersionNumber();
-
- if( saveVersion < 3 ) {
+ final int saveVersion = newData.getVersionNumber();
+
+ if (saveVersion < 3) {
// no difference here (used only to set initial lives)
- setFinalField(QuestData.class, "assets", newData, new QuestAssets(QuestMode.Classic));
+ setFinalField(QuestData.class, "assets", newData, new QuestAssets(QuestMode.Classic));
int diffIdx = Integer.parseInt(document.getElementsByTagName("diffIndex").item(0).getTextContent());
- setFinalField(QuestData.class, "achievements", newData, new QuestAchievements(diffIdx));
+ setFinalField(QuestData.class, "achievements", newData, new QuestAchievements(diffIdx));
}
-
+
switch (saveVersion) {
// There should be a fall-through b/w the cases so that each
// version's changes get applied progressively
@@ -194,13 +194,13 @@ public class QuestDataIO {
case 1:
// nothing to do here, everything is managed by CardPoolToXml
// deserializer
-
+
case 2:
if (StringUtils.isBlank(newData.getName())) {
setFinalField(QuestData.class, "name", newData, "questData");
}
-
- QuestAchievements qA = newData.getAchievements();
+
+ QuestAchievements qA = newData.getAchievements();
setFinalField(QuestAchievements.class, "win", qA, Integer.parseInt(document.getElementsByTagName("win").item(0).getTextContent()));
setFinalField(QuestAchievements.class, "lost", qA, Integer.parseInt(document.getElementsByTagName("lost").item(0).getTextContent()));
setFinalField(QuestAchievements.class, "winstreakBest", qA, Integer.parseInt(document.getElementsByTagName("winstreakBest").item(0).getTextContent()));
@@ -209,15 +209,17 @@ public class QuestDataIO {
ArrayList
* saveData.
@@ -266,7 +267,7 @@ public class QuestDataIO {
try {
final XStream xStream = getSerializer(false);
- final File f = new File(ForgeProps.getFile(NewConstants.Quest.DATA_DIR), qd.getName() );
+ final File f = new File(ForgeProps.getFile(NewConstants.Quest.DATA_DIR), qd.getName());
savePacked(f + ".dat", xStream, qd);
saveUnpacked(f + ".xml", xStream, qd);
@@ -281,15 +282,14 @@ public class QuestDataIO {
final GZIPOutputStream zout = new GZIPOutputStream(bout);
xStream.toXML(qd, zout);
zout.flush();
- zout.close();
+ zout.close();
}
-
-
+
private static void saveUnpacked(String f, XStream xStream, QuestData qd) throws IOException {
BufferedOutputStream boutUnp = new BufferedOutputStream(new FileOutputStream(f));
xStream.toXML(qd, boutUnp);
boutUnp.flush();
- boutUnp.close();
+ boutUnp.close();
}
/**
diff --git a/src/main/java/forge/view/ViewBazaarUI.java b/src/main/java/forge/view/ViewBazaarUI.java
index 852dd77776f..2716b4518ec 100644
--- a/src/main/java/forge/view/ViewBazaarUI.java
+++ b/src/main/java/forge/view/ViewBazaarUI.java
@@ -25,7 +25,7 @@ public class ViewBazaarUI extends FPanel {
private final QuestStallManager bazaar;
/** Lays out containers and borders for resizeable layout and
- * instantiates top-level controller for bazaar UI.
+ * instantiates top-level controller for bazaar UI.
* @param bazaar0 */
public ViewBazaarUI(QuestStallManager bazaar0) {
super();
@@ -33,7 +33,7 @@ public class ViewBazaarUI extends FPanel {
// Final inits
this.pnlAllStalls = new JPanel();
this.pnlSingleStall = new ViewStall(this);
- this.bazaar = bazaar0;
+ this.bazaar = bazaar0;
// Component styling
this.setCornerDiameter(0);
@@ -56,7 +56,7 @@ public class ViewBazaarUI extends FPanel {
/** */
public void populateStalls() {
for (final String s : bazaar.getStallNames()) {
-
+
final FLabel lbl = new FLabel.Builder().text(s + " ")
.fontAlign(SwingConstants.RIGHT).iconInBackground(true)
.fontScaleFactor(0.3).opaque(true).hoverable(true)
diff --git a/src/main/java/forge/view/bazaar/ViewStall.java b/src/main/java/forge/view/bazaar/ViewStall.java
index cf9cb844fb0..d1dbc7475c9 100644
--- a/src/main/java/forge/view/bazaar/ViewStall.java
+++ b/src/main/java/forge/view/bazaar/ViewStall.java
@@ -146,7 +146,7 @@ public class ViewStall extends JPanel {
if (AllZone.getQuest().getAssets() == null) { return; }
QuestAssets qS = AllZone.getQuest().getAssets();
- this.lblStats.setText( "Credits: " + qS.getCredits() + " Life: " + qS.getLife());
+ this.lblStats.setText("Credits: " + qS.getCredits() + " Life: " + qS.getLife());
final List