Python to Java string formatting

Author: kevinlano

BasicExpression.java

@@ -6773,6 +6773,14 @@ else if (data.equals("$fin") && parameters.size() > 0)
       { return "new Date()"; }
     } 
 
+    if (data.equals("formattedString") && 
+        "StringLib".equals(objectRef + ""))
+    { Expression par = (Expression) parameters.get(0); 
+      String pqf = par.queryForm(env,local); 
+      String cmd = "(new Object() { public String call(Object _x) { return " + Expression.formattedString(pqf) + "; } }).call(this)";
+      return cmd; 
+    } 
+
 
     if (umlkind == VALUE || umlkind == CONSTANT)
     { if (data.equals("Set{}") || data.equals("Sequence{}"))
@@ -7335,6 +7343,14 @@ public String queryFormJava6(java.util.Map env, boolean local)
       { return "new Date()"; }
     } 
 
+    if (data.equals("formattedString") && 
+        "StringLib".equals(objectRef + ""))
+    { Expression par = (Expression) parameters.get(0); 
+      String pqf = par.queryFormJava6(env,local); 
+      String cmd = "(new Object() { public String call(Object _x) { return " + Expression.formattedString(pqf) + "; } }).call(this)";
+      return cmd; 
+    } 
+
     if (type != null && type.isEnumeration() && 
         type.hasValue(data))
     { return type.getName() + "." + data; } 

Expression.java

@@ -265,21 +265,25 @@ public static String formattedString(String f)
     boolean inElement = false;
     boolean inFormat = false;
     String var = "";   
+    String fmt = "";   
     for (int i = 0; i < f.length(); i++) 
     { char c = f.charAt(i); 
       if (inElement) 
       { if (':' == c) 
-        { res = res + "\" + " + var + " + \""; 
-          var = ""; 
+        { fmt = ""; 
           inFormat = true; 
         } 
         else if ('}' == c)
-        { inElement = false;
+        { if ("".equals(fmt))
+          { fmt = "s"; } 
+          res = res + "\" + String.format(\"%" + fmt + "\", " + var + ") + \""; 
+          inElement = false;
           inFormat = false;  
           var = ""; 
+          fmt = ""; 
         } 
         else if (inFormat) 
-        { } // skip the format
+        { fmt = fmt + c; } // skip the format
         else 
         { var = var + c; } // var name character
       }