Index: SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/RDFSchemaAnalyzerFactory.java
===================================================================
--- SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/RDFSchemaAnalyzerFactory.java (revision 133)
+++ SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/RDFSchemaAnalyzerFactory.java (revision 182)
@@ -5,14 +5,19 @@
 import java.util.Map;
 
+import org.biohackathon.SPARQLBuilder.endpointMetadata.MetadataFile;
+import org.biohackathon.SPARQLBuilder.endpointMetadata.MetadataManager;
+
 import jp.riken.accc.db.rdf.crawler.dataStructure.sparql.JenaModelGenerator;
 
 public class RDFSchemaAnalyzerFactory {
 
-	private Map<String, String> acquiredRDFFiles = null;
-        private static final String FILENAME = "C:\\cdata";
+	private MetadataManager metadataManager = null;
+//	private Map<String, String> acquiredRDFFiles = null;
+	private static final String FILENAME = "C:\\cdata";
         
         public RDFSchemaAnalyzerFactory(String fileName){
             try{
-                setAcqiredRDFFiles(new File(fileName));
+            	metadataManager = new MetadataManager(fileName);
+//            	setAcqiredRDFFiles(new File(fileName));
             }catch(Exception e){
                 System.err.println(e);
@@ -22,5 +27,6 @@
         public RDFSchemaAnalyzerFactory(){
             try{
-                setAcqiredRDFFiles(new File(FILENAME));
+            	metadataManager = new MetadataManager(FILENAME);
+//            	setAcqiredRDFFiles(new File(FILENAME));
             }catch(Exception e){
                 System.err.println(e);
@@ -28,26 +34,28 @@
         }
 
-	private void setAcqiredRDFFiles(String dirFile) throws Exception{
-		setAcqiredRDFFiles(new File(dirFile));
+//	private void setAcqiredRDFFiles(String dirFile) throws Exception{
+//		setAcqiredRDFFiles(new File(dirFile));
+//	}
+	
+//	private void setAcqiredRDFFiles(File data) throws Exception{
+//		StructureCrawler sc = new StructureCrawler(data);
+//		acquiredRDFFiles = sc.getAcquiredStructureFiles();
+//	}
+
+	public String[] getEndpointURIList(){
+		return metadataManager.getURIList();
+	}
+
+	public MetadataFile[] getMetadataFiles(){
+		return metadataManager.getMetadataFiles();
 	}
 	
-	private void setAcqiredRDFFiles(File data) throws Exception{
-		StructureCrawler sc = new StructureCrawler(data);
-		acquiredRDFFiles = sc.getAcquiredStructureFiles();
-	}
 
-	public String[] getEndpointURIList(){
-		if( acquiredRDFFiles == null ){
-			return new String[0];
-		}else{
-			return acquiredRDFFiles.keySet().toArray(new String[0]);
-		}
-	}
-	
 	public RDFSchemaAnalyzer create(String uri) throws Exception{
-		if( acquiredRDFFiles == null || !acquiredRDFFiles.containsKey(uri)){
+		MetadataFile mFile = metadataManager.getMetadataFile(uri);
+		if( mFile == null ){
 			return new EndpointAnalyzer(uri);
 		}else{
-			JenaModelGenerator jmGene = new JenaModelGenerator(acquiredRDFFiles.get(uri));
+			JenaModelGenerator jmGene = new JenaModelGenerator(mFile.getEndpointURI());
 			return new AcquiredStructureAnalyzer(jmGene.getEndpointURI(), jmGene.getGraphURIs(), jmGene.getModel());
 		}