From 0cd4c865e91ade4bae239c69834844ccd7ceb05a Mon Sep 17 00:00:00 2001
From: Harco de Hilster <harcoh@users.sourceforge.net>
Date: Thu, 3 Aug 2000 09:04:53 +0000
Subject: [PATCH] merged cvs version with working version

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@611 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules1.1/java.cxx | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Source/Modules1.1/java.cxx b/Source/Modules1.1/java.cxx
index 02cd33f37..9fc883116 100644
--- a/Source/Modules1.1/java.cxx
+++ b/Source/Modules1.1/java.cxx
@@ -1109,7 +1109,9 @@ void JAVA::cpp_member_func(char *name, char *iname, DataType *t, ParmList *l) {
   if((DataType_Gettypecode(t) != T_VOID) && shadowrettype) 
     Printf(nativecall, "))");
   
+/* HdH
   Printf(nativecall,");\n");
+*/
 
   Printf(f_shadow, ") {\n");
   Printf(f_shadow, "\t%s\n", nativecall);
@@ -1228,11 +1230,12 @@ void JAVA::cpp_constructor(char *name, char *iname, ParmList *l) {
       sprintf(arg,"arg%d",i);
     }
 
-      char *jtype = JavaTypeFromTypemap((char*)"jtype", typemap_lang, pt, pn);
-      if(!jtype) jtype = SwigTcToJavaType(pt, 0, 0);
-      char *jstype = JavaTypeFromTypemap((char*)"jstype", typemap_lang, pt, pn);
-      if(!jstype) jstype = SwigTcToJavaType(pt, 0, 1);
-      if(strcmp(jtype, jstype) == 0) jstype = NULL;
+      char *jtype = JavaTypeFromTypemap("jtype", typemap_lang, p->t, p->name);
+      if(!jtype) jtype = SwigTcToJavaType(p->t, 0, 0);
+      char *jstype = JavaTypeFromTypemap("jstype", typemap_lang, p->t, p->name);
+      if(!jstype && p->t->type == T_USER && p->t->is_pointer <= 1) {
+	jstype = GetChar(shadow_classes,p->t->name);
+      }
 
       // Add to java function header
       Printf(f_shadow, "%s %s", (jstype) ? jstype : jtype, arg);