Return-Path: 
 <scm-return-6560-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 42315 invoked from network); 19 Apr 2005 23:33:04 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 19 Apr 2005 23:33:04 -0000
Received: (qmail 87840 invoked by uid 500); 19 Apr 2005 23:33:03 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 87805 invoked by uid 500); 19 Apr 2005 23:33:03 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 87780 invoked by uid 99); 19 Apr 2005 23:33:03 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 19 Apr 2005 16:33:02 -0700
Received: (qmail 42302 invoked by uid 65534); 19 Apr 2005 23:33:01 -0000
Message-ID: <20050419233301.42301.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Tue, 19 Apr 2005 23:33:01 -0000
Subject: svn commit: r161991 - in
 geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler:
 Compiler.java SkelCompiler.java StubCompiler.java
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: djencks
Date: Tue Apr 19 16:33:00 2005
New Revision: 161991

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161991
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/inter=
op/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=3Ddiff&r1=
=3D161990&r2=3D161991
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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 plat=
form path
         // separators and file separators were as required on the platform=
?
-       =20
+
         if (File.separatorChar =3D=3D '/') {
             // We're under Unix, change '\\' to '/'
             return path.replace( '\\', '/' );
@@ -199,12 +199,12 @@
         }
     }
=20
-    protected Method[] getMethods( Class intfClass, GenOptions go )
+    protected Method[] getMethods(Class intfClass, boolean isSimpleIdl)
     {
         Method myMethods[] =3D intfClass.getDeclaredMethods();
         ArrayList list =3D new ArrayList( myMethods.length * 2 );
=20
-        collectInterfaceMethods( list, intfClass, go.isSimpleIdl() );
+        collectInterfaceMethods( list, intfClass, isSimpleIdl );
=20
         Object[] objs =3D list.toArray();
         Method[] methods =3D new Method[objs.length];
@@ -213,6 +213,12 @@
         return methods;
     }
=20
+    public MethodOverload[] getMethodOverloads(Class intfCalss, boolean is=
SimpleIdl) {
+        Method[] methods =3D getMethods(intfCalss, isSimpleIdl);
+        MethodOverload[] methodOverloads =3D getMethodOverloads(methods);
+        return methodOverloads;
+    }
+
     public MethodOverload[] getMethodOverloads( Method methods[] )
     {
         HashMap hm =3D new HashMap( methods.length );
@@ -271,7 +277,7 @@
         return name.replace( '.', '_' );
     }
=20
-    class MethodOverload
+    public class MethodOverload
     {
         public Method method;
         public String iiop_name;

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter=
op/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=3Ddiff=
&r1=3D161990&r2=3D161991
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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 @@
=20
             jc.addImport("org.apache.geronimo.interop.rmi.iiop", "RemoteIn=
terface");
             jc.addImport("org.apache.geronimo.interop.rmi.iiop", "ObjectRe=
f");
-            jc.addImport("org.apache.geronimo.interop.rmi.iiop", "RemoteOb=
ject");           =20
+            jc.addImport("org.apache.geronimo.interop.rmi.iiop", "RemoteOb=
ject");
=20
             jc.setExtends("RemoteObject");
             jc.addImplements("RemoteInterface");
@@ -478,7 +478,7 @@
             JCaseStatement caseStmt =3D null;
             ts.addStatement(switchStmt);
=20
-            Method m[] =3D getMethods( riClass, go );
+            Method m[] =3D getMethods( riClass, go.isSimpleIdl());
             MethodOverload mo[] =3D null;
             mo =3D getMethodOverloads( m );
=20

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter=
op/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=3Ddiff=
&r1=3D161990&r2=3D161991
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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 @@
=20
             addMethod_is_a(jc);
=20
-            Method m[] =3D getMethods( riClass, go );
+            Method m[] =3D getMethods( riClass, go.isSimpleIdl());
             MethodOverload mo[] =3D null;
             mo =3D getMethodOverloads( m );
             for (int i =3D 0; mo !=3D null && i < mo.length; i++) {