Index: SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/AcquiredStructureAnalyzer.java
===================================================================
--- SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/AcquiredStructureAnalyzer.java (revision 271)
+++ SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/AcquiredStructureAnalyzer.java (revision 272)
@@ -5,6 +5,4 @@
 import org.biohackathon.SPARQLBuilder.endpointMetadata.MetadataManager;
 
-import jp.riken.accc.db.sparqlBuilderMetadata.crawler.dataStructure.sparql.JenaModelGenerator;
-import jp.riken.accc.db.sparqlBuilderMetadata.crawler.dataStructure.sparql.URICollection;
 import jp.riken.accc.db.sparqlBuilderMetadata.crawler.dataStructure.sparql.crawler.ClassPartition;
 import jp.riken.accc.db.sparqlBuilderMetadata.crawler.dataStructure.sparql.crawler.ClassRelation;
@@ -14,14 +12,4 @@
 import jp.riken.accc.db.sparqlBuilderMetadata.crawler.dataStructure.sparql.crawler.PropertyPartition;
 
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
 
 //public class OWLQueryBuilderForCrawlerImpl implements OWLQueryBuilder {
@@ -85,5 +73,5 @@
 			// default
 			Dataset dataset = cm.getDefaultDataset();
-			List<SClass> tempClassList = getOWLClassList(dataset, keywords, language);
+			List<SClass> tempClassList = getOWLClassList(endpointURI, null, dataset, keywords, language);
 			for(SClass sClass: tempClassList){
 				classList.add(sClass);
@@ -95,5 +83,5 @@
 				for(String graphURI: graphURIs){
 					dataset = cm.getDataset(graphURI);
-					tempClassList = getOWLClassList(dataset, keywords, language);
+					tempClassList = getOWLClassList(endpointURI, graphURI, dataset, keywords, language);
 					for(SClass sClass: tempClassList){
 						classList.add(sClass);
@@ -105,5 +93,5 @@
 	}
 
-	private List<SClass> getOWLClassList(Dataset dataset, String[] keywords, String language) throws Exception{
+	private List<SClass> getOWLClassList(String endpointURI, String graphURI, Dataset dataset, String[] keywords, String language) throws Exception{
 		ArrayList<SClass> results = new ArrayList<SClass>();
 		
@@ -127,5 +115,5 @@
 
 			if( keywords == null || keywords.length == 0 ){
-				SClass sClass = new SClass(classURI, labels, entities);
+				SClass sClass = new SClass(classURI, labels, entities, endpointURI, graphURI);
 				results.add(sClass);
 			}else{
@@ -145,5 +133,5 @@
 					}
 					if( hit ){
-						SClass sClass = new SClass(classURI, labels, entities);
+						SClass sClass = new SClass(classURI, labels, entities, endpointURI, graphURI);
 						results.add(sClass);
 					}
Index: SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/SClass.java
===================================================================
--- SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/SClass.java (revision 267)
+++ SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/SClass.java (revision 272)
@@ -8,4 +8,6 @@
 	private int numOfInstances;
 	private HashSet<Label> labels;
+	private String endpointURI = null;
+	private String graphURI = null;
 
 	/**
@@ -19,8 +21,10 @@
 	 * @since 28.01.2014
 	 */
-	public SClass(String classURI, Label[] labels, int numOfInstances) {
+	public SClass(String classURI, Label[] labels, int numOfInstances, String endpointURI, String graphURI) {
 		this.classURI = classURI;
 		this.numOfInstances = numOfInstances;
 		setLabels(labels);
+		this.endpointURI = endpointURI;
+		this.graphURI = graphURI;
 	}
 
@@ -82,3 +86,21 @@
 	}
 
+	public final String getEndpointURI() {
+		return endpointURI;
+	}
+
+	public final void setEndpointURI(String endpointURI) {
+		this.endpointURI = endpointURI;
+	}
+
+	public final String getGraphURI() {
+		return graphURI;
+	}
+
+	public final void setGraphURI(String graphURI) {
+		this.graphURI = graphURI;
+	}
+
+	
+	
 }
Index: SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/RDFSchemaAnalyzerFactory.java
===================================================================
--- SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/RDFSchemaAnalyzerFactory.java (revision 271)
+++ SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/RDFSchemaAnalyzerFactory.java (revision 272)
@@ -8,6 +8,16 @@
 
 	private MetadataManager metadataManager = null;
-	private static final String FILENAME = "C:\\cdata";
-        
+	private static final String FILENAME = "C:\\home\\kobayashi";
+     
+	
+	public static void main(String[] args) throws Exception{
+		RDFSchemaAnalyzerFactory factory = new RDFSchemaAnalyzerFactory();
+		RDFSchemaAnalyzer analyzer = factory.create();
+		SClass[] sClassList = analyzer.getOWLClasses(null, null);
+		for(SClass sClass: sClassList){
+			System.out.println(sClass.getClassURI());
+		}
+	}
+	
         public RDFSchemaAnalyzerFactory(String fileName){
             try{