getCursor renamed to getAll

4 files changed, 12 insertions, 10 deletions

diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMap.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMap.java
index fb42d822..2f2cb7a2 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMap.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMap.java
@@ -1,11 +1,13 @@
 package org.eclipse.viatra.solver.data.map;
 
 public interface VersionedMap<K,V> extends Versioned{
-        public void put(K key, V value);
         public V get(K key);
+        public Cursor<K,V> getAll();
+        
+        public void put(K key, V value);
+        public void putAll(Cursor<K,V> cursor);
+        
         public long getSize();
         
-        public Cursor<K,V> getCursor();
         public DiffCursor<K,V> getDiffCursor(long state);
-        public void putAll(Cursor<K,V> cursor);
 }
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreImpl.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreImpl.java
index 9ee4cfdf..4f3d8b10 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreImpl.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreImpl.java
@@ -127,8 +127,8 @@ public class VersionedMapStoreImpl<K, V> implements VersionedMapStore<K, V> {
         public DiffCursor<K, V> getDiffCursor(long fromState, long toState) {
                 VersionedMap<K, V> map1 = createMap(fromState);
                 VersionedMap<K, V> map2 = createMap(toState);
-                Cursor<K, V> cursor1 = map1.getCursor();
-                Cursor<K, V> cursor2 = map2.getCursor();
+                Cursor<K, V> cursor1 = map1.getAll();
+                Cursor<K, V> cursor2 = map2.getAll();
                 return new MapDiffCursor<>(this.hashProvider, this.defaultValue, cursor1, cursor2);
         }
 }
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/VersionedMapImpl.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/VersionedMapImpl.java
index 25473fd8..ef962f13 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/VersionedMapImpl.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/VersionedMapImpl.java
@@ -99,14 +99,14 @@ public class VersionedMapImpl<K,V> implements VersionedMap<K,V>{
         }
 
         @Override
-        public Cursor<K, V> getCursor() {
+        public Cursor<K, V> getAll() {
                 return new MapCursor<>(this.root,this);
         }
         @Override
         public DiffCursor<K, V> getDiffCursor(long toVersion) {
-                Cursor<K, V> fromCursor = this.getCursor();
+                Cursor<K, V> fromCursor = this.getAll();
                 VersionedMap<K, V> toMap = this.store.createMap(toVersion);
-                Cursor<K, V> toCursor = toMap.getCursor();
+                Cursor<K, V> toCursor = toMap.getAll();
                 return new MapDiffCursor<>(this.hashProvider,this.defaultValue, fromCursor, toCursor);
                 
         }
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/internal/ModelImpl.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/internal/ModelImpl.java
index 49699933..55ddfd3a 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/internal/ModelImpl.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/internal/ModelImpl.java
@@ -53,7 +53,7 @@ public class ModelImpl implements Model {
 
         @Override
         public <K, V> Cursor<K, V> getAll(DataRepresentation<K, V> representation) {
-                return getMap(representation).getCursor();
+                return getMap(representation).getAll();
         }
 
         @Override
@@ -84,7 +84,7 @@ public class ModelImpl implements Model {
 
         private <K, V> MapDiffCursor<K, V> constructDiffCursor(Model toModel, DataRepresentation<K, V> representation) {
                 @SuppressWarnings("unchecked")
-                Cursor<K, V> fromCursor = (Cursor<K, V>) this.maps.get(representation).getCursor();
+                Cursor<K, V> fromCursor = (Cursor<K, V>) this.maps.get(representation).getAll();
                 Cursor<K, V> toCursor = toModel.getAll(representation);
 
                 ContinousHashProvider<K> hashProvider = representation.getHashProvider();