VirtualBox

Changeset 29216 in vbox for trunk/src/libs/xpcom18a4/java


Ignore:
Timestamp:
May 7, 2010 2:28:08 PM (15 years ago)
Author:
vboxsync
Message:

java bridge: versions

Location:
trunk/src/libs/xpcom18a4/java
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/libs/xpcom18a4/java/Makefile.kmk

    r29182 r29216  
    4848                $(VBOX_JAVA_HOME)/include/$(VBOX_MD_OS)
    4949endif
     50JAVAC_OPTS = -source 1.4 -target 1.4
     51
    5052
    5153VBOX_JXPCOM_TARGET := $(PATH_TARGET)/vboxjxpcom-gen
     
    260262        $(QUIET)$(RM) -Rf $(VBOX_JXPCOM_JDEST)
    261263        $(QUIET)$(MKDIR) -p $(VBOX_JXPCOM_JDEST)
    262         $(VBOX_JAVAC) @$ $(VBOX_JXPCOM_GEN)/jxpcomgen.list \
     264        $(VBOX_JAVAC) $(JAVAC_OPTS) @$ $(VBOX_JXPCOM_GEN)/jxpcomgen.list \
    263265                -d $(VBOX_JXPCOM_JDEST) -classpath $(VBOX_JXPCOM_JDEST)
    264266        $(call MSG_TOOL,javac,$(notdir $@),...,)
    265         $(VBOX_JAVAC) \
     267        $(VBOX_JAVAC) $(JAVAC_OPTS) \
    266268                $(VBOX_JXPCOM_JAR_SRC) \
    267269                $(VBOX_JXPCOM_NSERROR) \
  • trunk/src/libs/xpcom18a4/java/src/org/mozilla/xpcom/Mozilla.java

    r29140 r29216  
    224224      // Get the bundle for this app.  If this is not executing from
    225225      // a bundle, this will return null.
    226       Method mainBundleMethod = bundleClass.getMethod("mainBundle", (java.lang.Class)null);
    227       Object bundle = mainBundleMethod.invoke(null, (java.lang.Object)null);
     226      Method mainBundleMethod = bundleClass.getMethod("mainBundle", (java.lang.Class[])null);
     227      Object bundle = mainBundleMethod.invoke(null, (java.lang.Object[])null);
    228228
    229229      if (bundle != null) {
    230230        // Get the path to the bundle's "Frameworks" directory
    231231        Method fwPathMethod = bundleClass.getMethod("privateFrameworksPath",
    232                                                     (java.lang.Class)null);
    233         String path = (String) fwPathMethod.invoke(bundle, (java.lang.Object)null);
     232                                                    (java.lang.Class[])null);
     233        String path = (String) fwPathMethod.invoke(bundle, (java.lang.Object[])null);
    234234
    235235        // look for libxpcom.dylib
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette