[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Wed Oct 29 22:33:24 EDT 2008
Update of /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui
In directory dev.open-bio.org:/tmp/cvs-serv10500/src/main/ca/ucalgary/seahawk/gui

Modified Files:
	MobyContentGUI.java 
Log Message:
Updates related to SAWSDL wrapping Web Service implementation
moby-live/Java/src/main/ca/ucalgary/seahawk/gui MobyContentGUI.java,1.17,1.18
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentGUI.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentGUI.java	2008/07/16 20:37:21	1.17
+++ /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentGUI.java	2008/10/30 02:33:24	1.18
@@ -845,16 +845,16 @@
 	java.util.Locale.setDefault(java.util.Locale.ENGLISH);
 
 	// Unless overridden on the command line, use xalan
-	if(System.getProperty("javax.xml.transform.TransformerFactory") == null){
-	    System.setProperty("javax.xml.transform.TransformerFactory",
-			       "org.apache.xalan.processor.TransformerFactoryImpl");
-	}
+ 	if(System.getProperty("javax.xml.transform.TransformerFactory") == null){
+ 	    System.setProperty("javax.xml.transform.TransformerFactory",
+ 			       "org.apache.xalan.processor.TransformerFactoryImpl");
+ 	}
 
 	// Setting this explicitly prevents repeated calls to the META-INF file encoding the same 
-	if(System.getProperty("org.apache.xerces.xni.parser.XMLParserConfiguration") == null){
-	   System.setProperty("org.apache.xerces.xni.parser.XMLParserConfiguration",
-			       "org.apache.xerces.parsers.StandardParserConfiguration");
-	}
+ 	if(System.getProperty("org.apache.xerces.xni.parser.XMLParserConfiguration") == null){
+ 	   System.setProperty("org.apache.xerces.xni.parser.XMLParserConfiguration",
+ 			       "org.apache.xerces.parsers.StandardParserConfiguration");
+ 	}
 
 	// First, restore any user preferences (uses default settings file location)
 	try{
@@ -908,18 +908,6 @@
 	new Thread(){
 	    public void run(){
 		try{
-		    MobyDataType.loadDataTypes(RegistryCache.cacheRegistryOntology(preferredRegistry, 
-										   Central.DATA_TYPES_RESOURCE_NAME,
-										   allowedAgeMillis).toURI().toURL(),
-					       preferredRegistry);
-		}catch(Exception e){
-		    e.printStackTrace();
-		}
-	    }}.start();
-
-	new Thread(){
-	    public void run(){
-		try{
 		    MobyServiceType.loadServiceTypes(RegistryCache.cacheRegistryOntology(preferredRegistry, 
 											 Central.SERVICE_TYPES_RESOURCE_NAME,
 											 allowedAgeMillis).toURI().toURL(),