From 8fc3cae722a1ca4ac34f4176954c92c621a1d532 Mon Sep 17 00:00:00 2001
From: David Riccitelli <david@insideout.io>
Date: Tue, 20 Feb 2018 12:46:15 +0100
Subject: [PATCH 1/2] see #199: add support for attr.name and attr.type

---
 .../edu/uci/ics/jung/io/GraphMLMetadata.java  | 19 ++++++++-
 .../edu/uci/ics/jung/io/GraphMLWriter.java    | 42 +++++++++++++++++--
 .../ics/jung/io/graphml/AttributeType.java    | 20 +++++++++
 3 files changed, 76 insertions(+), 5 deletions(-)
 create mode 100644 jung-io/src/main/java/edu/uci/ics/jung/io/graphml/AttributeType.java

diff --git a/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLMetadata.java b/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLMetadata.java
index 8ad62f4fa..8b04edf7d 100644
--- a/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLMetadata.java
+++ b/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLMetadata.java
@@ -8,6 +8,8 @@
  */
 package edu.uci.ics.jung.io;
 
+import edu.uci.ics.jung.io.graphml.AttributeType;
+
 import java.util.function.Function;
 
 /**
@@ -24,6 +26,10 @@ public class GraphMLMetadata<T> {
   /** A Function mapping objects to string representations of their values. */
   public Function<T, String> transformer;
 
+  public String attributeName;
+
+  public AttributeType attributeType;
+
   /**
    * Creates a new instance with the specified description, default value, and function.
    *
@@ -31,9 +37,20 @@ public class GraphMLMetadata<T> {
    * @param default_value the default value for the object, as a String
    * @param function maps objects of this type to string representations
    */
-  public GraphMLMetadata(String description, String default_value, Function<T, String> function) {
+  public GraphMLMetadata(
+      String description,
+      String default_value,
+      Function<T, String> function,
+      String attributeName,
+      AttributeType attributeType) {
     this.description = description;
     this.transformer = function;
     this.default_value = default_value;
+    this.attributeName = attributeName;
+    this.attributeType = attributeType;
+  }
+
+  public GraphMLMetadata(String description, String default_value, Function<T, String> function) {
+    this(description, default_value, function, null, null);
   }
 }
diff --git a/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLWriter.java b/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLWriter.java
index 7b88e1f8d..b068fefa7 100644
--- a/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLWriter.java
+++ b/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLWriter.java
@@ -13,6 +13,9 @@
 
 import com.google.common.graph.EndpointPair;
 import com.google.common.graph.Network;
