Fix attribute value import in GEXF

modules/ImportAPI/src/main/java/org/gephi/io/importer/impl/ElementDraftImpl.java

@@ -213,7 +213,7 @@ public abstract class ElementDraftImpl implements ElementDraft {
 
     @Override
     public void parseAndSetValue(String key, String value) {
-        ColumnDraft column = getColumn(key, value.getClass());
+        ColumnDraft column = getColumn(key);
         Object val = AttributeUtils.parse(value, column.getTypeClass());
         setAttributeValue(((ColumnDraftImpl) column).getIndex(), val);
     }
@@ -225,7 +225,7 @@ public abstract class ElementDraftImpl implements ElementDraft {
 
     @Override
     public void parseAndSetValue(String key, String value, double timestamp) {
-        ColumnDraft column = getColumn(key, value.getClass());
+        ColumnDraft column = getColumn(key);
         Object val = AttributeUtils.parse(value, column.getTypeClass());
         setAttributeValue(((ColumnDraftImpl) column).getIndex(), val, timestamp);
     }

modules/ImportPlugin/src/main/java/org/gephi/io/importer/plugin/file/ImporterGEXF.java

@@ -386,6 +386,7 @@ public class ImporterGEXF implements FileImporter, LongTask {
             //Data attribute value
             ColumnDraft column = container.getNodeColumn(fore);
             if (column != null) {
+                node.parseAndSetValue(column.getId(), value);
 //                if (!startDate.isEmpty() || !endDate.isEmpty()) {
 //                    //Dynamic
 //                    try {
@@ -698,6 +699,10 @@ public class ImporterGEXF implements FileImporter, LongTask {
         }
 
         if (!value.isEmpty()) {
+            ColumnDraft column = container.getEdgeColumn(fore);
+            if (column != null) {
+                edge.parseAndSetValue(column.getId(), value);
+            }
 //            //Data attribute value
 //            AttributeColumn column = container.getAttributeModel().getEdgeTable().getColumn(fore);
 //            if (column != null) {
@@ -846,7 +851,6 @@ public class ImporterGEXF implements FileImporter, LongTask {
             title = id;
         }
 
-
         if (!id.isEmpty() && !type.isEmpty()) {
             //Class type
             if (classAtt.isEmpty() || !(classAtt.equalsIgnoreCase("node") || classAtt.equalsIgnoreCase("edge"))) {