Add support for %nspace when using directors - Java

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12891 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Examples/test-suite/common.mk

@@ -173,6 +173,7 @@ CPP_TEST_CASES += \
 	director_ignore \
 	director_keywords \
 	director_namespace_clash \
+	director_nspace \
 	director_nested \
 	director_overload \
 	director_primitives \

Examples/test-suite/director_nspace.i

@@ -0,0 +1,68 @@
+%module(directors="1") director_nspace
+
+#ifdef SWIGJAVA
+SWIG_JAVABODY_PROXY(public, public, SWIGTYPE)
+SWIG_JAVABODY_TYPEWRAPPER(public, public, public, SWIGTYPE)
+#endif
+
+%{
+#include <string>
+
+namespace Bar
+{
+  class FooBar {
+  public:
+    FooBar() {}
+    FooBar(const FooBar&) {}
+    virtual ~FooBar() {}
+    
+    std::string FooBarDo() { return "Bar::Foo2::Foo2Bar()"; }
+  };
+  
+  class Foo {
+  public:
+    virtual ~Foo() {}
+    virtual std::string ping() { return "Bar::Foo::ping()"; }
+    virtual std::string pong() { return "Bar::Foo::pong();" + ping(); }
+    virtual std::string fooBar(FooBar* fooBar) { return fooBar->FooBarDo(); }
+    virtual Foo makeFoo() { return Foo(); }
+    virtual FooBar makeFooBar() { return FooBar(); }
+
+    static Foo* get_self(Foo *self) {return self;}
+  };
+}
+
+%}
+
+%include <std_string.i>
+
+%nspace Bar::Foo;
+%nspace Bar::FooBar;
+
+%feature("director") Bar::Foo;
+
+namespace Bar
+{ 
+  class FooBar {
+  public:
+    FooBar();
+    FooBar(const FooBar&);
+    virtual ~FooBar();
+    
+    std::string FooBarDo();
+    
+  };
+  
+  class Foo
+  {
+  public:
+    virtual ~Foo();
+    virtual std::string ping();
+    virtual std::string pong();
+    virtual std::string fooBar(FooBar* fooBar);
+    virtual Foo makeFoo();
+    virtual FooBar makeFooBar();
+   
+    static Foo* get_self(Foo *self);
+  };
+}

Examples/test-suite/java/Makefile.in

@@ -43,6 +43,7 @@ SWIGOPT += -package $(JAVA_PACKAGE)
 # Custom tests - tests with additional commandline options
 nspace.%: JAVA_PACKAGE = $*Package
 nspace_extend.%: JAVA_PACKAGE = $*Package
+director_nspace.%: JAVA_PACKAGE = $*Package
 
 # Rules for the different types of tests
 %.cpptest: 

Examples/test-suite/java/director_nspace_runme.java

@@ -0,0 +1,48 @@
+// Make sure that directors are connected and disconnected when used inconjunction with
+// the %nspace feature
+
+public class director_nspace_runme {
+
+  static {
+    try {
+      System.loadLibrary("director_nspace");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    director_nspace_MyBarFoo myBarFoo =
+      new director_nspace_MyBarFoo();
+  }
+
+}
+
+class director_nspace_MyBarFoo extends director_nspacePackage.Bar.Foo {
+
+  @Override
+  public String ping() {
+    return "director_nspace_MyBarFoo.ping();";
+  }
+
+  @Override
+  public String pong() {
+    return "director_nspace_MyBarFoo.pong();" + ping();
+  }
+
+  @Override
+  public String fooBar(director_nspacePackage.Bar.FooBar fooBar) {
+    return fooBar.FooBarDo();
+  }
+
+  @Override
+  public director_nspacePackage.Bar.Foo makeFoo() {
+    return new director_nspacePackage.Bar.Foo();
+  }
+
+  @Override
+  public director_nspacePackage.Bar.FooBar makeFooBar() {
+    return new director_nspacePackage.Bar.FooBar();
+  }
+}