[Mulgara-svn] r1836 - branches/distinct_queries/src/jar/querylang/java/org/mulgara/itql

[pag at mulgara.org]

Author: pag
Date: 2009-11-12 10:26:47 -0800 (Thu, 12 Nov 2009)
New Revision: 1836

Modified:
   branches/distinct_queries/src/jar/querylang/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java
   branches/distinct_queries/src/jar/querylang/java/org/mulgara/itql/ItqlSession.java
   branches/distinct_queries/src/jar/querylang/java/org/mulgara/itql/TqlSession.java
Log:
removed deprecation warnings due to using toURL on Files

Modified: branches/distinct_queries/src/jar/querylang/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java
===================================================================
--- branches/distinct_queries/src/jar/querylang/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java	2009-11-12 14:32:28 UTC (rev 1835)
+++ branches/distinct_queries/src/jar/querylang/java/org/mulgara/itql/ItqlInterpreterBeanUnitTest.java	2009-11-12 18:26:47 UTC (rev 1836)
@@ -752,7 +752,7 @@
   
       URI serverURI = new URI("rmi://localhost/server1");
   
-      bean.restore(file.toURL().openStream(), serverURI);
+      bean.restore(file.toURI().toURL().openStream(), serverURI);
     } catch (QueryException e) {
       System.err.println("Error processing query" + e);
       Throwable t = e.getCause();
@@ -816,7 +816,7 @@
       assertTrue("Excepting a backup file", file.exists());
   
       // restore the server
-      bean.restore(file.toURL().openStream(), serverURI);
+      bean.restore(file.toURI().toURL().openStream(), serverURI);
   
       // select the statement
       answer = bean.executeQuery(select);

Modified: branches/distinct_queries/src/jar/querylang/java/org/mulgara/itql/ItqlSession.java
===================================================================
--- branches/distinct_queries/src/jar/querylang/java/org/mulgara/itql/ItqlSession.java	2009-11-12 14:32:28 UTC (rev 1835)
+++ branches/distinct_queries/src/jar/querylang/java/org/mulgara/itql/ItqlSession.java	2009-11-12 18:26:47 UTC (rev 1836)
@@ -546,7 +546,7 @@
       // return the URL!!!
       try {
 
-        scriptURL = loadingScript.toURL();
+        scriptURL = loadingScript.toURI().toURL();
       } catch (MalformedURLException mue) {
 
         // log the error

Modified: branches/distinct_queries/src/jar/querylang/java/org/mulgara/itql/TqlSession.java
===================================================================
--- branches/distinct_queries/src/jar/querylang/java/org/mulgara/itql/TqlSession.java	2009-11-12 14:32:28 UTC (rev 1835)
+++ branches/distinct_queries/src/jar/querylang/java/org/mulgara/itql/TqlSession.java	2009-11-12 18:26:47 UTC (rev 1836)
@@ -594,7 +594,7 @@
       // found the URL. Return it.
       log.debug("Found loading script - " + loadingScript);
       try {
-        scriptUrl = loadingScript.toURL();
+        scriptUrl = loadingScript.toURI().toURL();
       } catch (MalformedURLException mue) {
         log.warn("Unable to convert loading script filename to URL - " + mue.getMessage());
         System.err.println("Unable to convert loading script filename " + "to URL - " + loadingScript);