moved BNF parser to separate package

Author: Igor Polevoy

javalite-templator/src/main/java/org/javalite/templator/AbstractTag.java

@@ -26,6 +26,7 @@
  */
 public abstract class AbstractTag extends TemplateToken {
 
+    private ThreadLocal<Map<String, Method>> methodCache = new ThreadLocal<Map<String, Method>>();
     private String argumentLine, body, tagName, matchingEnd = null;
     private int tagStartIndex = -1, tagEndIndex = -1, argumentsEndIndex = -1;
 
@@ -179,9 +180,6 @@ public boolean marchArgumentEnd(String template, int index) {
         return false;
     }
 
-
-    private ThreadLocal<Map<String, Method>> methodCache = new ThreadLocal<Map<String, Method>>();
-
     /**
      * Tries to get a property value from object.
      *
@@ -202,18 +200,22 @@ protected final Object getValue(Object obj, String propertyName) throws Invocati
         //try map
         if (obj instanceof Map) {
             Map objectMap = (Map) obj;
-            val = objectMap.get(propertyName);
+            return objectMap.get(propertyName);
         }
 
         if (val == null) {
             //try properties
             val = executeMethod(obj, "get" + capitalize(propertyName), null);
+            if(val != null)
+                return val;
         }
 
 
         //try generic get method
         if (val == null) {
             val = executeMethod(obj, "get", propertyName);
+            if(val != null)
+                return val;
         }
 
 
@@ -223,6 +225,8 @@ protected final Object getValue(Object obj, String propertyName) throws Invocati
                 //TODO: optimize the same as methods.
                 Field f = obj.getClass().getDeclaredField(propertyName);
                 val = f.get(obj);
+                if(val != null)
+                    return val;
 
             } catch (NoSuchFieldException ignore) {
             } catch (IllegalAccessException ignore) {

javalite-templator/src/main/java/org/javalite/templator/StringToken.java

@@ -1,5 +1,7 @@
 package org.javalite.templator;
 
+import org.javalite.templator.TemplateToken;
+
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Map;

javalite-templator/src/main/java/org/javalite/templator/AndExp.java renamed to javalite-templator/src/main/java/org/javalite/templator/template_parser/AndExp.java

@@ -1,4 +1,4 @@
-package org.javalite.templator;
+package org.javalite.templator.template_parser;
 
 import java.util.Map;
 

javalite-templator/src/main/java/org/javalite/templator/BooleanId.java renamed to javalite-templator/src/main/java/org/javalite/templator/template_parser/BooleanId.java

@@ -1,4 +1,4 @@
-package org.javalite.templator;
+package org.javalite.templator.template_parser;
 
 import java.util.Map;
 import org.javalite.common.Convert;

javalite-templator/src/main/java/org/javalite/templator/ChainedIds.java renamed to javalite-templator/src/main/java/org/javalite/templator/template_parser/ChainedIds.java

@@ -1,4 +1,6 @@
-package org.javalite.templator;
+package org.javalite.templator.template_parser;
+
+import org.javalite.templator.TemplateException;
 
 import java.util.List;
 import java.util.Map;

javalite-templator/src/main/java/org/javalite/templator/Comparison.java renamed to javalite-templator/src/main/java/org/javalite/templator/template_parser/Comparison.java

@@ -1,4 +1,4 @@
-package org.javalite.templator;
+package org.javalite.templator.template_parser;
 
 import java.util.Map;
 

javalite-templator/src/main/java/org/javalite/templator/ConstNode.java renamed to javalite-templator/src/main/java/org/javalite/templator/template_parser/ConstNode.java

@@ -1,4 +1,4 @@
-package org.javalite.templator;
+package org.javalite.templator.template_parser;
 
 import java.io.IOException;
 import java.util.Map;

javalite-templator/src/main/java/org/javalite/templator/Exp.java renamed to javalite-templator/src/main/java/org/javalite/templator/template_parser/Exp.java

@@ -1,4 +1,4 @@
-package org.javalite.templator;
+package org.javalite.templator.template_parser;
 
 import java.util.Map;
 

javalite-templator/src/main/java/org/javalite/templator/ForNode.java renamed to javalite-templator/src/main/java/org/javalite/templator/template_parser/ForNode.java

@@ -1,4 +1,4 @@
-package org.javalite.templator;
+package org.javalite.templator.template_parser;
 
 import java.io.IOException;
 import java.util.HashMap;

javalite-templator/src/main/java/org/javalite/templator/IfNode.java renamed to javalite-templator/src/main/java/org/javalite/templator/template_parser/IfNode.java

@@ -1,4 +1,4 @@
-package org.javalite.templator;
+package org.javalite.templator.template_parser;
 
 import java.io.IOException;
 import java.util.Map;