* not part of the build*

Fixed 71951, 74511, 74525


git-svn-id: svn://10.0.0.236/trunk@91125 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
idk%eng.sun.com
2001-04-03 11:57:15 +00:00
parent a8c7226929
commit 64984abc73
27 changed files with 176 additions and 1020 deletions

View File

@@ -36,11 +36,15 @@ XPIDL_MODULE = javaSample
XPIDLSRCS = bcIJavaSample.idl
CPPSRCS = bcJavaSample.cpp
include $(topsrcdir)/config/rules.mk
include ../config/rules.mk
bcJavaSample.jar.comp: manifest bcIJavaSample.class bcJavaSample.class
$(JDKHOME)/bin/jar cvfm bcJavaSample.jar.comp manifest *.class
.java.class:
$(JDKHOME)/bin/javac -classpath .:../classes $<
$(JDKHOME)/bin/javac -classpath .:../classes:$(DIST)/classes $<
bcIJavaSample.java : bcIJavaSample.idl
install-component: bcJavaSample.jar.comp bcJavaSample.jar.info
cp bcJavaSample.jar.comp bcJavaSample.jar.info $(DEPTH)/dist/bin/components/

View File

@@ -1,6 +1,7 @@
#include "nsISupports.idl"
#include "nsIComponentManager.idl"
#pragma prefix
[scriptable, uuid(ca1e2656-1dd1-11b2-9c4e-f49ea557abde)]
interface bcIJavaSample : nsISupports
{

View File

@@ -1,51 +0,0 @@
/*
* ************* DO NOT EDIT THIS FILE ***********
*
* This file was automatically generated from bcIJavaSample.idl.
*/
import org.mozilla.xpcom.*;
/**
* Interface bcIJavaSample
*
* IID: 0xca1e2656-1dd1-11b2-9c4e-f49ea557abde
*/
public interface bcIJavaSample extends nsISupports
{
public static final String IID =
"ca1e2656-1dd1-11b2-9c4e-f49ea557abde";
/* void test0 (); */
public void test0();
/* void test1 (in long l); */
public void test1(int l);
/* void test2 (in bcIJavaSample o); */
public void test2(bcIJavaSample o);
/* void test3 (in PRUint32 count, [array, size_is (count)] in long valueArray); */
public void test3(int count, int[] valueArray);
/* void test4 (in PRUint32 count, [array, size_is (count)] inout string valueArray); */
public void test4(int count, String[][] valueArray);
/* void test5 (in nsIComponentManager cm); */
public void test5(nsIComponentManager cm);
/* void test6 (in PRUint32 count, [array, size_is (count)] in string valueArray); */
public void test6(int count, String[] valueArray);
/* void test7 (out PRUint32 count, [array, size_is (count)] out char valueArray); */
public void test7(int[] count, char[][] valueArray);
}
/*
* end
*/

View File

@@ -29,8 +29,8 @@ public class bcJavaSample implements bcIJavaSample {
public Object queryInterface(IID iid) {
System.out.println("--[java]bcJavaSample::queryInterface iid="+iid);
Object result;
if ( iid.equals(nsISupportsIID)
|| iid.equals(bcIJavaSampleIID)) {
if ( iid.equals(nsISupports.IID)
|| iid.equals(bcIJavaSample.IID)) {
result = this;
} else {
result = null;
@@ -99,7 +99,7 @@ public class bcJavaSample implements bcIJavaSample {
|| counter > 300) {
break;
}
strObj = (nsISupportsString) obj.queryInterface(nsISupportsStringIID);
strObj = (nsISupportsString) obj.queryInterface(nsISupportsString.IID);
str = strObj.getData();
System.out.println("--[java] bcJavaSample.Test5 string "+str);
enumerator.next(); counter++;
@@ -124,11 +124,6 @@ public class bcJavaSample implements bcIJavaSample {
count[0] = retValue.length;
valueArray[0] = retValue;
}
static IID bcIJavaSampleIID = new IID(bcIJavaSample.IID);
static IID nsISupportsIID = new IID(nsISupports.IID);
static IID nsIComponenstManagerIID = new IID(nsIComponentManager.IID);
static IID nsISupportsStringIID = new IID(nsISupportsString.IID);
static {
try {
Class nsIComponentManagerClass =

View File

@@ -41,14 +41,16 @@ OBJS = .\$(OBJDIR)\bcJavaSample.obj
LLIBS=$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
include <$(DEPTH)\config\rules.mak>
include ..\config\rules.mak
bcJavaSample.jar.comp: manifest bcIJavaSample.class bcJavaSample.class
$(JDKHOME)\bin\jar cvfm bcJavaSample.jar.comp manifest *.class
.SUFFIXES: .java .class
.java.class:
$(JDKHOME)\bin\javac -classpath .;..\classes $<
$(JDKHOME)\bin\javac -classpath .;..\classes;$(DEPTH)\dist\classes $<
bcIJavaSample.java : bcIJavaSample.idl
install-component: bcJavaSample.jar.comp bcJavaSample.jar.info $(DLL)
copy bcJavaSample.jar* $(DIST)\bin\components
@@ -60,4 +62,4 @@ clobber:: clobber-java
rm -f "$(DIST)\bin\components\$(DLLNAME).dll"
rm -f "$(DIST)\bin\components\bcJavaSample.jar.*"
clobber_all:: clobber-java
install:: install-component
install:: install-component