+import edu.uci.ics.jung.io.graphml.AttributeType;
+
+import java.beans.XMLEncoder;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.Writer;
@@ -211,6 +214,11 @@ protected void writeEdgeData(Network<N, E> g, Writer w) throws IOException {
   protected void writeKeySpecification(
       String key, String type, GraphMLMetadata<?> ds, BufferedWriter bw) throws IOException {
     bw.write("<key id=\"" + key + "\" for=\"" + type + "\"");
+
+    if (null != ds.attributeName)
+      bw.write(" attr.name=\"" + ds.attributeName.replace("\"", "&quot;") + "\"");
+    if (null != ds.attributeType) bw.write(" attr.type=\"" + ds.attributeType.getValue() + "\"");
+
     boolean closed = false;
     // write out description if any
     String desc = ds.description;
@@ -318,11 +326,24 @@ public void addGraphData(
    * @param node_transformer a mapping from nodes to their string representations
    */
   public void addNodeData(
-      String id, String description, String default_value, Function<N, String> node_transformer) {
+      String id,
+      String description,
+      String default_value,
+      Function<N, String> node_transformer,
+      String attributeName,
+      AttributeType attributeType) {
     if (node_data.equals(Collections.EMPTY_MAP)) {
       node_data = new HashMap<String, GraphMLMetadata<N>>();
     }
-    node_data.put(id, new GraphMLMetadata<N>(description, default_value, node_transformer));
+    node_data.put(
+        id,
+        new GraphMLMetadata<N>(
+            description, default_value, node_transformer, attributeName, attributeType));
+  }
+
+  public void addNodeData(
+      String id, String description, String default_value, Function<N, String> node_transformer) {
+    addNodeData(id, description, default_value, node_transformer, null, null);
   }
 
   /**
@@ -334,11 +355,24 @@ public void addNodeData(
    * @param edge_transformer a mapping from edges to their string representations
    */
   public void addEdgeData(
-      String id, String description, String default_value, Function<E, String> edge_transformer) {
+      String id,
+      String description,
+      String default_value,
+      Function<E, String> edge_transformer,
+      String attributeName,
+      AttributeType attributeType) {
     if (edge_data.equals(Collections.EMPTY_MAP)) {
       edge_data = new HashMap<String, GraphMLMetadata<E>>();
     }
-    edge_data.put(id, new GraphMLMetadata<E>(description, default_value, edge_transformer));
+    edge_data.put(
+        id,
+        new GraphMLMetadata<E>(
+            description, default_value, edge_transformer, attributeName, attributeType));
+  }
+
+  public void addEdgeData(
+      String id, String description, String default_value, Function<E, String> edge_transformer) {
+    addEdgeData(id, description, default_value, edge_transformer, null, null);
   }
 
   /**
diff --git a/jung-io/src/main/java/edu/uci/ics/jung/io/graphml/AttributeType.java b/jung-io/src/main/java/edu/uci/ics/jung/io/graphml/AttributeType.java
new file mode 100644
index 000000000..4a8e96606
--- /dev/null
+++ b/jung-io/src/main/java/edu/uci/ics/jung/io/graphml/AttributeType.java
@@ -0,0 +1,20 @@
+package edu.uci.ics.jung.io.graphml;
+
+public enum AttributeType {
+  BOOLEAN("boolean"),
+  INT("int"),
+  LONG("long"),
+  FLOAT("float"),
+  DOUBLE("double"),
+  STRING("string");
+
+  private final String value;
+
+  AttributeType(String value) {
+    this.value = value;
+  }
+
+  public String getValue() {
+    return value;
+  }
+}

From f2577f221690168646ffd44ca89dd4687c4f9923 Mon Sep 17 00:00:00 2001
From: David Riccitelli <david@insideout.io>
Date: Tue, 20 Feb 2018 16:49:44 +0100
Subject: [PATCH 2/2] see #199: remove unused import; add braces

---
 .../main/java/edu/uci/ics/jung/io/GraphMLMetadata.java |  1 -
 .../main/java/edu/uci/ics/jung/io/GraphMLWriter.java   | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLMetadata.java b/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLMetadata.java
index 8b04edf7d..267bbeabc 100644
--- a/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLMetadata.java
+++ b/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLMetadata.java
@@ -9,7 +9,6 @@
 package edu.uci.ics.jung.io;
 
 import edu.uci.ics.jung.io.graphml.AttributeType;
-
 import java.util.function.Function;
 
 /**
diff --git a/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLWriter.java b/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLWriter.java
index b068fefa7..3a9197217 100644
--- a/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLWriter.java
+++ b/jung-io/src/main/java/edu/uci/ics/jung/io/GraphMLWriter.java
@@ -14,8 +14,6 @@
 import com.google.common.graph.EndpointPair;
 import com.google.common.graph.Network;
 import edu.uci.ics.jung.io.graphml.AttributeType;
-
-import java.beans.XMLEncoder;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.Writer;
@@ -215,9 +213,13 @@ protected void writeKeySpecification(
       String key, String type, GraphMLMetadata<?> ds, BufferedWriter bw) throws IOException {
     bw.write("<key id=\"" + key + "\" for=\"" + type + "\"");
 
-    if (null != ds.attributeName)
+    if (null != ds.attributeName) {
       bw.write(" attr.name=\"" + ds.attributeName.replace("\"", "&quot;") + "\"");
-    if (null != ds.attributeType) bw.write(" attr.type=\"" + ds.attributeType.getValue() + "\"");
+    }
+
+    if (null != ds.attributeType) {
+      bw.write(" attr.type=\"" + ds.attributeType.getValue() + "\"");
+    }
 
     boolean closed = false;
     // write out description if any