From 665bb60ef28267cf76f9d33bb5b351c88f5a52c3 Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 2 Jan 2016 03:10:22 +0000 Subject: [PATCH] Fix so array indices can be saved to XML --- forge-gui/src/main/java/forge/util/XmlReader.java | 2 +- forge-gui/src/main/java/forge/util/XmlWriter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/util/XmlReader.java b/forge-gui/src/main/java/forge/util/XmlReader.java index 55050b99077..97c1eda823f 100644 --- a/forge-gui/src/main/java/forge/util/XmlReader.java +++ b/forge-gui/src/main/java/forge/util/XmlReader.java @@ -85,7 +85,7 @@ public class XmlReader { @Override public Void evaluate() { try { - Integer arrayIndex = Integer.valueOf(currentElement.getTagName()); + Integer arrayIndex = Integer.valueOf(currentElement.getTagName().substring(1)); //trim "i" prefix if (arrayIndex >= 0 && arrayIndex < array.length) { V value = builder.evaluate(); if (value != null) { diff --git a/forge-gui/src/main/java/forge/util/XmlWriter.java b/forge-gui/src/main/java/forge/util/XmlWriter.java index d20e4d8b4d0..cb80e37e2a4 100644 --- a/forge-gui/src/main/java/forge/util/XmlWriter.java +++ b/forge-gui/src/main/java/forge/util/XmlWriter.java @@ -88,7 +88,7 @@ public class XmlWriter { public void write(String key, IXmlWritable[] value) { startElement(key); for (int i = 0; i < value.length; i++) { - write(String.valueOf(i), value[i]); + write("i" + i, value[i]); //must prefix with "i" since numbers are invalid XML tag names } endElement(); }