Change JAVA ifdef's to OJI to distinguish between OJI and tightly integrated JAVA

lib/plugin/nsplugin.cpp

@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "npglue.h" 
-#ifdef JAVA
+#ifdef OJI
 #include "jvmmgr.h" 
 #endif
 #include "xp_mem.h"
@@ -154,7 +154,7 @@ NPIJVMPluginManager*
 nsPluginManager::GetJVMMgr(const nsIID& aIID)
 {
     NPIJVMPluginManager* result = NULL;
-#ifdef JAVA
+#ifdef OJI
     if (fJVMMgr == NULL) {
         // The plugin manager is the outer of the JVM manager
         if (JVMMgr::Create(this, kISupportsIID, (void**)&fJVMMgr) != NS_OK)
@@ -197,7 +197,7 @@ nsPluginInstancePeer::AggregatedQueryInterface(const nsIID& aIID, void** aInstan
         AddRef(); 
         return NS_OK; 
     } 
-#ifdef JAVA
+#ifdef OJI
     // Aggregates...
     if (fJVMInstancePeer == NULL) {
         np_instance* instance = (np_instance*) npp->ndata;