Author: bpoussin Date: 2012-01-08 00:23:26 +0100 (Sun, 08 Jan 2012) New Revision: 1303 Url: http://nuiton.org/repositories/revision/wikitty/1303 Log: move String transformation to Element static method Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java 2012-01-07 21:36:11 UTC (rev 1302) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java 2012-01-07 23:23:26 UTC (rev 1303) @@ -236,20 +236,7 @@ * @return */ protected Element toElement(String v) { - Element result; - if (Element.ID.getValue().equalsIgnoreCase(v)) { - result = Element.ID; - } else if (Element.EXTENSION.getValue().equalsIgnoreCase(v)) { - result = Element.EXTENSION; - } else if (Element.NODE_ROOT.getValue().equalsIgnoreCase(v)) { - result = Element.NODE_ROOT; - } else if (Element.NODE_PATH.getValue().equalsIgnoreCase(v)) { - result = Element.NODE_PATH; - } else if (Element.NODE_DEPTH.getValue().equalsIgnoreCase(v)) { - result = Element.NODE_DEPTH; - } else { - result = new ElementField(v); - } + Element result = Element.get(v); return result; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java 2012-01-07 21:36:11 UTC (rev 1302) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java 2012-01-07 23:23:26 UTC (rev 1303) @@ -66,6 +66,24 @@ this.value = value; } + public static Element get(String v) { + Element result; + if (Element.ID.getValue().equalsIgnoreCase(v)) { + result = Element.ID; + } else if (Element.EXTENSION.getValue().equalsIgnoreCase(v)) { + result = Element.EXTENSION; + } else if (Element.NODE_ROOT.getValue().equalsIgnoreCase(v)) { + result = Element.NODE_ROOT; + } else if (Element.NODE_PATH.getValue().equalsIgnoreCase(v)) { + result = Element.NODE_PATH; + } else if (Element.NODE_DEPTH.getValue().equalsIgnoreCase(v)) { + result = Element.NODE_DEPTH; + } else { + result = new ElementField(v); + } + return result; + } + public String getValue() { return value; }