[pcgen-commit-svn] SF.net SVN: pcgen:[20151] Trunk/pcgen/code/src/java/pcgen/io/ExportHandler. java

[<za...@us...>]

Revision: 20151
          http://sourceforge.net/p/pcgen/code/20151
Author:   zaister
Date:     2013-05-14 12:03:15 +0000 (Tue, 14 May 2013)
Log Message:
-----------
Changed syntax for output sheet FOR statement loop variable extension from %var.MAX to %var!MAX to preserve unique meaning of the dot and to avoid replacement problems (%var.MIN and %var.STEP affected int he same way).

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java

Modified: Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java	2013-05-14 11:35:53 UTC (rev 20150)
+++ Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java	2013-05-14 12:03:15 UTC (rev 20151)
@@ -936,14 +936,14 @@
 				int maxValue = getVarValue(maxString, aPC);
 				int stepValue = getVarValue(stepString, aPC);
 				String var = nextFor.var();
-				loopParameters.put(var + ".MIN", minValue);
-				loopParameters.put(var + ".MAX", maxValue);
-				loopParameters.put(var + ".STEP", stepValue);
+				loopParameters.put(var + "!MIN", minValue);
+				loopParameters.put(var + "!MAX", maxValue);
+				loopParameters.put(var + "!STEP", stepValue);
 
 				loopFOR(nextFor, minValue, maxValue, stepValue, output, fa, aPC);
-				loopParameters.remove(var + ".MIN");
-				loopParameters.remove(var + ".MAX");
-				loopParameters.remove(var + ".STEP");
+				loopParameters.remove(var + "!MIN");
+				loopParameters.remove(var + "!MAX");
+				loopParameters.remove(var + "!STEP");
 
 				existsOnly = nextFor.exists();
 				loopVariables.remove(nextFor.var());
@@ -1035,14 +1035,14 @@
 				final int varMax = getVarValue(maxString, aPC);
 				final int varStep = getVarValue(stepString, aPC);
 				String var = nextFor.var();
-				loopParameters.put(var + ".MIN", varMin);
-				loopParameters.put(var + ".MAX", varMax);
-				loopParameters.put(var + ".STEP", varMax);
+				loopParameters.put(var + "!MIN", varMin);
+				loopParameters.put(var + "!MAX", varMax);
+				loopParameters.put(var + "!STEP", varMax);
 				
 				loopFOR(nextFor, varMin, varMax, varStep, output, fa, aPC);
-				loopParameters.remove(var + ".MIN");
-				loopParameters.remove(var + ".MAX");
-				loopParameters.remove(var + ".STEP");
+				loopParameters.remove(var + "!MIN");
+				loopParameters.remove(var + "!MAX");
+				loopParameters.remove(var + "!STEP");
 
 				existsOnly = node.exists();
 				loopVariables.remove(nextFor.var());

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