minor fixes

3 files changed, 6 insertions, 9 deletions

diff --git a/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java b/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java
index 3902e013..6a340589 100644
--- a/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java
+++ b/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java
@@ -17,6 +17,7 @@ import tools.refinery.store.query.building.DNFPredicate;
 import tools.refinery.store.query.building.PredicateAtom;
 import tools.refinery.store.query.building.RelationAtom;
 import tools.refinery.store.query.internal.DNF2PQuery;
+import tools.refinery.store.query.internal.QueriableModelImpl;
 import tools.refinery.store.query.internal.RawPatternMatcher;
 import tools.refinery.store.query.view.RelationView;
 
@@ -105,23 +106,21 @@ public class QueriableModelStoreImpl implements QueriableModelStore {
 
         @Override
         public QueriableModel createModel() {
-                // TODO Auto-generated method stub
-                return null;
+                return new QueriableModelImpl(this, this.store.createModel(), predicates);
         }
 
         @Override
         public QueriableModel createModel(long state) {
-                // TODO Auto-generated method stub
-                return null;
+                return new QueriableModelImpl(this, this.store.createModel(state), predicates);
         }
 
         @Override
-        public Set<Long> getStates() {
+        public synchronized Set<Long> getStates() {
                 return this.store.getStates();
         }
 
         @Override
-        public ModelDiffCursor getDiffCursor(long from, long to) {
+        public synchronized ModelDiffCursor getDiffCursor(long from, long to) {
                 return this.store.getDiffCursor(from, to);
         }
 }
diff --git a/store/src/main/java/tools/refinery/store/query/internal/ModelUpdateListener.java b/store/src/main/java/tools/refinery/store/query/internal/ModelUpdateListener.java
index 425ae8f7..c784cb3c 100644
--- a/store/src/main/java/tools/refinery/store/query/internal/ModelUpdateListener.java
+++ b/store/src/main/java/tools/refinery/store/query/internal/ModelUpdateListener.java
@@ -86,9 +86,6 @@ public class ModelUpdateListener {
                                         typedBuffer.addChange(key, oldValue, newValue);
                                 }
                         }
-                } else {
-                        throw new IllegalArgumentException(
-                                        "Relation " + relation.getName() + " is not in the scope of the update listener.");
                 }
         }
 
diff --git a/store/src/main/java/tools/refinery/store/query/internal/QueriableModelImpl.java b/store/src/main/java/tools/refinery/store/query/internal/QueriableModelImpl.java
index 0f4d609f..f30b947a 100644
--- a/store/src/main/java/tools/refinery/store/query/internal/QueriableModelImpl.java
+++ b/store/src/main/java/tools/refinery/store/query/internal/QueriableModelImpl.java
@@ -174,6 +174,7 @@ public class QueriableModelImpl implements QueriableModel {
         }
         @Override
         public void flushChanges() {
+                //this.initEngine();
                 this.scope.flush();
         }