3 files changed, 4 insertions, 16 deletions

diff --git a/src/uk/ac/ox/cs/pagoda/query/rollup/QueryGraph.java b/src/uk/ac/ox/cs/pagoda/query/rollup/QueryGraph.java
index 26b0c1a..58d7add 100644
--- a/src/uk/ac/ox/cs/pagoda/query/rollup/QueryGraph.java
+++ b/src/uk/ac/ox/cs/pagoda/query/rollup/QueryGraph.java
@@ -304,8 +304,8 @@ class Visitor implements OWLClassExpressionVisitorEx<OWLClassExpression> {
 
         @Override
         public OWLClassExpression visit(OWLObjectHasValue ce) {
-                if (ce.getFiller() instanceof VariableIndividual) {
-                        Individual c = (Individual) assignment.get(((VariableIndividual) ce.getFiller()).var); 
+                if (ce.getValue() instanceof VariableIndividual) {
+                        Individual c = (Individual) assignment.get(((VariableIndividual) ce.getValue()).var); 
                         OWLIndividual l = factory.getOWLNamedIndividual(IRI.create(c.getIRI())); 
                         return factory.getOWLObjectHasValue(ce.getProperty(), l); 
                 }
@@ -356,8 +356,8 @@ class Visitor implements OWLClassExpressionVisitorEx<OWLClassExpression> {
 
         @Override
         public OWLClassExpression visit(OWLDataHasValue ce) {
-                if (ce.getFiller() instanceof VariableConstant) {
-                        Constant c = (Constant) assignment.get(((VariableConstant) ce.getFiller()).var); 
+                if (ce.getValue() instanceof VariableConstant) {
+                        Constant c = (Constant) assignment.get(((VariableConstant) ce.getValue()).var); 
                         OWLLiteral l = factory.getOWLLiteral(c.getLexicalForm(), c.getDatatypeURI()); 
                         return factory.getOWLDataHasValue(ce.getProperty(), l); 
                 }
diff --git a/src/uk/ac/ox/cs/pagoda/query/rollup/VariableConstant.java b/src/uk/ac/ox/cs/pagoda/query/rollup/VariableConstant.java
index 3140fa4..b8035c5 100644
--- a/src/uk/ac/ox/cs/pagoda/query/rollup/VariableConstant.java
+++ b/src/uk/ac/ox/cs/pagoda/query/rollup/VariableConstant.java
@@ -111,12 +111,6 @@ class VariableConstant implements OWLLiteral {
         }
 
         @Override
-        public boolean containsEntityInSignature(OWLEntity owlEntity) {
-                // TODO Auto-generated method stub
-                return false;
-        }
-
-        @Override
         public void accept(OWLAnnotationValueVisitor visitor) {
                 // TODO Auto-generated method stub
                 
diff --git a/src/uk/ac/ox/cs/pagoda/query/rollup/VariableIndividual.java b/src/uk/ac/ox/cs/pagoda/query/rollup/VariableIndividual.java
index 53288e5..1c924b2 100644
--- a/src/uk/ac/ox/cs/pagoda/query/rollup/VariableIndividual.java
+++ b/src/uk/ac/ox/cs/pagoda/query/rollup/VariableIndividual.java
@@ -261,12 +261,6 @@ class VariableIndividual implements OWLNamedIndividual {
         }
 
         @Override
-        public boolean containsEntityInSignature(OWLEntity owlEntity) {
-                // TODO Auto-generated method stub
-                return false;
-        }
-
-        @Override
         public EntityType<?> getEntityType() {
                 // TODO Auto-generated method stub
                 return null;