Update dependency and some minor code to graphstore 0.4.0

modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/impl/AttributeColumnsControllerImpl.java

@@ -136,7 +136,7 @@ public class AttributeColumnsControllerImpl implements AttributeColumnsControlle
 
     private Column convertColumnToDynamic(Table table, Column column, double low, double high, String newColumnTitle) {
         Class oldType = column.getTypeClass();
-        Class<? extends TimestampMap> newType = AttributeUtils.getDynamicType(oldType);
+        Class<? extends TimestampMap> newType = AttributeUtils.getTimestampMapType(oldType);
 
         if (newColumnTitle != null) {
             if (newColumnTitle.equals(column.getTitle())) {
@@ -939,7 +939,7 @@ public class AttributeColumnsControllerImpl implements AttributeColumnsControlle
             return numbers;
         }
         Number[] dynamicNumbers;
-        dynamicNumbers = (Number[]) dynamicList.toArray();
+        dynamicNumbers = (Number[]) dynamicList.toValuesArray();
         Number n;
         return Arrays.asList(dynamicNumbers);
     }

modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/impl/AttributeColumnsMergeStrategiesControllerImpl.java

@@ -439,7 +439,7 @@ public class AttributeColumnsMergeStrategiesControllerImpl implements AttributeC
 
     /*************Private methods:*************/
     private Column getTimeIntervalColumn(Table table) {
-        Column column = table.getColumn(GraphStoreConfiguration.ELEMENT_TIMESTAMP_INDEX);
+        Column column = table.getColumn(GraphStoreConfiguration.ELEMENT_TIMESET_INDEX);
         if (column == null) {
             column = table.addColumn("timestamp", TimestampSet.class, Origin.PROPERTY);
         }

modules/DynamicAPI/src/main/java/org/gephi/dynamic/utils/DynamicIntervalsParser.java

@@ -268,7 +268,7 @@ public final class DynamicIntervalsParser {
         high = DynamicUtilities.parseTime(values.get(1));
 
         if (type == null) {
-            return new IntervalWithValue(low, high, lopen, ropen, null);
+            return new IntervalWithValue(low, high, null);
         } else {
             Object value = null;
             if (values.size() == 3) {
@@ -291,7 +291,7 @@ public final class DynamicIntervalsParser {
                 value = AttributeUtils.parse(valString, type);
             }
             
-            return new IntervalWithValue(low, high, lopen, ropen, value);
+            return new IntervalWithValue(low, high, value);
         }
     }
 }

modules/DynamicAPI/src/main/java/org/gephi/dynamic/utils/IntervalWithValue.java

@@ -12,11 +12,6 @@ public class IntervalWithValue<T> implements Comparable<IntervalWithValue<T>> {
     private final Interval interval;
     private final T value;
     
-    public IntervalWithValue(double low, double high, boolean lopen, boolean ropen, T value) {
-        this.interval = new Interval(low, high, lopen, ropen);
-        this.value = value;
-    }
-    
     public IntervalWithValue(double low, double high, T value) {
         this.interval = new Interval(low, high);
         this.value = value;
@@ -48,14 +43,6 @@ public class IntervalWithValue<T> implements Comparable<IntervalWithValue<T>> {
         return interval.getHigh();
     }
 
-    public boolean isLowExcluded() {
-        return interval.isLowExcluded();
-    }
-
-    public boolean isHighExcluded() {
-        return interval.isHighExcluded();
-    }
-
     @Override
     public int hashCode() {
         int hash = 5;
@@ -86,7 +73,7 @@ public class IntervalWithValue<T> implements Comparable<IntervalWithValue<T>> {
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append(interval.isLowExcluded() ? '(' : '[');
+        sb.append('[');
         sb.append(interval.getLow());
         sb.append(", ");
         sb.append(interval.getHigh());
@@ -103,7 +90,7 @@ public class IntervalWithValue<T> implements Comparable<IntervalWithValue<T>> {
             }
         }
 
-        sb.append(interval.isHighExcluded() ? ')' : ']');
+        sb.append(']');
 
         return sb.toString();
     }

modules/GraphAPI/pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>graphstore</artifactId>
-            <version>0.3.1</version>
+            <version>0.4.0</version>
         </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>

modules/LayoutPlugin/src/main/java/org/gephi/layout/plugin/force/quadtree/QuadTree.java

@@ -44,11 +44,13 @@ package org.gephi.layout.plugin.force.quadtree;
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import org.gephi.graph.api.Column;
 import org.gephi.graph.api.ColumnIterable;
 import org.gephi.graph.api.Graph;
 import org.gephi.graph.api.GraphView;
+import org.gephi.graph.api.Interval;
 import org.gephi.graph.api.Node;
 import org.gephi.graph.api.NodeProperties;
 import org.gephi.graph.api.TextProperties;
@@ -324,9 +326,9 @@ public class QuadTree implements Node {
 
     @Override
     public ColumnIterable getAttributeColumns() {
-        throw new UnsupportedOperationException("Not supported yet.");
+        throw new UnsupportedOperationException("Not supported.");
     }
-    
+
     @Override
     public Object removeAttribute(String key) {
         throw new UnsupportedOperationException("Not supported.");
@@ -407,6 +409,71 @@ public class QuadTree implements Node {
         throw new UnsupportedOperationException("Not supported.");
     }
 
+    @Override
+    public Object getAttribute(String key, Interval interval) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    @Override
+    public Object getAttribute(Column column, Interval interval) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    @Override
+    public Iterable<Map.Entry> getAttributes(Column column) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    @Override
+    public Object removeAttribute(String key, double timestamp) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    @Override
+    public Object removeAttribute(Column column, double timestamp) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    @Override
+    public Object removeAttribute(String key, Interval interval) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Object removeAttribute(Column column, Interval interval) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    @Override
+    public void setAttribute(String key, Object value, Interval interval) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    @Override
+    public void setAttribute(Column column, Object value, Interval interval) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    @Override
+    public boolean addInterval(Interval interval) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    @Override
+    public boolean removeInterval(Interval interval) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    @Override
+    public boolean hasInterval(Interval interval) {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
+    @Override
+    public Interval[] getIntervals() {
+        throw new UnsupportedOperationException("Not supported.");
+    }
+
     class FirstAdd implements AddBehaviour {
 
         @Override

modules/ProcessorPlugin/src/main/java/org/gephi/io/processor/plugin/AbstractProcessor.java

@@ -70,7 +70,7 @@ public abstract class AbstractProcessor {
             if (!nodeTable.hasColumn(col.getId())) {
                 Class typeClass = col.getTypeClass();
                 if (col.isDynamic()) {
-                    typeClass = AttributeUtils.getDynamicType(typeClass);
+                    typeClass = AttributeUtils.getTimestampMapType(typeClass);
                 }
                 nodeTable.addColumn(col.getId(), col.getTitle(), typeClass, Origin.DATA, col.getDefaultValue(), true);
             }
@@ -80,7 +80,7 @@ public abstract class AbstractProcessor {
             if (!edgeTable.hasColumn(col.getId())) {
                 Class typeClass = col.getTypeClass();
                 if (col.isDynamic()) {
-                    typeClass = AttributeUtils.getDynamicType(typeClass);
+                    typeClass = AttributeUtils.getTimestampMapType(typeClass);
                 }
                 edgeTable.addColumn(col.getId(), col.getTitle(), typeClass, Origin.DATA, col.getDefaultValue(), true);
             }

modules/StatisticsAPI/src/main/java/org/gephi/statistics/StatisticsControllerImpl.java

@@ -42,7 +42,6 @@ Portions Copyrighted 2011 Gephi Consortium.
  */
 package org.gephi.statistics;
 
-import org.gephi.graph.api.TimestampIndex;
 import org.gephi.graph.api.Edge;
 import org.gephi.graph.api.Graph;
 import org.gephi.statistics.spi.StatisticsBuilder;
@@ -53,6 +52,7 @@ import org.gephi.graph.api.GraphModel;
 import org.gephi.graph.api.GraphView;
 import org.gephi.graph.api.Interval;
 import org.gephi.graph.api.Node;
+import org.gephi.graph.api.TimeIndex;
 import org.gephi.project.api.ProjectController;
 import org.gephi.utils.longtask.spi.LongTask;
 import org.gephi.utils.longtask.api.LongTaskExecutor;
@@ -85,7 +85,7 @@ public class StatisticsControllerImpl implements StatisticsController {
 
             @Override
             public void initialize(Workspace workspace) {
-                if(workspace.getLookup().lookup(StatisticsModelImpl.class) == null) {
+                if (workspace.getLookup().lookup(StatisticsModelImpl.class) == null) {
                     workspace.add(new StatisticsModelImpl());
                 }
             }
@@ -189,23 +189,20 @@ public class StatisticsControllerImpl implements StatisticsController {
             double high = low + window;
 
 //            Graph g = dynamicGraph.getSnapshotGraph(low, high);
-            
-            
             GraphView currentView = graphModel.getVisibleView();
             Graph graph = graphModel.getGraphVisible();
             GraphView view = graphModel.createView();
             Graph g = graphModel.getGraph(view);
-            
-            TimestampIndex<Node> nodeIndex = graphModel.getNodeTimestampIndex(currentView);
-            for(Node node : nodeIndex.get(low, high)) {
+
+            TimeIndex<Node> nodeIndex = graphModel.getNodeTimeIndex(currentView);
+            for (Node node : nodeIndex.get(new Interval(low, high))) {
                 g.addNode(node);
             }
-            
-            TimestampIndex<Edge> edgeIndex = graphModel.getEdgeTimestampIndex(currentView);
-            for(Edge edge : edgeIndex.get(low, high)) {
+
+            TimeIndex<Edge> edgeIndex = graphModel.getEdgeTimeIndex(currentView);
+            for (Edge edge : edgeIndex.get(new Interval(low, high))) {
                 g.addEdge(edge);
             }
-            
 
             statistics.loop(g.getView(), new Interval(low, high));