Changeset 29216 in vbox

Timestamp:

May 7, 2010 2:28:08 PM (15 years ago)

Author:

vboxsync

Message:

java bridge: versions

Location:

trunk/src/libs/xpcom18a4/java

Files:

• Makefile.kmk (modified) (2 diffs)
• src/org/mozilla/xpcom/Mozilla.java (modified) (1 diff)

trunk/src/libs/xpcom18a4/java/Makefile.kmk

@@ -48 +48 @@
                 $(VBOX_JAVA_HOME)/include/$(VBOX_MD_OS)
 endif
+JAVAC_OPTS = -source 1.4 -target 1.4
+
 
 VBOX_JXPCOM_TARGET := $(PATH_TARGET)/vboxjxpcom-gen
@@ -260 +262 @@
         $(QUIET)$(RM) -Rf $(VBOX_JXPCOM_JDEST)
         $(QUIET)$(MKDIR) -p $(VBOX_JXPCOM_JDEST)
-        $(VBOX_JAVAC) @$ $(VBOX_JXPCOM_GEN)/jxpcomgen.list \
+        $(VBOX_JAVAC) $(JAVAC_OPTS) @$ $(VBOX_JXPCOM_GEN)/jxpcomgen.list \
                 -d $(VBOX_JXPCOM_JDEST) -classpath $(VBOX_JXPCOM_JDEST)
         $(call MSG_TOOL,javac,$(notdir $@),...,)
-        $(VBOX_JAVAC) \
+        $(VBOX_JAVAC) $(JAVAC_OPTS) \
                 $(VBOX_JXPCOM_JAR_SRC) \
                 $(VBOX_JXPCOM_NSERROR) \

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

@@ -224 +224 @@
       // Get the bundle for this app.  If this is not executing from
       // a bundle, this will return null.
-      Method mainBundleMethod = bundleClass.getMethod("mainBundle", (java.lang.Class)null);
-      Object bundle = mainBundleMethod.invoke(null, (java.lang.Object)null);
+      Method mainBundleMethod = bundleClass.getMethod("mainBundle", (java.lang.Class[])null);
+      Object bundle = mainBundleMethod.invoke(null, (java.lang.Object[])null);
 
       if (bundle != null) {
         // Get the path to the bundle's "Frameworks" directory
         Method fwPathMethod = bundleClass.getMethod("privateFrameworksPath",
-                                                    (java.lang.Class)null);
-        String path = (String) fwPathMethod.invoke(bundle, (java.lang.Object)null);
+                                                    (java.lang.Class[])null);
+        String path = (String) fwPathMethod.invoke(bundle, (java.lang.Object[])null);
 
         // look for libxpcom.dylib