You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/04/20 01:33:01 UTC
svn commit: r161991 - in
geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler:
Compiler.java SkelCompiler.java StubCompiler.java
Author: djencks
Date: Tue Apr 19 16:33:00 2005
New Revision: 161991
URL: http://svn.apache.org/viewcvs?view=rev&rev=161991
Log:
make method name overloading more visible
Modified:
geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/Compiler.java
geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/SkelCompiler.java
geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/StubCompiler.java
Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/Compiler.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/Compiler.java?view=diff&r1=161990&r2=161991
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/Compiler.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/Compiler.java Tue Apr 19 16:33:00 2005
@@ -142,7 +142,7 @@
{
// Maybe it would be easier if GenOptions just made sure that platform path
// separators and file separators were as required on the platform?
-
+
if (File.separatorChar == '/') {
// We're under Unix, change '\\' to '/'
return path.replace( '\\', '/' );
@@ -199,12 +199,12 @@
}
}
- protected Method[] getMethods( Class intfClass, GenOptions go )
+ protected Method[] getMethods(Class intfClass, boolean isSimpleIdl)
{
Method myMethods[] = intfClass.getDeclaredMethods();
ArrayList list = new ArrayList( myMethods.length * 2 );
- collectInterfaceMethods( list, intfClass, go.isSimpleIdl() );
+ collectInterfaceMethods( list, intfClass, isSimpleIdl );
Object[] objs = list.toArray();
Method[] methods = new Method[objs.length];
@@ -213,6 +213,12 @@
return methods;
}
+ public MethodOverload[] getMethodOverloads(Class intfCalss, boolean isSimpleIdl) {
+ Method[] methods = getMethods(intfCalss, isSimpleIdl);
+ MethodOverload[] methodOverloads = getMethodOverloads(methods);
+ return methodOverloads;
+ }
+
public MethodOverload[] getMethodOverloads( Method methods[] )
{
HashMap hm = new HashMap( methods.length );
@@ -271,7 +277,7 @@
return name.replace( '.', '_' );
}
- class MethodOverload
+ public class MethodOverload
{
public Method method;
public String iiop_name;
Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/SkelCompiler.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/SkelCompiler.java?view=diff&r1=161990&r2=161991
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/SkelCompiler.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/SkelCompiler.java Tue Apr 19 16:33:00 2005
@@ -424,7 +424,7 @@
jc.addImport("org.apache.geronimo.interop.rmi.iiop", "RemoteInterface");
jc.addImport("org.apache.geronimo.interop.rmi.iiop", "ObjectRef");
- jc.addImport("org.apache.geronimo.interop.rmi.iiop", "RemoteObject");
+ jc.addImport("org.apache.geronimo.interop.rmi.iiop", "RemoteObject");
jc.setExtends("RemoteObject");
jc.addImplements("RemoteInterface");
@@ -478,7 +478,7 @@
JCaseStatement caseStmt = null;
ts.addStatement(switchStmt);
- Method m[] = getMethods( riClass, go );
+ Method m[] = getMethods( riClass, go.isSimpleIdl());
MethodOverload mo[] = null;
mo = getMethodOverloads( m );
Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/StubCompiler.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/StubCompiler.java?view=diff&r1=161990&r2=161991
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/StubCompiler.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/StubCompiler.java Tue Apr 19 16:33:00 2005
@@ -241,7 +241,7 @@
addMethod_is_a(jc);
- Method m[] = getMethods( riClass, go );
+ Method m[] = getMethods( riClass, go.isSimpleIdl());
MethodOverload mo[] = null;
mo = getMethodOverloads( m );
for (int i = 0; mo != null && i < mo.length; i++) {