Changeset 1003

Timestamp:

2008-12-30 09:47:51 (4 years ago)

Author:

bruno

Message:

spell check: litteral -> literal

Location:

trunk/universe/kauri-template/src/main/java/org/kauriproject/template/el

Files:

• ELFacade.java (modified) (3 diffs)
• LiteralExpression.java (moved) (moved from trunk/universe/kauri-template/src/main/java/org/kauriproject/template/el/LitteralExpression.java) (1 diff)

trunk/universe/kauri-template/src/main/java/org/kauriproject/template/el/ELFacade.java

@@ -56 +56 @@
         int brace = expression.indexOf('{', start);
         if (start < 0 || brace < 0) {
-            // not a valid expression: parse as litteral
-            cex.add(new LitteralExpression(sanitize(expression), expectedType));
+            // not a valid expression: parse as literal
+            cex.add(new LiteralExpression(sanitize(expression), expectedType));
         } else {
             String id = null;
             if (start > 0) {
-                cex.add(new LitteralExpression(sanitize(expression.substring(0, start)), expectedType));
+                cex.add(new LiteralExpression(sanitize(expression.substring(0, start)), expectedType));
             }
             id = expression.substring(start + 1, brace);
             int end = getEndPosition(expression, brace + 1);
             if (id.length() > Expression.ID_MAX_LENGTH || id.contains(" ") || end < 0) {
-                // not a valid expression, parse start as litteral
-                cex.add(new LitteralExpression(expression.substring(start, start + 1), expectedType));
+                // not a valid expression, parse start as literal
+                cex.add(new LiteralExpression(expression.substring(start, start + 1), expectedType));
                 // try to parse rest of the expression
                 parseExpression(expression.substring(start + 1), expectedType, cex);
@@ -81 +81 @@
                 } else {
                     log.warn("expression type '" + id + "' not supported");
-                    cex.add(new LitteralExpression(sanitize(expression.substring(start, end + 1)),
+                    cex.add(new LiteralExpression(sanitize(expression.substring(start, end + 1)),
                             expectedType));
                 }
@@ -130 +130 @@
      * Remove escape characters.
      */
-    private String sanitize(String litteral) {
-        return litteral.replaceAll("\\\\([$#])", "$1");
+    private String sanitize(String literal) {
+        return literal.replaceAll("\\\\([$#])", "$1");
     }
 

trunk/universe/kauri-template/src/main/java/org/kauriproject/template/el/LiteralExpression.java

@@ -19 +19 @@
 
 /**
- * Implementation of a litteral expression.
+ * Implementation of a literal expression.
  */
-public class LitteralExpression implements Expression {
+public class LiteralExpression implements Expression {
 
     private Object expression;
 
-    public LitteralExpression(String expression, Class<?> expectedType) {
+    public LiteralExpression(String expression, Class<?> expectedType) {
         if (expectedType.equals(Boolean.class)) {
             this.expression = Boolean.parseBoolean(expression);