changing java pref string to the one in 4.7 and fixing cache opening code

xpfe/components/prefwindow/resources/content/pref-advanced.xul

@@ -44,7 +44,7 @@
 	<html:div >
     <html:input type="checkbox" id="advancedJavaAllow" 
                 prefdefval="true"
-                pref="true" preftype="bool" prefstring="advanced.java.allow"/>
+                pref="true" preftype="bool" prefstring="security.enable_java"/>
 		<html:label for="advancedJavaAllow" accesskey="&enbJavaCheck.accesskey;" tabindex="0">
 			&enbJavaCheck.label;
 		</html:label>

xpfe/components/prefwindow/resources/content/pref-cache.js

@@ -1,12 +1,10 @@
-
 function prefCacheSelectFolder()
 {
-  dump("prefCacheSelectFolder \n");
   bundle = srGetStrBundle("chrome://pref/locale/prefutilities.properties");
   var folderField = document.getElementById("browserCacheDirectory");
-  var url = getFileOrFolderURL( bundle.GetStringFromName("cachefolder"), true );
+  var url = getFileOrFolderSpec( bundle.GetStringFromName("cachefolder"), true );
   if( url != -1 )
-    folderField.value = url;
+    folderField.value = url.URLString;
 }
 
 function prefClearMemCache()
@@ -23,4 +21,4 @@ function prefClearDiskCache()
 	var cache = Components.classes['component://netscape/network/cache?name=manager'].getService();
   var	cacheService = cache.QueryInterface( Components.interfaces.nsINetDataCacheManager);
 	cacheService.Clear( 12 );
-}
+}