jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure 'javapackage' typemap is used as it stopped working from version 2.0.5

Browse source
This commit is contained in:
William S Fulton 2013-01-30 22:18:13 +00:00
commit 397409fbb1
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.current
View file

@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 2.0.10 (in progress) Version 2.0.10 (in progress)
============================ ============================
2013-01-29: William
[Java] Ensure 'javapackage' typemap is used as it stopped working from version 2.0.5.
2013-01-28: William 2013-01-28: William
[Python] Apply patch SF #334 - Fix default value conversions "TRUE"->True, "FALSE"->False. [Python] Apply patch SF #334 - Fix default value conversions "TRUE"->True, "FALSE"->False.

7
Doc/Manual/Java.html
View file

@ -5662,7 +5662,7 @@ to make the method and constructor public:
<p> <p>
The Java directors feature requires the "javadirectorin", "javadirectorout", "directorin" and the "directorout" typemaps in order to work properly. The Java directors feature requires the "javadirectorin", "javadirectorout", "directorin" and the "directorout" typemaps in order to work properly.
The "javapackage" typemap is an optional typemap used to identify the Java package path for individual SWIG generated proxy classes. The "javapackage" typemap is an optional typemap used to identify the Java package path for individual SWIG generated proxy classes used in director methods.
</p> </p>
<p><tt>%typemap(directorin)</tt></p> <p><tt>%typemap(directorin)</tt></p>
@ -5803,6 +5803,7 @@ The target method is the method in the Java proxy class which overrides the virt
<p> <p>
The "javapackage" typemap is optional; it serves to identify a class's Java package. The "javapackage" typemap is optional; it serves to identify a class's Java package.
This typemap should be used in conjunction with classes that are defined outside of the current SWIG interface file. This typemap should be used in conjunction with classes that are defined outside of the current SWIG interface file.
The typemap is only used if the type is used in a director method, that is, in a virtual method in a director class.
For example: For example:
</p> </p>
@ -5819,7 +5820,7 @@ For example:
class Example { class Example {
public: public:
virtual ~Example(); virtual ~Example();
void ping(Foo *arg1, Bar *arg2); virtual void ping(Foo *arg1, Bar *arg2);
}; };
} }
</pre> </pre>
@ -5844,7 +5845,7 @@ The corrected interface file looks like:
class Example { class Example {
public: public:
virtual ~Example(); virtual ~Example();
void ping(Foo *arg1, Bar *arg2); virtual void ping(Foo *arg1, Bar *arg2);
}; };
} }
</pre> </pre>

2
Source/Modules/java.cxx
View file

@ -3527,7 +3527,7 @@ public:
String *pkg_path = Swig_typemap_lookup("javapackage", p, "", 0); String *pkg_path = Swig_typemap_lookup("javapackage", p, "", 0);
SwigType *type = Getattr(p, "type"); SwigType *type = Getattr(p, "type");
if (pkg_path || Len(pkg_path) == 0) if (!pkg_path || Len(pkg_path) == 0)
pkg_path = package_path; pkg_path = package_path;
String *descriptor_out = Copy(descriptor_in); String *descriptor_out = Copy(descriptor_in);