Revision: 2208
          http://vexi.svn.sourceforge.net/vexi/?rev=2208&view=rev
Author:   mkpg2
Date:     2007-09-15 10:35:11 -0700 (Sat, 15 Sep 2007)

Log Message:
-----------
Fix. Forgot to remove ':' when setting id'd box to a property.

Modified Paths:
--------------
    trunk/core/org.vexi.core/src/org/vexi/core/Template.java

Modified: trunk/core/org.vexi.core/src/org/vexi/core/Template.java
===================================================================
--- trunk/core/org.vexi.core/src/org/vexi/core/Template.java    2007-09-15 
16:52:24 UTC (rev 2207)
+++ trunk/core/org.vexi.core/src/org/vexi/core/Template.java    2007-09-15 
17:35:11 UTC (rev 2208)
@@ -198,7 +198,7 @@
                        if(valStr.length()>0 && valStr.charAt(0)==':'){
                                String str=valStr.substring(1);
                                if(str.startsWith("$")){
-                                       val = pis.get(val);
+                                       val = pis.get(JSU.S(str));
                                }else{
                                                String[] ab = 
str.split("\\.",2);
                                                val = (JS) 
uriPrefixes.get(JSU.S(ab[0]), true);
@@ -210,19 +210,6 @@
                                if(val==null) throw new JSExn(valStr + " 
evaluates to null");
                        }
                        }
-                               
-                       if (JSU.isString(val) && (JSU.toString(val).length() > 
0)) {
-                               switch (JSU.toString(val).charAt(0)) {
-                               case '$':
-                                       val = pis.get(val);
-                                       if (val == null) throw new 
JSExn("unknown box id '"+JSU.toString(vals[i])+"' referenced in XML attribute");
-                                       break;
-                               case '.':
-                                       val = Vexi.resolveString(vexi, 
JSU.toString(val).substring(1), false);
-                                       // FIXME: url case
-                                       // FIXME: should we be resolving all of 
these in the XML-parsing code?
-                               }
-                       }
                        b.putAndTriggerTraps(key, val);
                }
                


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

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn

Reply via email to