rjb 1.0.3-mswin32 → 1.0.4-mswin32

data/ext/jp_co_infoseek_hp_arton_rjb_RBridge.h

@@ -1,11 +1,11 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
+/* DO NOT EDIT THIS FILE - it is machine generated */
 #include <jni.h>
-/* Header for class jp_co_infoseek_hp_arton_rjb_RBridge */
-
-#ifndef _Included_jp_co_infoseek_hp_arton_rjb_RBridge
+/* Header for class jp_co_infoseek_hp_arton_rjb_RBridge */
+
+#ifndef _Included_jp_co_infoseek_hp_arton_rjb_RBridge
 #define _Included_jp_co_infoseek_hp_arton_rjb_RBridge
-#ifdef __cplusplus
-extern "C" {
+#ifdef __cplusplus
+extern "C" {
 #endif
 /*
  * Class:     jp_co_infoseek_hp_arton_rjb_RBridge
@@ -13,9 +13,9 @@ extern "C" {
  * Signature: (Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
  */
 JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
-  (JNIEnv *, jobject, jstring, jobject, jobjectArray);
+  (JNIEnv *, jobject, jstring, jobject, jobjectArray);
 
-#ifdef __cplusplus
-}
+#ifdef __cplusplus
+}
 #endif
 #endif

data/ext/load.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: load.c 8 2006-11-20 19:17:22Z arton $
+ * $Id: load.c 9 2006-11-20 19:26:14Z arton $
  */
 
 #include <stdlib.h>

data/ext/rjb.c

@@ -12,10 +12,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.c 8 2006-11-20 19:17:22Z arton $
+ * $Id: rjb.c 11 2007-05-06 10:02:52Z arton $
  */
 
-#define RJB_VERSION "1.0.3"
+#define RJB_VERSION "1.0.4"
 
 #include "ruby.h"
 #include "st.h"
@@ -1885,6 +1885,7 @@ static VALUE rjb_newinstance_s(int argc, VALUE* argv, VALUE self)
     VALUE ret = Qnil;
     struct jv_data* ptr;
     JNIEnv* jenv = rjb_attach_current_thread();
+    int found = 0;
 
     rb_scan_args(argc, argv, "1*", &vsig, &rest);
     sig = StringValueCStr(vsig);
@@ -1897,11 +1898,15 @@ static VALUE rjb_newinstance_s(int argc, VALUE* argv, VALUE self)
 	    if ((*pc)->arg_count == argc - 1
 		&& !strcmp(sig, (*pc)->method_signature))
 	    {
+	        found = 1;
 		ret = createinstance(jenv, argc - 1, argv + 1, &ptr->idata, *pc);
 		break;
 	    }
 	}
     }
+    if (!found) {
+	rb_raise(rb_eRuntimeError, "Constructor not found");
+    }
     return ret;
 }
 
@@ -1911,12 +1916,13 @@ static VALUE rjb_newinstance(int argc, VALUE* argv, VALUE self)
     struct jv_data* ptr;
     struct cls_constructor** pc;
     JNIEnv* jenv = rjb_attach_current_thread();
+    int found = 0;
 
     Data_Get_Struct(self, struct jv_data, ptr);
 
     if (ptr->constructors)
     {
-        int i, found = 0;
+        int i;
 	char* psig;
 	for (pc = ptr->constructors; *pc; pc++)
 	{
@@ -1941,6 +1947,9 @@ static VALUE rjb_newinstance(int argc, VALUE* argv, VALUE self)
 	    }
 	}
     }
+    if (!found) {
+	rb_raise(rb_eRuntimeError, "Constructor not found");
+    }
     return ret;
 }
 

data/test/test.rb

@@ -1,5 +1,5 @@
 #!/usr/local/env ruby
-# $Id: test.rb 4 2006-09-11 15:21:38Z arton $
+# $Id: test.rb 11 2007-05-06 10:02:52Z arton $
 
 require 'test/unit'
 require 'rjb'
@@ -411,5 +411,15 @@ class TestRjb < Test::Unit::TestCase
     assert_equal(nil, test.callWithArraies(nil, nil, nil, nil, nil, nil,
                                            nil, nil))
   end
+
+  def test_failed_constructor_call()
+    test = import('java.lang.String')
+    begin
+      s = test.new('a', 'b', 'c')
+      flunk('no exception')
+    rescue RuntimeError => e
+      assert(e)
+    end
+  end
 end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-date: 2006-11-21 00:00:00 +09:00
+  version: 1.0.4
+date: 2007-05-06 00:00:00 +09:00
 summary: Ruby Java bridge
 require_paths: 
 - lib
@@ -32,22 +32,22 @@ files:
 - ext/RBridge.java
 - ext/load.c
 - ext/riconv.c
-- ext/rjb.c
 - ext/rjbexception.c
+- ext/rjb.c
 - ext/jniwrap.h
-- ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
-- ext/riconv.h
 - ext/rjb.h
+- ext/riconv.h
+- ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
 - samples/filechooser.rb
 - test/gctest.rb
 - test/test.rb
-- test/jp/co/infoseek/hp/arton/rjb/Base.class
 - test/jp/co/infoseek/hp/arton/rjb/ExtBase.class
-- test/jp/co/infoseek/hp/arton/rjb/IBase.class
 - test/jp/co/infoseek/hp/arton/rjb/Test.class
+- test/jp/co/infoseek/hp/arton/rjb/IBase.class
+- test/jp/co/infoseek/hp/arton/rjb/Base.class
 - COPYING
 - ChangeLog
 - readme.sj