[openorb-commits] CVS: OpenORB/src/compiler/org/openorb/compiler/rmi/parser MappingAPI.java,1.16,1.17

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4786/OpenORB/src/compiler/org/openorb/compiler/rmi/parser

Modified Files:
	MappingAPI.java 
Log Message:
Fixed bug #955143

Index: MappingAPI.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/rmi/parser/MappingAPI.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- MappingAPI.java	28 Jul 2004 15:18:05 -0000	1.16
+++ MappingAPI.java	28 Jul 2004 16:04:19 -0000	1.17
@@ -873,10 +873,11 @@
                   m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(),
                   m_javaParser.getAlreadyProcessedClasses() );
             display( "map_inheritance -> map unknown class : " + c.getName() );
+            locIdlObject = locJavaParser.parse_java( c.getName() );
             // Add the tree associated to this file to the tree List
             // and assign to locIdlObj the returned tree
+            // must be called after parse_java because the IdlRoot is changed for some types...
             m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
-            locIdlObject = locJavaParser.parse_java( c.getName() );
             // Get the good object (Exception = value type + exception)
             display( "map_inheritance -> look for : " + ( String )
                   m_javaParser.getMappingNames().get( c.getName() ) + " ( " + c.getName() + " ) " );
@@ -999,8 +1000,9 @@
             JavaParser locJavaParser = new JavaParser( m_rcp, m_ch,
                   m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(),
                   m_javaParser.getAlreadyProcessedClasses() );
-            m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
             locIdlObj = locJavaParser.parse_java( c.getName() );
+            // must be called after parse_java because the IdlRoot is changed for some types...
+            m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
             // Find the good object in this tree
             locIdlFullName = ( String ) m_javaParser.getMappingNames().get( c.getName() );
             if ( locIdlFullName != null )
@@ -1728,10 +1730,11 @@
             JavaParser locJavaParser = new JavaParser( m_rcp, m_ch,
                   m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(),
                   m_javaParser.getAlreadyProcessedClasses() );
+            locIdlObj = locJavaParser.parse_java( c.getName() );
             // Add the tree associated to this file to the tree List
             // and assign to locIdlObj the returned tree
+            // must be called after parse_java because the IdlRoot is changed for some types...
             m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
-            locIdlObj = locJavaParser.parse_java( c.getName() );
             // Get the good object (Exception = value type + exception
             locIdlObj = locIdlObj.returnObject(
                   process_new_full_class_name( c, locExcepName ), true );
@@ -2201,8 +2204,9 @@
                           m_javaParser.getAlreadyProcessedClasses() );
                     // Add the tree associated to this file to the tree List
                     IdlObject locIdlObj1 = null;
-                    m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
                     locIdlObj1 = locJavaParser.parse_java( c.getName() );
+                    // must be called after parse_java because the IdlRoot is changed for some types
+                    m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
                     // Add it to the include files
                     add_idl_object_as_first( m_javaParser.getIdlTreeRoot(),
                           new IdlInclude( m_javaParser.getIdlTreeRoot(),
@@ -2219,7 +2223,7 @@
                 // Add the tree associated to this file to the tree List
                 IdlObject locIdlObj1 = null;
                 locIdlObj1 = locJavaParser.parse_java( c.getName() );
-                // must be called after parse_java because the IdlRoot is chnaged for some types...
+                // must be called after parse_java because the IdlRoot is changed for some types...
                 m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
                 // Add it to the include files
                 add_idl_object_as_first( m_javaParser.getIdlTreeRoot(),
@@ -2279,8 +2283,9 @@
                 JavaParser locJavaParser = new JavaParser( m_rcp, m_ch,
                       m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(),
                       m_javaParser.getAlreadyProcessedClasses() );
-                m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
                 locIdlObj = locJavaParser.parse_java( c.getName() );
+                // must be called after parse_java because the IdlRoot is changed for some types...
+                m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
                 // Find the good object in this tree
                 locArrayIdlFullName = ( String ) m_javaParser.getMappingNames().get( c.getName() );
                 if ( locArrayIdlFullName != null )
@@ -2549,19 +2554,22 @@
                 JavaParser locJavaParser = new JavaParser( m_rcp, m_ch,
                       m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(),
                       m_javaParser.getAlreadyProcessedClasses() );
-                // Add the tree associated to this file to the tree List
-                m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
+                // Add the tree associated to this file to the tree vector
                 locIdlObj = locJavaParser.parse_java( cmpt.getName() );
+                // must be called after parse_java because the IdlRoot is changed for some types...
+                m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
                 // Add it to the include files
                 add_idl_object_as_first( m_javaParser.getIdlTreeRoot(),
                       new IdlInclude( m_javaParser.getIdlTreeRoot(),
                       locJavaParser.getIdlTreeRoot()._name.replace( '.',
-                      '/' ) ) );
+                      java.io.File.separatorChar ) ) );
                 // Find the associated name
                 locIdlObjName = ( String ) m_javaParser.getMappingNames().get( cmpt.getName() );
                 locIdlObj = return_existing_object( locIdlObjName );
                 if ( locIdlObj != null )
                 {
+                    IdlObject locIdlIdent = new IdlIdent( "", parent, locIdlObj );
+                    parent.addIdlObject( locIdlIdent );
                     locStr += locIdlObj._name;
                 }
                 else
@@ -2999,8 +3007,9 @@
                     JavaParser locJavaParser = new JavaParser( m_rcp, m_ch,
                           m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(),
                           m_javaParser.getAlreadyProcessedClasses() );
-                    m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
                     locIdlObj = locJavaParser.parse_java( c.getName() );
+                    // must be called after parse_java because the IdlRoot is changed for some types
+                    m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
                     // Add it to the include files
                     add_idl_object_as_first( m_javaParser.getIdlTreeRoot(),
                           new IdlInclude( m_javaParser.getIdlTreeRoot(),
@@ -3091,8 +3100,9 @@
                     JavaParser locJavaParser = new JavaParser( m_rcp, m_ch,
                           m_javaParser.getCompilationTree(), m_javaParser.getMappingNames(),
                           m_javaParser.getAlreadyProcessedClasses() );
-                    m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
                     locIdlObj = locJavaParser.parse_java( c.getName() );
+                    // must be called after parse_java because the IdlRoot is changed for some types
+                    m_javaParser.getCompilationTree().add( locJavaParser.getIdlTreeRoot() );
                     // Add it to the include files
                     add_idl_object_as_first( m_javaParser.getIdlTreeRoot(),
                           new IdlInclude( m_javaParser.getIdlTreeRoot(),