getCursor renamed to getAll

6 files changed, 20 insertions, 18 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();
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java
index f7d3d548..5004c152 100644
--- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java
+++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java
@@ -59,7 +59,7 @@ class ContentEqualsFuzzTest {
                 
                 // Get the content of the first map
                 List<SimpleEntry<Integer, String>> content = new LinkedList<>();
-                Cursor<Integer, String> cursor = sut1.getCursor();
+                Cursor<Integer, String> cursor = sut1.getAll();
                 while (cursor.move()) {
                         content.add(new SimpleEntry<>(cursor.getKey(), cursor.getValue()));
                 }
@@ -88,8 +88,8 @@ class ContentEqualsFuzzTest {
                 
                 
                 // By cursors
-                Cursor<Integer, String> cursor1 = sut1.getCursor();
-                Cursor<Integer, String> cursor2 = sut2.getCursor();
+                Cursor<Integer, String> cursor1 = sut1.getAll();
+                Cursor<Integer, String> cursor2 = sut2.getAll();
                 int index3 = 1;
                 boolean canMove = true;
                 do{
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/utils/MapTestEnvironment.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/utils/MapTestEnvironment.java
index 3f276481..aaf9f50c 100644
--- a/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/utils/MapTestEnvironment.java
+++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/map/tests/utils/MapTestEnvironment.java
@@ -63,8 +63,8 @@ public class MapTestEnvironment<K, V> {
         public static <K, V> void compareTwoMaps(String title, VersionedMapImpl<K, V> map1,
                         VersionedMapImpl<K, V> map2, List<Throwable> errors) {
                 // 1. Comparing cursors.
-                Cursor<K, V> cursor1 = map1.getCursor();
-                Cursor<K, V> cursor2 = map2.getCursor();
+                Cursor<K, V> cursor1 = map1.getAll();
+                Cursor<K, V> cursor2 = map2.getAll();
                 while (!cursor1.isTerminated()) {
                         if (cursor2.isTerminated()) {
                                 fail("cursor 2 terminated before cursor1");
@@ -136,7 +136,7 @@ public class MapTestEnvironment<K, V> {
                 // <key,value> pair.
                 // Tests iterators
                 int elementsInSutEntrySet = 0;
-                Cursor<K, V> cursor = sut.getCursor();
+                Cursor<K, V> cursor = sut.getAll();
                 while (cursor.move()) {
                         elementsInSutEntrySet++;
                         K key = cursor.getKey();
@@ -164,7 +164,7 @@ public class MapTestEnvironment<K, V> {
 
         public static <K,V> void checkOrder(String scenario, VersionedMap<K,V> versionedMap) {
                 K previous = null;
-                Cursor<K, V> cursor = versionedMap.getCursor();
+                Cursor<K, V> cursor = versionedMap.getAll();
                 while(cursor.move()) {
                         System.out.println(cursor.getKey() + " " + ((VersionedMapImpl<K, V>) versionedMap).getHashProvider().getHash(cursor.getKey(), 0));
                         if(previous != null) {
@@ -178,7 +178,7 @@ public class MapTestEnvironment<K, V> {
 
         public void printComparison() {
                 System.out.println("SUT:");
-                printEntrySet(sut.getCursor());
+                printEntrySet(sut.getAll());
                 System.out.println("Oracle:");
                 printEntrySet(oracle.entrySet().iterator());
         }