Skip to content

Commit 5340522

Browse files
authored
much better handling of .INFO. label for export.
* support for INFO token export * Support CASTERLEVEL for PC * simplify code * Better support for .INFO. export
1 parent 9e0c2cf commit 5340522

1 file changed

Lines changed: 20 additions & 8 deletions

File tree

code/src/java/pcgen/io/ExportHandler.java

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,7 @@
3232
import java.text.DecimalFormat;
3333
import java.text.DecimalFormatSymbols;
3434
import java.text.ParseException;
35-
import java.util.ArrayList;
36-
import java.util.Collection;
37-
import java.util.Comparator;
38-
import java.util.HashMap;
39-
import java.util.List;
40-
import java.util.Locale;
41-
import java.util.Map;
42-
import java.util.StringTokenizer;
35+
import java.util.*;
4336
import java.util.regex.Matcher;
4437
import java.util.regex.Pattern;
4538
import pcgen.cdom.base.CDOMObject;
@@ -1615,6 +1608,25 @@ else if (tokenString.startsWith("CSHEETTAG2."))
16151608
FileAccess.maxLength(-1);
16161609
return 0;
16171610
}
1611+
else if (tokenString.indexOf(".INFO.")>-1) {
1612+
List<? extends CDOMObject> plist = aPC.getCDOMObjectList();
1613+
String v = tokenString;
1614+
for (String key : TOKEN_MAP.keySet()) {
1615+
Token token = TOKEN_MAP.get(key);
1616+
for (CDOMObject cd : plist) {
1617+
if (cd instanceof PObject) {
1618+
PObject po = (PObject) cd;
1619+
v = token.getInfoToken(tokenString, po);
1620+
if (!v.equals(tokenString)) {
1621+
FileAccess.encodeWrite(output, v);
1622+
break;
1623+
}
1624+
}
1625+
}
1626+
if (!v.equals(tokenString))
1627+
break;
1628+
}
1629+
}
16181630
// Else if the token is in the list of valid output tokens
16191631
else if (TOKEN_MAP.get(firstToken) != null)
16201632
{

0 commit comments

Comments
 (0)