add more attribute validators

Signed-off-by: Stefan Niederhauser <[email protected]>

Author: nidi3

graphviz-java/src/main/java/guru/nidi/graphviz/attribute/SingleAttributes.java

@@ -20,18 +20,18 @@
 
 class SingleAttributes<T, F extends For> implements Attributes<F> {
     protected final String key;
-    protected final T value;
+    public final T value;
 
     protected SingleAttributes(String key, T value) {
         this.key = key;
         this.value = value;
     }
 
-    public <E> E key(String key) {
+    protected <E> E key(String key) {
         return newInstance(key, value);
     }
 
-    public <E> E value(T value) {
+    protected <E> E value(T value) {
         return newInstance(key, value);
     }
 

graphviz-java/src/main/java/guru/nidi/graphviz/attribute/validate/AnyDatatype.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2015 Stefan Niederhauser ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package guru.nidi.graphviz.attribute.validate;
+
+class AnyDatatype extends Datatype {
+    AnyDatatype(String name) {
+        super(name);
+    }
+
+    @Override
+    ValidatorMessage validate(Object value) {
+        return null;
+    }
+}

graphviz-java/src/main/java/guru/nidi/graphviz/attribute/validate/ArrowDatatype.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright © 2015 Stefan Niederhauser ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package guru.nidi.graphviz.attribute.validate;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static guru.nidi.graphviz.attribute.validate.ValidatorMessage.Severity.ERROR;
+import static java.util.Arrays.asList;
+
+class ArrowDatatype extends Datatype {
+    ArrowDatatype() {
+        super("arrow");
+    }
+
+    @Override
+    ValidatorMessage validate(Object value) {
+        return new ArrowTypeValidator(value).validate();
+    }
+
+    static class ArrowTypeValidator {
+        private static final Set<Shape> SHAPES = new HashSet<>(asList(
+                new Shape("box", true, true), new Shape("crow", true, false), new Shape("curve", true, false),
+                new Shape("icurve", true, false), new Shape("diamond", true, true), new Shape("dot", false, true),
+                new Shape("inv", true, true), new Shape("none", false, false), new Shape("normal", true, true),
+                new Shape("tee", true, false), new Shape("vee", true, false)));
+
+        private final String s;
+        private int pos;
+
+        ArrowTypeValidator(Object value) {
+            s = value.toString();
+            pos = 0;
+        }
+
+        ValidatorMessage validate() {
+            int shapes = 0;
+            do {
+                final ValidatorMessage message = validateShape();
+                if (message != null) {
+                    return message;
+                }
+                shapes++;
+            } while (pos < s.length() && shapes < 4);
+            if (pos < s.length() - 1) {
+                return new ValidatorMessage(ERROR, "More than 4 shapes in '" + s + "'.");
+            }
+            if (shapes > 1 && s.endsWith("none")) {
+                return new ValidatorMessage(ERROR, "Last shape cannot be 'none' in '" + s + "'.");
+            }
+            return null;
+        }
+
+        private ValidatorMessage validateShape() {
+            boolean o = false;
+            if (pos < s.length() && s.charAt(pos) == 'o') {
+                o = true;
+                pos++;
+            }
+            boolean lr = false;
+            if (pos < s.length() && (s.charAt(pos) == 'l' || s.charAt(pos) == 'r')) {
+                lr = true;
+                pos++;
+            }
+            return validateShape(o, lr);
+        }
+
+        private ValidatorMessage validateShape(boolean o, boolean lr) {
+            final Shape shape = findShape();
+            if (shape == null) {
+                return new ValidatorMessage(ERROR, "Unknown shape '" + s.substring(pos) + "'.");
+            }
+            if (o && !shape.o) {
+                return new ValidatorMessage(ERROR, "Shape '" + shape.name + "' is not allowed a 'o' prefix.");
+            }
+            if (lr && !shape.lr) {
+                return new ValidatorMessage(ERROR, "Shape '" + shape.name + "' is not allowed a 'l'/'r' prefix.");
+            }
+            return null;
+        }
+
+        private Shape findShape() {
+            for (final Shape shape : SHAPES) {
+                if (s.substring(pos, Math.min(s.length(), pos + shape.name.length())).equals(shape.name)) {
+                    pos += shape.name.length();
+                    return shape;
+                }
+            }
+            return null;
+        }
+
+        static class Shape {
+            final String name;
+            final boolean lr;
+            final boolean o;
+
+            Shape(String name, boolean lr, boolean o) {
+                this.name = name;
+                this.lr = lr;
+                this.o = o;
+            }
+        }
+    }
+}

graphviz-java/src/main/java/guru/nidi/graphviz/attribute/validate/ArrowTypeValidator.java

@@ -56,25 +56,25 @@ static List<AttributeConfig> get(String name) {
         add("concentrate", entry("G", BOOL, false));
         add("constraint", entry("E", BOOL, true).engines(DOT));
         add("decorate", entry("E", BOOL, false));
-        add("defaultdist", entry("G", DOUBLE, "1+(avg. len)*sqrt(|V|)", EPSILON).engines(NEATO));
+        add("defaultdist", entry("G", DOUBLE, "1+(avg. len)*sqrt(|V|)", EPSILON).engines(NEATO)); //TODO
         add("dim", entry("G", INT, 2, 2.0).engines(SFDP, FDP, NEATO));
         add("dimen", entry("G", INT, 2, 2.0).engines(SFDP, FDP, NEATO));
-        add("dir", entry("E", DIR_TYPE, "forward(directed)<BR>none(undirected)"));
+        add("dir", entry("E", DIR_TYPE, "forward(directed)<BR>none(undirected)")); //TODO
         add("diredgeconstraints", entry("G", asList(STRING, BOOL), false).engines(NEATO));
         add("distortion", entry("N", DOUBLE, 0.0, -100.0));
         add("dpi", entry("G", DOUBLE, 72.0).formats(SVG, BITMAP));
         add("edgeURL", entry("E", ESC_STRING, "").formats(SVG, MAP));
         add("edgehref", entry("E", ESC_STRING, "").formats(SVG, MAP));
         add("edgetarget", entry("E", ESC_STRING).formats(SVG, MAP));
         add("edgetooltip", entry("E", ESC_STRING, "").formats(SVG, CMAP));
-        add("epsilon", entry("G", DOUBLE, ".0001 * # nodes(mode == KK)<BR>.0001(mode == major)").engines(NEATO));
-        add("esep", entry("G", asList(ADD_DOUBLE, ADD_POINT), "+3").engines(NOT_DOT));
-        add("fillcolor", entry("NEC", asList(COLOR, COLOR_LIST), "lightgrey(nodes)<BR>black(clusters"));
+        add("epsilon", entry("G", DOUBLE, ".0001 * # nodes(mode == KK)<BR>.0001(mode == major)").engines(NEATO)); //TODO
+        add("esep", entry("G", asList(ADD_DOUBLE, ADD_POINT), "+3").engines(NOT_DOT)); //TODO
+        add("fillcolor", entry("NEC", asList(COLOR, COLOR_LIST), "lightgrey(nodes)<BR>black(clusters")); //TODO
         add("fixedsize", entry("N", asList(BOOL, STRING), false));
         add("fontcolor", entry("ENGC", COLOR, "black"));
-        add("fontname", entry("ENGC", STRING, "Times-Roman"));
+        add("fontname", entry("ENGC", STRING, "Times-Roman")); //TODO
         add("fontnames", entry("G", STRING, "").formats(SVG));
-        add("fontpath", entry("G", STRING, "system-dependent"));
+        add("fontpath", entry("G", STRING, "system-dependent")); //TODO
         add("fontsize", entry("ENGC", DOUBLE, 14.0, 1.0));
         add("forcelabels", entry("G", BOOL, true));
         add("gradientangle", entry("NCG", INT, 0));
@@ -95,37 +95,38 @@ static List<AttributeConfig> get(String name) {
         add("imagepos", entry("N", STRING, "mc"));
         add("imagescale", entry("N", BOOL, false));
         add("inputscale", entry("G", DOUBLE).engines(FDP, NEATO));
-        add("label", entry("ENGC", LBL_STRING, "\\N(nodes)<BR>''(otherwise)"));
+        add("label", entry("ENGC", LBL_STRING, "\\N(nodes)<BR>''(otherwise)")); //TODO
         add("labelURL", entry("E", ESC_STRING, "").formats(SVG, MAP));
         add("label_scheme", entry("G", INT, 0, 0.0).engines(SFDP));
         add("labelangle", entry("E", DOUBLE, -25.0, -180.0));
         add("labeldistance", entry("E", DOUBLE, 1.0, 0.0));
         add("labelfloat", entry("E", BOOL, false));
         add("labelfontcolor", entry("E", COLOR, "black"));
-        add("labelfontname", entry("E", STRING, "Times-Roman"));
+        add("labelfontname", entry("E", STRING, "Times-Roman")); //TODO
         add("labelfontsize", entry("E", DOUBLE, 14.0, 1.0));
         add("labelhref", entry("E", ESC_STRING, "").formats(SVG, MAP));
         add("labeljust", entry("GC", STRING, "c"));
-        add("labelloc", entry("NGC", STRING, "'t'(clusters)<BR>'b'(root graphs)<BR>'c'(nodes)"));
+        add("labelloc", entry("NGC", STRING, "'t'(clusters)<BR>'b'(root graphs)<BR>'c'(nodes)")); //TODO
         add("labeltarget", entry("E", ESC_STRING).formats(SVG, MAP));
         add("labeltooltip", entry("E", ESC_STRING, "").formats(SVG, CMAP));
         add("landscape", entry("G", BOOL, false));
         add("layer", entry("ENC", LAYER_RANGE, ""));
         add("layerlistsep", entry("G", STRING, ","));
         add("layers", entry("G", LAYER_LIST, ""));
         add("layerselect", entry("G", LAYER_RANGE, ""));
-        add("layersep", entry("G", STRING, ":\\t"));
+        add("layersep", entry("G", STRING, ":\\t")); //TODO
         add("layout", entry("G", STRING, ""));
-        add("len", entry("E", DOUBLE, "1.0(neato)<BR>0.3(fdp)").engines(FDP, NEATO));
+        add("len", entry("E", DOUBLE, "1.0(neato)<BR>0.3(fdp)").engines(FDP, NEATO)); //TODO
         add("levels", entry("G", INT, Integer.MAX_VALUE, 0.0).engines(SFDP));
         add("levelsgap", entry("G", DOUBLE, 0.0).engines(NEATO));
         add("lhead", entry("E", STRING, "").engines(DOT));
         add("lheight", entry("GC", DOUBLE).formats(WRITE));
         add("lp", entry("EGC", POINT).formats(WRITE));
         add("ltail", entry("E", STRING, "").engines(DOT));
         add("lwidth", entry("GC", DOUBLE).formats(WRITE));
-        add("margin", entry("NCG", asList(DOUBLE, POINT), "&#60;device-dependent&#62;"));
+        add("margin", entry("NCG", asList(DOUBLE, POINT), "&#60;device-dependent&#62;")); //TODO
         add("maxiter", entry("G", INT, "100 nodes(mode == KK)<BR>200(mode == major)<BR>600(fdp)").engines(FDP, NEATO));
+        //TODO
         add("mclimit", entry("G", DOUBLE, 1.0).engines(DOT));
         add("mindist", entry("G", DOUBLE, 1.0, 0.0).engines(CIRCO));
         add("minlen", entry("E", INT, 1, 0.0).engines(DOT));
@@ -146,37 +147,39 @@ static List<AttributeConfig> get(String name) {
         add("outputorder", entry("G", OUTPUT_MODE, "breadthfirst"));
         add("overlap", entry("G", asList(STRING, BOOL), true).engines(NOT_DOT));
         add("overlap_scaling", entry("G", DOUBLE, -4.0, -1.0e10)); //TODO prism only
-        add("overlap_shrink", entry("G", BOOL, true)); //TOOO prism only
+        add("overlap_shrink", entry("G", BOOL, true)); //TODO prism only
         add("pack", entry("G", asList(BOOL, INT), false));
         add("packmode", entry("G", PACK_MODE, "node"));
         add("pad", entry("G", asList(DOUBLE, POINT), 0.0555));
         add("page", entry("G", asList(DOUBLE, POINT)));
         add("pagedir", entry("G", PAGE_DIR, "BL"));
         add("pencolor", entry("C", COLOR, "black"));
         add("penwidth", entry("CNE", DOUBLE, 1.0, 0.0));
-        add("peripheries", entry("NC", INT, "shape default(nodes)<BR>1(clusters)", 0.0));
+        add("peripheries", entry("NC", INT, "shape default(nodes)<BR>1(clusters)", 0.0)); //TODO
         add("pin", entry("N", BOOL, false).engines(FDP, NEATO));
         add("pos", entry("EN", asList(POINT, SPLINE_TYPE)));
         add("quadtree", entry("G", asList(QUAD_TYPE, BOOL), "normal").engines(SFDP));
         add("quantum", entry("G", DOUBLE, 0.0, 0.0));
         add("rank", entry("S", RANK_TYPE).engines(DOT));
         add("rankdir", entry("G", RANK_DIR, "TB").engines(DOT));
         add("ranksep", entry("G", asList(DOUBLE, DOUBLE_LIST), "0.5(dot)<BR>1.0(twopi)", 0.02).engines(TWOPI, DOT));
+        //TODO
         add("ratio", entry("G", asList(DOUBLE, STRING)));
         add("rects", entry("N", RECT).formats(WRITE));
         add("regular", entry("N", BOOL, false));
         add("remincross", entry("G", BOOL, true).engines(DOT));
         add("repulsiveforce", entry("G", DOUBLE, 1.0, 0.0).engines(SFDP));
         add("resolution", entry("G", DOUBLE, 72.0).formats(SVG, BITMAP));
         add("root", entry("GN", asList(STRING, BOOL), "&#60;none&#62;(graphs)<BR>false(nodes)").engines(CIRCO, TWOPI));
+        //TODO
         add("rotate", entry("G", INT, 0));
         add("rotation", entry("G", DOUBLE, 0).engines(SFDP));
         add("samehead", entry("E", STRING, "").engines(DOT));
         add("sametail", entry("E", STRING, "").engines(DOT));
-        add("samplepoints", entry("N", INT, "8(output)<BR>20(overlap and image maps)"));
+        add("samplepoints", entry("N", INT, "8(output)<BR>20(overlap and image maps)")); //TODO
         add("scale", entry("G", asList(DOUBLE, POINT)).engines(NOT_DOT));
         add("searchsize", entry("G", INT, 30).engines(DOT));
-        add("sep", entry("G", asList(ADD_DOUBLE, ADD_POINT), "+4").engines(NOT_DOT));
+        add("sep", entry("G", asList(ADD_DOUBLE, ADD_POINT), "+4").engines(NOT_DOT)); //TODO
         add("shape", entry("N", SHAPE, "ellipse"));
         add("shapefile", entry("N", STRING, ""));
         add("showboxes", entry("ENG", INT, 0, 0.0).engines(DOT));