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

Fix XML serialization issue with quest items

Browse Source
This commit is contained in:
drdev
2014-07-18 17:06:14 +00:00
parent 68c0d231b4
commit ac0b532ea1
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
forge-gui/src/main/java/forge/quest/bazaar/QuestItemBasic.java
View File

@@ -45,7 +45,7 @@ public class QuestItemBasic implements IQuestBazaarItem {
* @return the item type * @return the item type
*/ */
public final QuestItemType getItemType() { public final QuestItemType getItemType() {
return this.itemType; return itemType;
} }
@XStreamAsAttribute @XStreamAsAttribute
@@ -65,12 +65,15 @@ public class QuestItemBasic implements IQuestBazaarItem {
* @return the base price * @return the base price
*/ */
protected final int getBasePrice() { protected final int getBasePrice() {
return this.basePrice; return basePrice;
} }
@XStreamAsAttribute @XStreamAsAttribute
private final FSkinProp icon = null; private final FSkinProp icon = null;
protected QuestItemBasic() { //needed for XML serialization
}
/** /**
* <p> * <p>
* Constructor for QuestItemAbstract. * Constructor for QuestItemAbstract.
@@ -79,7 +82,7 @@ public class QuestItemBasic implements IQuestBazaarItem {
* @param type0 the type0 * @param type0 the type0
*/ */
protected QuestItemBasic(final QuestItemType type0) { protected QuestItemBasic(final QuestItemType type0) {
this.itemType = type0; itemType = type0;
} }
/** /**
@@ -88,7 +91,7 @@ public class QuestItemBasic implements IQuestBazaarItem {
* @return a {@link java.lang.String} object. * @return a {@link java.lang.String} object.
*/ */
public final String getName() { public final String getName() {
return this.itemType.getKey(); return itemType.getKey();
} }
/** /**
@@ -98,7 +101,7 @@ public class QuestItemBasic implements IQuestBazaarItem {
*/ */
@Override @Override
public String getPurchaseName() { public String getPurchaseName() {
return StringUtils.isBlank(this.purchaseName) ? this.getName() : this.purchaseName; return StringUtils.isBlank(purchaseName) ? getName() : purchaseName;
} }
/** /**
@@ -108,8 +111,8 @@ public class QuestItemBasic implements IQuestBazaarItem {
*/ */
@Override @Override
public void onPurchase(final QuestAssets qA) { public void onPurchase(final QuestAssets qA) {
final int currentLevel = qA.getItemLevel(this.itemType); final int currentLevel = qA.getItemLevel(itemType);
qA.setItemLevel(this.itemType, currentLevel + 1); qA.setItemLevel(itemType, currentLevel + 1);
} }
/** /**
@@ -122,7 +125,7 @@ public class QuestItemBasic implements IQuestBazaarItem {
*/ */
@Override @Override
public boolean isAvailableForPurchase(final QuestAssets qA) { public boolean isAvailableForPurchase(final QuestAssets qA) {
return qA.getItemLevel(this.itemType) < this.maxLevel; return qA.getItemLevel(itemType) < maxLevel;
} }
/** /**
@@ -133,7 +136,7 @@ public class QuestItemBasic implements IQuestBazaarItem {
* @return a int. * @return a int.
*/ */
public final int getMaxLevel() { public final int getMaxLevel() {
return this.maxLevel; return maxLevel;
} }
/** /**
@@ -144,7 +147,7 @@ public class QuestItemBasic implements IQuestBazaarItem {
* @return a boolean. * @return a boolean.
*/ */
public final boolean isLeveledItem() { public final boolean isLeveledItem() {
return this.maxLevel == 1; return maxLevel == 1;
} }
/** /**
@@ -157,7 +160,7 @@ public class QuestItemBasic implements IQuestBazaarItem {
*/ */
@Override @Override
public String getPurchaseDescription(final QuestAssets qA) { public String getPurchaseDescription(final QuestAssets qA) {
return this.description; return description;
} }
/** /**
@@ -179,7 +182,7 @@ public class QuestItemBasic implements IQuestBazaarItem {
*/ */
@Override @Override
public int getBuyingPrice(final QuestAssets qA) { public int getBuyingPrice(final QuestAssets qA) {
return this.basePrice; return basePrice;
} }
/** /**
@@ -197,6 +200,6 @@ public class QuestItemBasic implements IQuestBazaarItem {
@Override @Override
public final int compareTo(final Object o) { public final int compareTo(final Object o) {
final IQuestBazaarItem q = (IQuestBazaarItem) o; final IQuestBazaarItem q = (IQuestBazaarItem) o;
return this.getPurchaseName().compareTo(q.getPurchaseName()); return getPurchaseName().compareTo(q.getPurchaseName());
} }
} }