From 09fe386211698bda0118e67730e29781915e078b Mon Sep 17 00:00:00 2001 From: Mathieu Bastian Date: Wed, 9 Dec 2015 13:46:32 +0100 Subject: [PATCH] Exclude default null type from partition if number of elements is zero --- .../org/gephi/appearance/EdgeTypePartitionImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/EdgeTypePartitionImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/EdgeTypePartitionImpl.java index e3f9e986a..28395aea7 100644 --- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/EdgeTypePartitionImpl.java +++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/EdgeTypePartitionImpl.java @@ -41,6 +41,7 @@ */ package org.gephi.appearance; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import org.gephi.graph.api.Column; @@ -66,7 +67,14 @@ public class EdgeTypePartitionImpl extends PartitionImpl { @Override public Collection getValues() { - return Arrays.asList(model.getEdgeTypeLabels()); + Object[] labels = model.getEdgeTypeLabels(); + ArrayList col = new ArrayList(labels.length); + for (Object l : labels) { + if (!(l == null && graph.getEdgeCount(0) == 0)) { + col.add(l); + } + } + return col; } @Override @@ -92,7 +100,8 @@ public class EdgeTypePartitionImpl extends PartitionImpl { @Override public int size() { - return model.getEdgeTypeCount(); + int size = model.getEdgeTypeCount(); + return graph.getEdgeCount(0) == 0 ? size - 1 : size; } @Override -- GitLab