Fix #1612 UnsupportedOperationException: 'commlist' is not a sortable column (int[])

eduramiba · eduramiba · commit ecbe7bf50566 · 2016-11-07T22:53:06.000+01:00
Fix #1607 Dynamic node attribute (from csv file) causes unexpected exception
diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AppearanceModelImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AppearanceModelImpl.java
@@ -531,9 +531,9 @@ private void refreshAttributeFunctions(boolean graphHasChanged) {
                     }
                     if (isRanking(graph, column)) {
                         if (column.isIndexed()) {
-                            ranking = new AttributeRankingImpl(column, getIndex(localScale));
+                            ranking = new AttributeRankingImpl(column, graph, getIndex(localScale));
                         } else {
-                            ranking = new AttributeRankingImpl(column, graph);
+                            ranking = new AttributeRankingImpl(column, graph, null);
                         }
                         rankings.put(getIdCol(column), ranking);
                     }
@@ -685,7 +685,7 @@ private boolean isRanking(Graph graph, Column column) {
                     return true;
                 }
             }
-        } else if (!column.isDynamic() && column.isIndexed() && column.isNumber()) {
+        } else if (!column.isDynamic() && !column.isArray() && column.isIndexed() && column.isNumber()) {
             Index index;
             if (AttributeUtils.isNodeColumn(column)) {
                 index = localScale ? graphModel.getNodeIndex(graph.getView()) : graphModel.getNodeIndex();
diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AttributeRankingImpl.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/AttributeRankingImpl.java
@@ -24,23 +24,16 @@ public class AttributeRankingImpl extends RankingImpl {
     protected final Column column;
     protected final Graph graph;
 
-    public AttributeRankingImpl(Column column, Index index) {
-        super();
-        this.column = column;
-        this.index = index;
-        this.graph = null;
-    }
-
-    public AttributeRankingImpl(Column column, Graph graph) {
+    public AttributeRankingImpl(Column column, Graph graph, Index index) {
         super();
         this.column = column;
         this.graph = graph;
-        this.index = null;
+        this.index = index;
     }
 
     @Override
     protected void refresh() {
-        if (index != null) {
+        if (index != null && index.isSortable(column)) {
             min = index.getMinValue(column);
             max = index.getMaxValue(column);
         } else {
diff --git a/modules/AppearanceAPI/src/main/nbm/manifest.mf b/modules/AppearanceAPI/src/main/nbm/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 AutoUpdate-Essential-Module: true
 OpenIDE-Module-Localizing-Bundle: org/gephi/appearance/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.9.1.4
+OpenIDE-Module-Specification-Version: 0.9.1.5
 OpenIDE-Module-Display-Category: Gephi Core
 OpenIDE-Module-Name: Appearance API
diff --git a/modules/GraphAPI/pom.xml b/modules/GraphAPI/pom.xml
@@ -23,7 +23,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>graphstore</artifactId>
-            <version>${graphstore.version}</version>
         </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
diff --git a/modules/GraphAPI/src/main/nbm/manifest.mf b/modules/GraphAPI/src/main/nbm/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module-Localizing-Bundle: org/gephi/graph/api/Bundle.properties
 AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 0.9.1.1
+OpenIDE-Module-Specification-Version: 0.9.1.2
 OpenIDE-Module-Display-Category: Gephi Core
 OpenIDE-Module-Name: Graph API
diff --git a/pom.xml b/pom.xml
@@ -134,7 +134,7 @@
         <netbeans.version>RELEASE81</netbeans.version>
         
         <!-- Graphstore version -->
-        <graphstore.version>0.5.3</graphstore.version>
+        <graphstore.version>0.5.4</graphstore.version>
 
         <!-- Localization ZIP version, from 'http://netbeans.org/project_downloads/nblocalization' -->
         <gephi.platform.localization.version>1.1-NB80</gephi.platform.localization.version>
@@ -394,6 +394,11 @@
                 <version>${netbeans.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>graphstore</artifactId>
+                <version>${graphstore.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>gephi-branding</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -531,9 +531,9 @@ private void refreshAttributeFunctions(boolean graphHasChanged) {`
`531`	`531`	`}`
`532`	`532`	`if (isRanking(graph, column)) {`
`533`	`533`	`if (column.isIndexed()) {`
`534`		`- ranking = new AttributeRankingImpl(column, getIndex(localScale));`
	`534`	`+ ranking = new AttributeRankingImpl(column, graph, getIndex(localScale));`
`535`	`535`	`} else {`
`536`		`- ranking = new AttributeRankingImpl(column, graph);`
	`536`	`+ ranking = new AttributeRankingImpl(column, graph, null);`
`537`	`537`	`}`
`538`	`538`	`rankings.put(getIdCol(column), ranking);`
`539`	`539`	`}`
`@@ -685,7 +685,7 @@ private boolean isRanking(Graph graph, Column column) {`
`685`	`685`	`return true;`
`686`	`686`	`}`
`687`	`687`	`}`
`688`		`- } else if (!column.isDynamic() && column.isIndexed() && column.isNumber()) {`
	`688`	`+ } else if (!column.isDynamic() && !column.isArray() && column.isIndexed() && column.isNumber()) {`
`689`	`689`	`Index index;`
`690`	`690`	`if (AttributeUtils.isNodeColumn(column)) {`
`691`	`691`	`index = localScale ? graphModel.getNodeIndex(graph.getView()) : graphModel.getNodeIndex();`