[pcgen-commit-svn] SF.net SVN: pcgen:[11185]

[<jde...@us...>]

Revision: 11185
          http://pcgen.svn.sourceforge.net/pcgen/?rev=11185&view=rev
Author:   jdempsey
Date:     2009-12-12 23:09:06 +0000 (Sat, 12 Dec 2009)

Log Message:
-----------
Fix bug: HTM Exporter Showing htm tags instead of converting
Issue#: 2913021

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/io/exporttoken/EqToken.java
    branches/5.16.x/pcgen/code/src/java/pcgen/io/exporttoken/EqToken.java

Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/EqToken.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/EqToken.java	2009-12-12 22:40:46 UTC (rev 11184)
+++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/EqToken.java	2009-12-12 23:09:06 UTC (rev 11185)
@@ -45,6 +45,7 @@
 import pcgen.core.SettingsHandler;
 import pcgen.core.analysis.OutputNameFormatting;
 import pcgen.io.ExportHandler;
+import pcgen.io.FileAccess;
 import pcgen.util.BigDecimalHelper;
 
 /**
@@ -238,7 +239,7 @@
 		if ((temp >= 0) && (temp < eqList.size()))
 		{
 			Equipment eq = eqList.get(temp);
-			retString = getEqToken(pc, eq, tempString, aTok);
+			retString = FileAccess.filterString(getEqToken(pc, eq, tempString, aTok));
 
 			// Starting EQ.%.NAME.MAGIC,befTrue,aftTrue,befFalse,aftFalse treatment
 			if (!"".equals(bFilter))
@@ -295,7 +296,7 @@
 	@Override
 	public boolean isEncoded()
 	{
-		return true;
+		return false;
 	}
 
 	/**

Modified: branches/5.16.x/pcgen/code/src/java/pcgen/io/exporttoken/EqToken.java
===================================================================
--- branches/5.16.x/pcgen/code/src/java/pcgen/io/exporttoken/EqToken.java	2009-12-12 22:40:46 UTC (rev 11184)
+++ branches/5.16.x/pcgen/code/src/java/pcgen/io/exporttoken/EqToken.java	2009-12-12 23:09:06 UTC (rev 11185)
@@ -44,6 +44,7 @@
 import pcgen.core.SettingsHandler;
 import pcgen.core.analysis.OutputNameFormatting;
 import pcgen.io.ExportHandler;
+import pcgen.io.FileAccess;
 import pcgen.util.BigDecimalHelper;
 
 /**
@@ -237,7 +238,7 @@
 		if ((temp >= 0) && (temp < eqList.size()))
 		{
 			Equipment eq = eqList.get(temp);
-			retString = getEqToken(pc, eq, tempString, aTok);
+			retString = FileAccess.filterString(getEqToken(pc, eq, tempString, aTok));
 
 			// Starting EQ.%.NAME.MAGIC,befTrue,aftTrue,befFalse,aftFalse treatment
 			if (!"".equals(bFilter))
@@ -294,7 +295,7 @@
 	@Override
 	public boolean isEncoded()
 	{
-		return true;
+		return false;
 	}
 
 	/**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.