Index: /BH13SPARQLBuilder/src/hozo/sparql/gui/SparqlBuilderPanel.java
===================================================================
--- /BH13SPARQLBuilder/src/hozo/sparql/gui/SparqlBuilderPanel.java (revision 74)
+++ /BH13SPARQLBuilder/src/hozo/sparql/gui/SparqlBuilderPanel.java (revision 84)
@@ -14,4 +14,7 @@
 import hozo.sparql.SparqlQueryListener;
 
+import org.biohackathon.SPARQLBuilder.OWL.*;
+
+/*
 import org.biohackathon.SPARQLBuilder.OWL.ClassLink;
 import org.biohackathon.SPARQLBuilder.OWL.Direction;
@@ -21,5 +24,5 @@
 import org.biohackathon.SPARQLBuilder.OWL.Path;
 import org.biohackathon.SPARQLBuilder.OWL.SClass;
-
+*/
 
 
@@ -34,5 +37,6 @@
 	MapFactory map;
 	SparqlSearchPanel search_panel;
-	OWLQueryBuilderImpl builder;
+	//OWLQueryBuilderImpl builder;
+        QueryPathGenerator generator;
 
 //	public SparqlBuilderPanel(SparqlAccessorForm parent) {
@@ -41,11 +45,18 @@
 //		this.parent = parent;
 //	}
-	
+	/*
 	public OWLQueryBuilderImpl getOWLQueryBuilderImpl(){
 		makeOWLQueryBuilderImpl();
 		
 		return builder;
-	}
-
+	}*/
+
+	public QueryPathGenerator getQueryPathGenerator(){
+                if ( generator == null ){
+    		    makeQueryPathGenerator();
+                }
+		return generator;
+        }
+        
 /*	SparqlBuilderPanel(SparqlAccessorForm sparqlAccessorForm){
 		super();
@@ -197,8 +208,10 @@
 					
 					boolean count_ins = jcb_count_ins.isSelected();
-					
+					/*
 					Path[] path = getOWLQueryBuilderImpl().getPaths(
 							jtf_start_class.getText(), jtf_end_class.getText(),
 							mode, !count_ins);
+                                        */
+                                        Path[] path = getQueryPathGenerator().getPaths(jtf_start_class.getText(), jtf_end_class.getText(), !count_ins);
 					System.out.println("RESULT:::>>>>"+path.length);
 					
@@ -233,5 +246,6 @@
 		String classURL ="";
 		try {
-			SClass[] classes = this.getOWLQueryBuilderImpl().getOWLClasses(null, null, keyword, false);
+			//SClass[] classes = this.getOWLQueryBuilderImpl().getOWLClasses(null, null, keyword, false);
+                        SClass[] classes = this.generator.getClasses();
 			DefaultListModel model  = new DefaultListModel();
 			for(int i=0;i<classes.length;i++){
@@ -269,5 +283,6 @@
 	}
 	
-	void makeOWLQueryBuilderImpl() {	
+/*
+        void makeOWLQueryBuilderImpl() {	
 //		String sparqlEndpoint = "http://lsd.dbcls.jp/sparql";
 		String sparqlEndpoint = search_panel.getSparqlAccessorForm().getCurrentEndPoint();
@@ -278,5 +293,4 @@
 			
 		builder = new OWLQueryBuilderImpl(sparqlEndpoint);
-		/*
 		
 		String keyword = "\"artiste\"@fr";
@@ -318,4 +332,62 @@
 			System.out.println(e.toString());
 			e.printStackTrace();
+		}
+		
+		//return (OWLQueryBuilderImpl) builder;
+	}
+*/
+        
+	void makeQueryPathGenerator() {	
+//		String sparqlEndpoint = "http://lsd.dbcls.jp/sparql";
+		String sparqlEndpoint = search_panel.getSparqlAccessorForm().getCurrentEndPoint();
+		
+//		String sparqlEndpoint = "http://dbpedia.org/sparql";
+		
+		System.out.println("Create OWLQueryBuilder for "+sparqlEndpoint);
+			
+		generator = new QueryPathGenerator();
+		generator.setSPARQLendpoint(sparqlEndpoint);
+                
+                
+		//String keyword = "\"artiste\"@fr";
+		//String[] graphURIs = new String[0];
+                /*
+		try {
+			
+	//	OWLQueryBuilder builder = new OWLQueryBuilderImpl(sparqlEndpoint);
+                
+		String[] clsURIs;
+			clsURIs = builder.getOWLClasses(graphURIs, keyword);
+		for(String cls: clsURIs){
+			System.out.println(cls);
+		}
+
+		System.out.println("CLS");
+		ClassLink[] cls = builder.getNextClass(null, clsURIs[0], 0);
+		if( cls != null ){
+			for( ClassLink cl: cls){
+				System.out.println(cl.toString());
+			}
+		}
+
+		System.out.println("CLS-INS");
+		cls = builder.getNextClassViaInstanceLink(null, clsURIs[0], 100);
+		if( cls != null ){
+			for( ClassLink cl: cls){
+				System.out.println(cl.toString());
+			}
+		}
+
+		System.out.println("Instances");
+		Instance[] ins = builder.getInstances(null, "\"A.C. Reed\"@en");
+		if( ins != null ){
+			for( Instance in: ins){
+				System.out.println(in.toString());
+			}
+		}
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			System.out.println(e.toString());
+			e.printStackTrace();
 		}*/
 		
@@ -323,9 +395,10 @@
 	}
 
-public String createSPARQL(Path path) throws Exception {
-	return createSPARQL(path, 0);
-}
-
-public String createSPARQL(Path path, int num) throws Exception {
+        
+        public String createSPARQL(Path path) throws Exception {
+	        return createSPARQL(path, 0);
+        }
+
+        public String createSPARQL(Path path, int num) throws Exception {
 		
 		if( path == null ){
