From ab0d0e80036c2b8731b203208a879cb25189d9a5 Mon Sep 17 00:00:00 2001
From: Mathieu Bastian <mathieu.bastian@gmail.com>
Date: Thu, 26 Nov 2015 14:16:00 +0100
Subject: [PATCH] Minor IO fixes

---
 .../java/org/gephi/io/exporter/plugin/ExporterGDF.java |  4 ++--
 .../org/gephi/io/exporter/plugin/ExporterGraphML.java  |  6 ++----
 .../gephi/io/importer/plugin/file/ImporterGEXF.java    | 10 +++++-----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/ExportPlugin/src/main/java/org/gephi/io/exporter/plugin/ExporterGDF.java b/modules/ExportPlugin/src/main/java/org/gephi/io/exporter/plugin/ExporterGDF.java
index 7aaabcafd..db6fb5a18 100644
--- a/modules/ExportPlugin/src/main/java/org/gephi/io/exporter/plugin/ExporterGDF.java
+++ b/modules/ExportPlugin/src/main/java/org/gephi/io/exporter/plugin/ExporterGDF.java
@@ -320,7 +320,7 @@ public class ExporterGDF implements GraphExporter, CharacterExporter, LongTask {
         List<Column> cols = new ArrayList<Column>();
         if (exportAttributes && graphModel != null) {
             for (Column column : graphModel.getNodeTable()) {
-                if (!isNodeDefaultColumn(column.getId())) {
+                if (!column.isProperty() && !isNodeDefaultColumn(column.getId())) {
                     cols.add(column);
                 }
             }
@@ -332,7 +332,7 @@ public class ExporterGDF implements GraphExporter, CharacterExporter, LongTask {
         List<Column> cols = new ArrayList<Column>();
         if (exportAttributes && graphModel != null) {
             for (Column column : graphModel.getEdgeTable()) {
-                if (!isEdgeDefaultColumn(column.getId())) {
+                if (!column.isProperty() && !isEdgeDefaultColumn(column.getId())) {
                     cols.add(column);
                 }
             }
diff --git a/modules/ExportPlugin/src/main/java/org/gephi/io/exporter/plugin/ExporterGraphML.java b/modules/ExportPlugin/src/main/java/org/gephi/io/exporter/plugin/ExporterGraphML.java
index 8e87b0980..1092ad84b 100644
--- a/modules/ExportPlugin/src/main/java/org/gephi/io/exporter/plugin/ExporterGraphML.java
+++ b/modules/ExportPlugin/src/main/java/org/gephi/io/exporter/plugin/ExporterGraphML.java
@@ -441,10 +441,8 @@ public class ExporterGraphML implements GraphExporter, CharacterExporter, LongTa
         edgeE.setAttribute("source", e.getSource().getId().toString());
         edgeE.setAttribute("target", e.getTarget().getId().toString());
 
-        if (e.getId() != null && !e.getId().toString().isEmpty() && !String.valueOf(e.getId()).equals(e.getId())) {
-            Element idE = createEdgeId(document, e);
-            edgeE.appendChild(idE);
-        }
+        Element idE = createEdgeId(document, e);
+        edgeE.appendChild(idE);
 
         //Label
         if (e.getLabel() != null && !e.getLabel().isEmpty()) {
diff --git a/modules/ImportPlugin/src/main/java/org/gephi/io/importer/plugin/file/ImporterGEXF.java b/modules/ImportPlugin/src/main/java/org/gephi/io/importer/plugin/file/ImporterGEXF.java
index 40140380a..ed616bee0 100644
--- a/modules/ImportPlugin/src/main/java/org/gephi/io/importer/plugin/file/ImporterGEXF.java
+++ b/modules/ImportPlugin/src/main/java/org/gephi/io/importer/plugin/file/ImporterGEXF.java
@@ -931,9 +931,9 @@ public class ImporterGEXF implements FileImporter, LongTask {
             //Type
             Class attributeType = String.class;
             if (type.equalsIgnoreCase("boolean") || type.equalsIgnoreCase("bool")) {
-                attributeType = boolean.class;
+                attributeType = Boolean.class;
             } else if (type.equalsIgnoreCase("integer") || type.equalsIgnoreCase("int")) {
-                attributeType = int.class;
+                attributeType = Integer.class;
             } else if (type.equalsIgnoreCase("long")) {
                 attributeType = Long.class;
             } else if (type.equalsIgnoreCase("float")) {
@@ -948,13 +948,13 @@ public class ImporterGEXF implements FileImporter, LongTask {
                 attributeType = BigInteger.class;
             } else if (type.equalsIgnoreCase("byte")) {
                 attributeType = Byte.class;
-            } else if (type.equalsIgnoreCase("char")) {
+            } else if (type.equalsIgnoreCase("char") || type.equalsIgnoreCase("character")) {
                 attributeType = Character.class;
             } else if (type.equalsIgnoreCase("short")) {
                 attributeType = Short.class;
             } else if (type.equalsIgnoreCase("listboolean")) {
                 attributeType = boolean[].class;
-            } else if (type.equalsIgnoreCase("listint")) {
+            } else if (type.equalsIgnoreCase("listint") || type.equalsIgnoreCase("listinteger")) {
                 attributeType = int[].class;
             } else if (type.equalsIgnoreCase("listlong")) {
                 attributeType = long[].class;
@@ -970,7 +970,7 @@ public class ImporterGEXF implements FileImporter, LongTask {
                 attributeType = BigInteger[].class;
             } else if (type.equalsIgnoreCase("listbyte")) {
                 attributeType = byte[].class;
-            } else if (type.equalsIgnoreCase("listchar")) {
+            } else if (type.equalsIgnoreCase("listchar") || type.equalsIgnoreCase("listcharacter")) {
                 attributeType = char[].class;
             } else if (type.equalsIgnoreCase("listshort")) {
                 attributeType = short[].class;
-- 
GitLab