[Swig-cvs] SWIG/Source/Modules java.cxx,1.83,1.84

[William F. <wsf...@us...>]

Update of /cvsroot/swig/SWIG/Source/Modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11096

Modified Files:
	java.cxx 
Log Message:
new typemap: javaconstruct. This typemap contains the code that goes into the proxy constructor.
The javaconstruct_director typemap is used instead when directors are enabled.

Index: java.cxx
===================================================================
RCS file: /cvsroot/swig/SWIG/Source/Modules/java.cxx,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** java.cxx	7 Dec 2004 23:24:13 -0000	1.83
--- java.cxx	10 Jan 2005 22:32:33 -0000	1.84
***************
*** 1984,1989 ****
      Parm      *p;
      int       i;
!     Node     *parentNode = parentNode(n);
!     bool      feature_director = (parentNode && Swig_directorclass(n));
  
      Language::constructorHandler(n);
--- 1984,1989 ----
      Parm      *p;
      int       i;
!     String    *function_code = NewString("");
!     bool      feature_director = (parentNode(n) && Swig_directorclass(n));
  
      Language::constructorHandler(n);
***************
*** 2000,2005 ****
        const String *methodmods = Getattr(n,"feature:java:methodmodifiers");
        methodmods = methodmods ? methodmods : (!is_public(n) ? protected_string : public_string);
!       Printf(proxy_class_code, "  %s %s(", methodmods, proxy_class_name);
!       Printv(imcall, "this(", imclass_name, ".", mangled_overname, "(", NIL);
  
        /* Attach the non-standard typemaps to the parameter list */
--- 2000,2005 ----
        const String *methodmods = Getattr(n,"feature:java:methodmodifiers");
        methodmods = methodmods ? methodmods : (!is_public(n) ? protected_string : public_string);
!       Printf(function_code, "  %s %s(", methodmods, proxy_class_name);
!       Printv(imcall, imclass_name, ".", mangled_overname, "(", NIL);
  
        /* Attach the non-standard typemaps to the parameter list */
***************
*** 2011,2015 ****
  
        int gencomma = 0;
-       int ctor_arg_cnt = 0;
  
        /* Output each parameter */
--- 2011,2014 ----
***************
*** 2058,2065 ****
          /* Add parameter to proxy function */
          if(gencomma)
!           Printf(proxy_class_code, ", ");
!         Printf(proxy_class_code, "%s %s", param_type, arg);
          ++gencomma;
-         ctor_arg_cnt++;
  
          Delete(arg);
--- 2057,2063 ----
          /* Add parameter to proxy function */
          if(gencomma)
!           Printf(function_code, ", ");
!         Printf(function_code, "%s %s", param_type, arg);
          ++gencomma;
  
          Delete(arg);
***************
*** 2068,2077 ****
        }
  
!       Printf(imcall, "), true);\n");
  
!       Printf(proxy_class_code, ")");
!       generateThrowsClause(n, proxy_class_code);
!       Printf(proxy_class_code, " {\n");
!       Printf(proxy_class_code, "    %s", imcall);
  
        /* Add director connection call if this class has directors. */
--- 2066,2080 ----
        }
  
!       Printf(imcall, ")");
  
!       Printf(function_code, ")");
!       generateThrowsClause(n, function_code);
!       if (feature_director) {
!         Printv(function_code, " ", typemapLookup("javaconstruct_director", Getattr(n,"name"), WARN_JAVA_TYPEMAP_JAVACONSTRUCT_UNDEF), NIL);
!       } else {
!         Printv(function_code, " ", typemapLookup("javaconstruct", Getattr(n,"name"), WARN_JAVA_TYPEMAP_JAVACONSTRUCT_UNDEF), NIL);
!       }
!       Printf(function_code, "\n");
!       Replaceall(function_code, "$imcall", imcall);
  
        /* Add director connection call if this class has directors. */
***************
*** 2082,2086 ****
  
          String *swig_director_connect = NewStringf("%s_director_connect", proxy_class_name);
!         Printv(proxy_class_code, "    ", imclass_name, ".", swig_director_connect, "(this, swigCPtr);\n", NIL);
  
          if (!emitted_connect) {
--- 2085,2089 ----
  
          String *swig_director_connect = NewStringf("%s_director_connect", proxy_class_name);
! //        Printv(function_code, "    ", imclass_name, ".", swig_director_connect, "(this, swigCPtr);\n", NIL);
  
          if (!emitted_connect) {
***************
*** 2114,2120 ****
        }
  
!       Printf(proxy_class_code, "  }\n\n");
  
!       if(!ctor_arg_cnt)  // We must have a default constructor
          have_default_constructor_flag = true;
  
--- 2117,2123 ----
        }
  
!       Printv(proxy_class_code, function_code, "\n", NIL);
  
!       if(!gencomma)  // We must have a default constructor
          have_default_constructor_flag = true;