r2corba 1.7.0-universal-java → 1.7.1-universal-java

data/lib/corba/jbase/Streams.rb

@@ -26,6 +26,7 @@ module R2CORBA
           if jobj.nil? || !jobj.is_a?(Native::V2_3::Portable::InputStream)
             raise ArgumentError, 'Expected org.omg.CORBA.portable.InputStream'
           end
+
           @@wrapper_klass.new(jobj)
         end
 
@@ -33,51 +34,51 @@ module R2CORBA
           tc = tc.resolved_tc # takes care of recursive typecodes
           v = case tc.kind
           when TK_ANY
-            read_any()
+            read_any
           when TK_BOOLEAN
-            read_boolean()
+            read_boolean
           when TK_SHORT
-            read_short()
+            read_short
           when TK_LONG
-            read_long()
+            read_long
           when TK_USHORT
-            read_ushort()
+            read_ushort
           when TK_WCHAR
-            read_wchar()
+            read_wchar
           when TK_ULONG
-            read_ulong()
+            read_ulong
           when TK_LONGLONG
-            read_longlong()
+            read_longlong
           when TK_ULONGLONG
-            read_ulonglong()
+            read_ulonglong
           when TK_OCTET
-            read_octet()
+            read_octet
           when TK_FLOAT
-            read_float()
+            read_float
           when TK_DOUBLE
-            read_double()
+            read_double
           when TK_LONGDOUBLE
             raise CORBA::NO_IMPLEMENT.new('LongDouble not supported', 0, CORBA::COMPLETED_NO)
           when TK_FIXED
-            read_fixed()
+            read_fixed
           when TK_CHAR
-            read_char()
+            read_char
           when TK_STRING
-            read_string()
+            read_string
           when TK_WSTRING
-            read_wstring()
+            read_wstring
           when TK_OBJREF
-            read_Object()
+            read_Object
           when TK_TYPECODE
-            read_TypeCode()
+            read_TypeCode
           when TK_ARRAY, TK_SEQUENCE,
                TK_ENUM, TK_STRUCT, TK_EXCEPT, TK_UNION,
                TK_PRINCIPAL
             read_construct(tc)
           when TK_ABSTRACT_INTERFACE
-            read_Abstract()
+            read_Abstract
           when TK_VALUE
-            read_value()
+            read_value
           when TK_VALUE_BOX
             read_valuebox(tc.get_type.boxedvalue_helper)
             ## TODO: TK_NATIVE
@@ -85,17 +86,17 @@ module R2CORBA
           v
         end
 
-        def read_any()
+        def read_any
           begin
-            self.stream_.read_any()
+            self.stream_.read_any
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
         end
 
-        def read_boolean()
+        def read_boolean
           begin
-            self.stream_.read_boolean()
+            self.stream_.read_boolean
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -108,12 +109,12 @@ module R2CORBA
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
-          arr.fill(offset, length) {|i| jarr[i]}
+          arr.fill(offset, length) { |i| jarr[i] }
         end
 
-        def read_char()
+        def read_char
           begin
-            self.stream_.read_char().chr
+            self.stream_.read_char.chr
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -126,12 +127,12 @@ module R2CORBA
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
-          arr.fill(offset, length) {|i| jarr[i].chr }
+          arr.fill(offset, length) { |i| jarr[i].chr }
         end
 
-        def read_wchar()
+        def read_wchar
           begin
-            self.stream_.read_wchar()
+            self.stream_.read_wchar
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -144,12 +145,12 @@ module R2CORBA
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
-          arr.fill(offset, length) {|i| jarr[i] }
+          arr.fill(offset, length) { |i| jarr[i] }
         end
 
         def read_octet(value)
           begin
-            [self.stream_.read_octet()].pack('c').unpack('C').first
+            [self.stream_.read_octet].pack('c').unpack('C').first
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -163,12 +164,12 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
           jarr = jarr.pack('c*').unpack('C*')
-          arr.fill(offset, length) {|i| jarr[i] }
+          arr.fill(offset, length) { |i| jarr[i] }
         end
 
-        def read_short()
+        def read_short
           begin
-            self.stream_.read_short()
+            self.stream_.read_short
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -181,12 +182,12 @@ module R2CORBA
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
-          arr.fill(offset, length) {|i| jarr[i] }
+          arr.fill(offset, length) { |i| jarr[i] }
         end
 
-        def read_ushort()
+        def read_ushort
           begin
-            [self.stream_.read_ushort()].pack('s').unpack('S').first
+            [self.stream_.read_ushort].pack('s').unpack('S').first
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -200,12 +201,12 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
           jarr = jarr.pack('s*').unpack('S*')
-          arr.fill(offset, length) {|i| jarr[i] }
+          arr.fill(offset, length) { |i| jarr[i] }
         end
 
-        def read_long()
+        def read_long
           begin
-            self.stream_.read_long()
+            self.stream_.read_long
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -218,12 +219,12 @@ module R2CORBA
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
-          arr.fill(offset, length) {|i| jarr[i] }
+          arr.fill(offset, length) { |i| jarr[i] }
         end
 
-        def read_ulong()
+        def read_ulong
           begin
-            [self.stream_.read_ulong()].pack('l').unpack('L').first
+            [self.stream_.read_ulong].pack('l').unpack('L').first
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -237,12 +238,12 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
           jarr = jarr.pack('l*').unpack('L*')
-          arr.fill(offset, length) {|i| jarr[i] }
+          arr.fill(offset, length) { |i| jarr[i] }
         end
 
-        def read_longlong()
+        def read_longlong
           begin
