svn commit: r921650 - in /incubator/river/jtsk/trunk/src/com/sun/jini: phoenix/RegistrySunExporter.java tool/PreferredListGen.java tool/classdepend/ClassDepend.java

[pe...@apache.org]

Author: peter_firmstone
Date: Thu Mar 11 00:45:43 2010
New Revision: 921650

URL: http://svn.apache.org/viewvc?rev=921650&view=rev
Log:
Minor changes to avoid use of depreciated JVM platform methods if possible.

Modified:
    incubator/river/jtsk/trunk/src/com/sun/jini/phoenix/RegistrySunExporter.java
    incubator/river/jtsk/trunk/src/com/sun/jini/tool/PreferredListGen.java
    incubator/river/jtsk/trunk/src/com/sun/jini/tool/classdepend/ClassDepend.java

Modified: incubator/river/jtsk/trunk/src/com/sun/jini/phoenix/RegistrySunExporter.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/phoenix/RegistrySunExporter.java?rev=921650&r1=921649&r2=921650&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/phoenix/RegistrySunExporter.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/phoenix/RegistrySunExporter.java Thu Mar 11 00:45:43 2010
@@ -91,6 +91,19 @@ public class RegistrySunExporter extends
 	/**
 	 * Disable remote code downloading on the input stream and then
 	 * continue normal dispatching.
+         * 
+         * From the RemoteCall javadoc:
+         * RemoteCall is an abstraction used solely by the RMI runtime 
+         * (in conjunction with stubs and skeletons of remote objects) 
+         * to carry out a call to a remote object. The RemoteCall interface 
+         * is deprecated because it is only used by deprecated methods of 
+         * java.rmi.server.RemoteRef.
+         * 
+         * This method is an overridden method from UnicastServerRef which is
+         * a sun internal implementation class.
+         * 
+         * @depreciated no replacement
+         * @see java.rmi.server.RemoteCall
 	 */
 	public void dispatch(Remote obj, RemoteCall call) throws IOException {
 	    try {

Modified: incubator/river/jtsk/trunk/src/com/sun/jini/tool/PreferredListGen.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/tool/PreferredListGen.java?rev=921650&r1=921649&r2=921650&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/tool/PreferredListGen.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/tool/PreferredListGen.java Thu Mar 11 00:45:43 2010
@@ -1094,12 +1094,12 @@ public class PreferredListGen {
 		    String msg = getString("preflistgen.badcp", fileName);
 		    throw new IllegalArgumentException(msg);
 		}
-		list.add(cpFile.getCanonicalFile().toURL());
+		list.add(cpFile.getCanonicalFile().toURI().toURL());
 	    }
 	}
 	for (Iterator it = jarList.iterator(); it.hasNext(); ) {
 	    String fileName = (String) it.next();
-	    list.add(new File(fileName).getCanonicalFile().toURL());
+	    list.add(new File(fileName).getCanonicalFile().toURI().toURL());
 	}
 	if (list.size() > 0) {
 	    URL[] urls = (URL[]) list.toArray(new URL[list.size()]);

Modified: incubator/river/jtsk/trunk/src/com/sun/jini/tool/classdepend/ClassDepend.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/tool/classdepend/ClassDepend.java?rev=921650&r1=921649&r2=921650&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/tool/classdepend/ClassDepend.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/tool/classdepend/ClassDepend.java Thu Mar 11 00:45:43 2010
@@ -451,7 +451,7 @@ public class ClassDepend {
 	for (int i = 0; tokens.hasMoreTokens(); i++) {
 	    String file = tokens.nextToken();
 	    try {
-		urls[i] = new File(file).toURL();
+		urls[i] = new File(file).toURI().toURL();
 	    } catch (MalformedURLException e) {
 		urls[i] = new URL(file);
 	    }