Index: /BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/AcquiredStructureAnalyzer.java
===================================================================
--- /BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/AcquiredStructureAnalyzer.java (revision 112)
+++ /BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/AcquiredStructureAnalyzer.java (revision 125)
@@ -5,4 +5,5 @@
 
 import jp.riken.accc.db.rdf.crawler.dataStructure.sparql.JenaModelGenerator;
+import jp.riken.accc.db.rdf.crawler.dataStructure.sparql.URICollection;
 
 import com.hp.hpl.jena.query.Query;
@@ -34,5 +35,5 @@
 	
 	public static void main(String[] args) throws Exception{
-		JenaModelGenerator jmGene = new JenaModelGenerator("c:\\cdata\\allie.ttl");
+		JenaModelGenerator jmGene = new JenaModelGenerator("c:\\temp\\reactomeF18s.ttl");
 		AcquiredStructureAnalyzer impl 
 			= new AcquiredStructureAnalyzer(jmGene.getEndpointURI(), jmGene.getGraphURIs(), jmGene.getModel());
@@ -45,9 +46,9 @@
 		System.out.println("--------------------------");
 		
-		ClassLink[] cls = impl.getNextClass(null,"http://purl.org/allie/ontology/201108#ShortForm",100,true );
-		for(ClassLink cl: cls){
-			System.out.println(cl.toString());
-		}
-		System.out.println("--------------------------");
+//		ClassLink[] cls = impl.getNextClass(null,"http://purl.org/allie/ontology/201108#ShortForm",100,true );
+//		for(ClassLink cl: cls){
+//			System.out.println(cl.toString());
+//		}
+//		System.out.println("--------------------------");
 		
 	}
@@ -80,5 +81,5 @@
 		queryStr.append("PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n");
 		queryStr.append("PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n");
-		queryStr.append("SELECT DISTINCT ?c ?pLabel ?numOfInstances\n");
+		queryStr.append("SELECT DISTINCT ?c ?pLabel ?entities\n");
 //		if (targetGraphURIs != null) {
 //			for (String graphURI : targetGraphURIs) {
@@ -89,7 +90,11 @@
 //		}
 		queryStr.append("WHERE{\n");
-		queryStr.append(" ?c rdf:type rdfs:Class. \n");
-		queryStr.append(" ?c <http://sparqlbuilder.org/numberOfInstances> ?numOfInstances. \n");
-		queryStr.append(" OPTIONAL{ ?c rdfs:label ?pLabel. }\n");
+		queryStr.append(" ?cp <").append(URICollection.PROPERTY_VOID_CLASS).append("> ?c. \n");
+		queryStr.append(" ?cp <");
+		queryStr.append(URICollection.PROPERTY_VOID_ENTITIES);
+		queryStr.append("> ?entities. \n");
+		queryStr.append(" OPTIONAL{ ?c <");
+		queryStr.append(URICollection.PROPERTY_RDFS_LABEL);
+		queryStr.append("> ?pLabel. }\n");
 
 		if (keywords != null && keywords.length != 0) {