Changeset 31095 in vbox for trunk/src/libs

Timestamp:

Jul 26, 2010 8:31:46 AM (14 years ago)

Author:

vboxsync

Message:

Java: few warnings shut up

Location:

trunk/src/libs/xpcom18a4/java/src/org/mozilla/xpcom

Files:

• INIParser.java (modified) (13 diffs)
• Mozilla.java (modified) (3 diffs)

trunk/src/libs/xpcom18a4/java/src/org/mozilla/xpcom/INIParser.java

@@ -57 +57 @@
 public class INIParser {
 
-  private HashMap mSections;
+  private HashMap<String, Properties> mSections;
 
   /**
@@ -63 +63 @@
    * given path. <code>aCharset</code> specifies the character encoding of
    * the file.
-   * 
+   *
    * @param aFilename path of INI file to parse
    * @param aCharset character encoding of file
@@ -77 +77 @@
    * Creates a new <code>INIParser</code> instance from the INI file at the
    * given path, which is assumed to be in the <code>UTF-8</code> charset.
-   * 
+   *
    * @param aFilename path of INI file to parse
    * @throws FileNotFoundException if <code>aFilename</code> does not exist.
@@ -89 +89 @@
    * Creates a new <code>INIParser</code> instance from the given file.
    * <code>aCharset</code> specifies the character encoding of the file.
-   * 
+   *
    * @param aFile INI file to parse
    * @param aCharset character encoding of file
@@ -103 +103 @@
    * Creates a new <code>INIParser</code> instance from the given file,
    * which is assumed to be in the <code>UTF-8</code> charset.
-   * 
+   *
    * @param aFile INI file to parse
    * @throws FileNotFoundException if <code>aFile</code> does not exist.
@@ -114 +114 @@
   /**
    * Parses given INI file.
-   * 
+   *
    * @param aFile INI file to parse
    * @param aCharset character encoding of file
@@ -126 +126 @@
     BufferedReader reader = new BufferedReader(inStream);
 
-    mSections = new HashMap();
+    mSections = new HashMap<String, Properties>();
     String currSection = null;
 
@@ -166 +166 @@
       }
 
-      Properties props = (Properties) mSections.get(currSection);
+      Properties props = mSections.get(currSection);
       if (props == null) {
         props = new Properties();
@@ -179 +179 @@
   /**
    * Returns an iterator over the section names available in the INI file.
-   * 
+   *
    * @return an iterator over the section names
    */
@@ -189 +189 @@
    * Returns an iterator over the keys available within a section.
    *
-   * @param aSection section name whose keys are to be returned 
+   * @param aSection section name whose keys are to be returned
    * @return an iterator over section keys, or <code>null</code> if no
    *          such section exists
@@ -217 +217 @@
     }
 
-    Properties props = (Properties) mSections.get(aSection);
+    Properties props = mSections.get(aSection);
     if (props == null) {
       return null;
@@ -233 +233 @@
    */
   public String getString(String aSection, String aKey) {
-    Properties props = (Properties) mSections.get(aSection);
+    Properties props = mSections.get(aSection);
     if (props == null) {
       return null;
@@ -242 +242 @@
 
 }
-

trunk/src/libs/xpcom18a4/java/src/org/mozilla/xpcom/Mozilla.java

@@ -217 +217 @@
     try {
       URL[] urls = new URL[1];
-      urls[0] = new File("/System/Library/Java/").toURL();
+      urls[0] = new File("/System/Library/Java/").toURI().toURL();
       ClassLoader loader = new URLClassLoader(urls);
-      Class bundleClass = Class.forName("com.apple.cocoa.foundation.NSBundle",
-                                        true, loader);
+      Class<?> bundleClass = Class.forName("com.apple.cocoa.foundation.NSBundle",
+                                           true, loader);
 
       // Get the bundle for this app.  If this is not executing from
@@ -638 +638 @@
     URL[] urls = new URL[1];
     try {
-      urls[0] = jar.toURL();
+      urls[0] = jar.toURI().toURL();
     } catch (MalformedURLException e) {
       throw new XPCOMInitializationException(e);
@@ -970 +970 @@
    */
   public static nsISupports queryInterface(nsISupports aObject, String aIID) {
-    ArrayList classes = new ArrayList();
+    ArrayList<Class> classes = new ArrayList<Class>();
     classes.add(aObject.getClass());
 
     while (!classes.isEmpty()) {
-      Class clazz = (Class) classes.remove(0);
+      Class clazz = classes.remove(0);
 
       // Skip over any class/interface in the "java.*" and "javax.*" domains.