[pcgen-commit-svn] SF.net SVN: pcgen:[10869] Trunk/pcgen/code/src/java/pcgen/persistence/lst

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

Revision: 10869
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10869&view=rev
Author:   jdempsey
Date:     2009-10-31 07:17:21 +0000 (Sat, 31 Oct 2009)

Log Message:
-----------
Fix bug: Tab on blank line in class file reports an error
Issue#: 2826872

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstObjectFileLoader.java
    Trunk/pcgen/code/src/java/pcgen/persistence/lst/PCClassLoader.java

Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstObjectFileLoader.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstObjectFileLoader.java	2009-10-31 07:14:24 UTC (rev 10868)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstObjectFileLoader.java	2009-10-31 07:17:21 UTC (rev 10869)
@@ -419,6 +419,10 @@
 			{
 				SourceLoader.parseLine(context, line, uri);
 			}
+			else if (line.trim().length()==0)
+			{
+				// Ignore the line
+			}
 			else if (firstToken.indexOf(COPY_SUFFIX) > 0)
 			{
 				copyLineList.add(new ModEntry(sourceEntry, line,

Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/PCClassLoader.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/PCClassLoader.java	2009-10-31 07:14:24 UTC (rev 10868)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/PCClassLoader.java	2009-10-31 07:17:21 UTC (rev 10869)
@@ -31,11 +31,9 @@
 import pcgen.cdom.enumeration.ObjectKey;
 import pcgen.cdom.inst.PCClassLevel;
 import pcgen.core.PCClass;
-import pcgen.core.PObject;
 import pcgen.core.SubClass;
 import pcgen.core.SubstitutionClass;
 import pcgen.core.analysis.PCClassKeyChange;
-import pcgen.core.prereq.Prerequisite;
 import pcgen.persistence.PersistenceLayerException;
 import pcgen.persistence.SystemLoader;
 import pcgen.persistence.lst.utils.DeferredLine;
@@ -268,7 +266,7 @@
 			Logging.errorPrint("Expected a level value, but got '"
 					+ lineIdentifier + "' instead (as a level line in "
 					+ pcClass.getKeyName() + ") in source " + source.getURI());
-			Logging.errorPrint("  Rest of line was: + " + restOfLine);
+			Logging.errorPrint("  Rest of line was: " + restOfLine);
 		}
 	}
 


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