dive4elements/river: artifacts/src/main/java/org/dive4elements/river/exports/DiagramAttributes.java comparison

comparison artifacts/src/main/java/org/dive4elements/river/exports/DiagramAttributes.java @ 7160:f2ffa631c2ed

Diagram attributes: Use evaluators for title arguments, too. This makes it more consistent, powerful and a little bit faster.

author	Sascha L. Teichmann <teichmann@intevation.de>
date	Thu, 26 Sep 2013 12:56:37 +0200
parents	053e39436ba3
children	0e1191e34b5f

comparison

equal deleted inserted replaced

-:1508ee33f85f
+:f2ffa631c2ed
 }
 } // class Instance
 public static class AxisAttributes {
 private String  name;
-private boolean isLeftAlign;
+private boolean isLeftAlign; // TODO: Remove!
-private boolean forceAlign;
+private boolean forceAlign;  // TODO: Remove!
-private boolean includeZero;
+private boolean includeZero; // TODO: Use Evaluator
 private Evaluator isInverted;
 public AxisAttributes() {
 }
 return null;
 }
 } // class AxisProcessor
-public static class Argument {
+public abstract static class ConvertEvaluator
-private String expression;
+implements Evaluator
-private String type;
+{
+protected String key;
-public Argument() {
+protected String type;
-}
+public ConvertEvaluator() {
-public Argument(String expression, String type) {
+}
-this.expression = expression;
+public ConvertEvaluator(String key, String type) {
+this.key  = key;
 this.type = type;
 }
+protected Object convert(Object value) {
+if (value == null || type == null || type.isEmpty()) {
+return value;
+}
+if (value instanceof String) {
+String v = (String)value;
+if ("double".equals(type)) {
+return Double.valueOf(v);
+}
+if ("int".equals(type)) {
+return Integer.valueOf(v);
+}
+if ("string".equals(type)) {
+return v;
+}
+}
+// TODO: Support more types
+return value;
+}
+} // class ConvertEvaluator
+public static class ContextEvaluator extends ConvertEvaluator {
+public ContextEvaluator() {
+}
+public ContextEvaluator(String key, String type) {
+super(key, type);
+}
+@Override
 public Object evaluate(D4EArtifact artifact, CallContext context) {
-if (expression.startsWith("artifact.")) {
+return convert(context.getContextValue(key));
-String value = artifact.getDataAsString(
+}
-expression.substring("artifact.".length()));
+} // class ContextEvaluator
-return convert(value);
-}
+public static class ArtifactEvaluator extends ConvertEvaluator {
-if (expression.startsWith("context.")) {
-return context.getContextValue(
+public ArtifactEvaluator() {
-expression.substring("context.".length()));
+}
-}
-return expression;
+public ArtifactEvaluator(String key, String type) {
-}
+super(key, type);
+}
-private Object convert(String value) {
-if (value == null || type == null) {
+@Override
-return value;
+public Object evaluate(D4EArtifact artifact, CallContext context) {
-}
+return convert(artifact.getDataAsString(key));
-if ("double".equals(type)) {
+}
-return Double.valueOf(value);
+} // class ContextEvaluator
-}
-if ("int".equals(type)) {
+public static class StringEvaluator implements Evaluator {
-return Integer.valueOf(value);
-}
+private String value;
-// TODO: more types
+public StringEvaluator() {
+}
+public StringEvaluator(String value) {
+this.value = value;
+}
+@Override
+public Object evaluate(D4EArtifact artifact, CallContext context) {
 return value;
 }
-} // class Argument
+} // class StringEvaluator
 public static class Title {
 private String key;
 private String def;
-private List<Argument> arguments;
+private List<Evaluator> arguments;
 public Title() {
-arguments = new ArrayList<Argument>(5);
+arguments = new ArrayList<Evaluator>(5);
 }
 public Title(String key) {
 this(key, key);
 }
 public String getKey() {
 return key;
 }
-public void addArgument(Argument argument) {
+public void addArgument(Evaluator argument) {
 arguments.add(argument);
 }
 public String evaluate(D4EArtifact artifact, CallContext context) {
 if (key == null || key.isEmpty()) {
 includeZero.equals("true"),
 isInvertedE));
 }
 }
-private Evaluator parseEvaluator(String s, Evaluator def) {
+private static Evaluator createDynamicEvaluator(
+String    className,
+Evaluator def
+) {
+try {
+Class<Evaluator> clazz = (Class<Evaluator>)Class.forName(className);
+return clazz.newInstance();
+}
+catch (ClassNotFoundException cnfe) {
+log.error(cnfe, cnfe);
+}
+catch (InstantiationException ie) {
+log.error(ie, ie);
+}
+catch (IllegalAccessException iae) {
+log.error(iae, iae);
+}
+return def;
+}
+private static Evaluator parseEvaluator(String s, Evaluator def) {
 if ((s = s.trim()).isEmpty()) return def;
 if ("true".equals(s)) return TRUE;
 if ("false".equals(s)) return FALSE;
 if (s.endsWith("()")) {
-s = s.substring(0, s.length()-2).trim();
+return createDynamicEvaluator(
-try {
+s.substring(0, s.length()-2).trim(),
-Class<Evaluator> clazz = (Class<Evaluator>)Class.forName(s);
+def);
-return clazz.newInstance();
-}
-catch (ClassNotFoundException cnfe) {
-log.error(cnfe, cnfe);
-}
-catch (InstantiationException ie) {
-log.error(ie, ie);
-}
-catch (IllegalAccessException iae) {
-log.error(iae, iae);
-}
 }
 return def;
 }
 public List<AxisProcessor> getAxesProcessors() {
 domainAxis = new DomainAxisAttributes(
 "X",
 false,
 false,
-false,
+includeZero.equals("true"),
 parseEvaluator(isInverted, FALSE),
 title);
 }
 private static Title extractTitle(Element config, String tagName) {
 NodeList argumentNodes = titleElement.getElementsByTagName("arg");
 for (int i = 0, N = argumentNodes.getLength(); i < N; ++i) {
 Element argumentElement = (Element)argumentNodes.item(i);
 String expression = argumentElement.getAttribute("expr");
 String type = argumentElement.getAttribute("type");
-title.addArgument(new Argument(expression, type));
+Evaluator ev = new StringEvaluator(expression);
+if (expression.endsWith("()")) {
+ev = createDynamicEvaluator(
+expression.substring(0, expression.length()-2).trim(),
+ev);
+}
+else if (expression.startsWith("artifact.")) {
+ev = new ArtifactEvaluator(
+expression.substring("artifact.".length()), type);
+}
+else if (expression.startsWith("context.")) {
+ev = new ContextEvaluator(
+expression.substring("context.".length()), type);
+}
+title.addArgument(ev);
 }
 return title;
 }
 public int getAxisIndex(String axisName) {

Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/exports/DiagramAttributes.java @ 7160:f2ffa631c2ed