-            self.stream_.read_longlong()
+            self.stream_.read_longlong
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -255,12 +256,12 @@ module R2CORBA
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
-          arr.fill(offset, length) {|i| jarr[i] }
+          arr.fill(offset, length) { |i| jarr[i] }
         end
 
-        def read_ulonglong()
+        def read_ulonglong
           begin
-            [self.stream_.read_ulonglong()].pack('q').unpack('Q').first
+            [self.stream_.read_ulonglong].pack('q').unpack('Q').first
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -274,12 +275,12 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
           jarr = jarr.pack('q*').unpack('Q*')
-          arr.fill(offset, length) {|i| jarr[i] }
+          arr.fill(offset, length) { |i| jarr[i] }
         end
 
-        def read_float()
+        def read_float
           begin
-            self.stream_.read_float()
+            self.stream_.read_float
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -292,12 +293,12 @@ module R2CORBA
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
-          arr.fill(offset, length) {|i| jarr[i] }
+          arr.fill(offset, length) { |i| jarr[i] }
         end
 
-        def read_double()
+        def read_double
           begin
-            self.stream_.read_double()
+            self.stream_.read_double
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -310,44 +311,44 @@ module R2CORBA
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
-          arr.fill(offset, length) {|i| jarr[i] }
+          arr.fill(offset, length) { |i| jarr[i] }
         end
 
-        def read_string()
+        def read_string
           begin
-            self.stream_.read_string()
+            self.stream_.read_string
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
         end
 
-        def read_wstring()
+        def read_wstring
           begin
-            self.stream_.read_wstring()
+            self.stream_.read_wstring
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
         end
 
-        def read_Object()
+        def read_Object
           begin
-            CORBA::Object._wrap_native(self.stream_().read_Object())
+            CORBA::Object._wrap_native(self.stream_.read_Object)
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
         end
 
-        def read_TypeCode()
+        def read_TypeCode
           begin
-            CORBA::TypeCode._wrap_native(self.stream_().read_TypeCode())
+            CORBA::TypeCode._wrap_native(self.stream_.read_TypeCode)
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
         end
 
-        def read_fixed()
+        def read_fixed
           begin
-            java.math.BigDecimal.new(self.stream_.read_fixed().toString())
+            java.math.BigDecimal.new(self.stream_.read_fixed.toString)
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -355,17 +356,17 @@ module R2CORBA
 
         def read_construct(tc)
           begin
-            jany = self.stream_.orb().create_any()
+            jany = self.stream_.orb.create_any
             jany.read_value(self.stream_, tc.tc_)
-            CORBA::Any.from_java(jany, self.stream_.orb(), tc)
+            CORBA::Any.from_java(jany, self.stream_.orb, tc)
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
         end
 
-        def read_Abstract()
+        def read_Abstract
           begin
-            obj = self.stream_.read_abstract_interface()
+            obj = self.stream_.read_abstract_interface
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -373,9 +374,9 @@ module R2CORBA
           obj
         end
 
-        def read_value()
+        def read_value
           begin
-            self.stream_.read_value()
+            self.stream_.read_value
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -403,6 +404,7 @@ module R2CORBA
           if jobj.nil? || !jobj.is_a?(Native::V2_3::Portable::OutputStream)
             raise ArgumentError, 'Expected org.omg.CORBA.portable.OutputStream'
           end
+
           @@wrapper_klass.new(jobj)
         end
 
@@ -456,7 +458,7 @@ module R2CORBA
           when TK_VALUE
             write_value(value)
           when TK_VALUE_BOX
-            write_valuebox(value, tc.get_type().boxedvalue_helper())
+            write_valuebox(value, tc.get_type.boxedvalue_helper)
             ## TODO: TK_NATIVE
           end
         end
@@ -495,7 +497,7 @@ module R2CORBA
 
         def write_char_array(value, offset, length)
           begin
-            self.stream_.write_char_array(value.collect{|c| c[0]}.to_java(:char), offset, length)
+            self.stream_.write_char_array(value.collect{ |c| c[0] }.to_java(:char), offset, length)
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -667,7 +669,7 @@ module R2CORBA
 
         def write_wstring(value)
           begin
-            self.stream_.write_wstring(value.inject('') {|s, b| s << b.chr})
+            self.stream_.write_wstring(value.inject('') { |s, b| s << b.chr })
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -699,7 +701,7 @@ module R2CORBA
 
         def write_construct(value, tc)
           begin
-            CORBA::Any.to_any(value, tc).to_java(self.stream_().orb()).write_value(self.stream_)
+            CORBA::Any.to_any(value, tc).to_java(self.stream_.orb).write_value(self.stream_)
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -707,7 +709,7 @@ module R2CORBA
 
         def write_Abstract(value)
           begin
-            self.stream_().write_abstract_interface(value.is_a?(CORBA::Object) ? value.objref_ : value)
+            self.stream_.write_abstract_interface(value.is_a?(CORBA::Object) ? value.objref_ : value)
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end

data/lib/corba/jbase/Stub.rb

@@ -20,6 +20,7 @@ module R2CORBA
       # Handle IDL generated invocation
       def _invoke(operation, param = {})
         raise ArgumentError, 'expected Hash' unless ::Hash === param
+
         req = self._request(operation)
         req.arguments = param[:arg_list] if param.has_key?(:arg_list)
         req.exceptions = param[:exc_list] if param.has_key?(:exc_list)
@@ -31,7 +32,6 @@ module R2CORBA
           return nil
         end
       end
-
     end # Stub
   end # CORBA
 end # R2CORBA