r2corba 1.5.1-x64-mingw32 → 1.6.1-x64-mingw32

data/lib/corba/jbase/Streams.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
@@ -58,7 +57,7 @@ module R2CORBA
           when TK_DOUBLE
             read_double()
           when TK_LONGDOUBLE
-            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported',0,CORBA::COMPLETED_NO)
+            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported', 0, CORBA::COMPLETED_NO)
           when TK_FIXED
             read_fixed()
           when TK_CHAR
@@ -93,6 +92,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_boolean()
           begin
             self.stream_.read_boolean()
@@ -100,6 +100,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_boolean_array(arr, offset, length)
           jarr = Array.new(arr.size).to_java(:boolean)
           begin
@@ -109,6 +110,7 @@ module R2CORBA
           end
           arr.fill(offset, length) {|i| jarr[i]}
         end
+
         def read_char()
           begin
             self.stream_.read_char().chr
@@ -116,6 +118,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_char_array(arr, offset, length)
           jarr = Array.new(arr.size).to_java(:char)
           begin
@@ -125,6 +128,7 @@ module R2CORBA
           end
           arr.fill(offset, length) {|i| jarr[i].chr }
         end
+
         def read_wchar()
           begin
             self.stream_.read_wchar()
@@ -132,6 +136,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_wchar_array(arr, offset, length)
           jarr = Array.new(arr.size).to_java(:char)
           begin
@@ -141,6 +146,7 @@ module R2CORBA
           end
           arr.fill(offset, length) {|i| jarr[i] }
         end
+
         def read_octet(value)
           begin
             [self.stream_.read_octet()].pack('c').unpack('C').first
@@ -148,6 +154,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_octet_array(arr, offset, length)
           jarr = Array.new(arr.size).to_java(:byte)
           begin
@@ -158,6 +165,7 @@ module R2CORBA
           jarr = jarr.pack('c*').unpack('C*')
           arr.fill(offset, length) {|i| jarr[i] }
         end
+
         def read_short()
           begin
             self.stream_.read_short()
@@ -165,6 +173,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_short_array(arr, offset, length)
           jarr = Array.new(arr.size).to_java(:short)
           begin
@@ -174,6 +183,7 @@ module R2CORBA
           end
           arr.fill(offset, length) {|i| jarr[i] }
         end
+
         def read_ushort()
           begin
             [self.stream_.read_ushort()].pack('s').unpack('S').first
@@ -181,6 +191,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_ushort_array(arr, offset, length)
           jarr = Array.new(arr.size).to_java(:short)
           begin
@@ -191,6 +202,7 @@ module R2CORBA
           jarr = jarr.pack('s*').unpack('S*')
           arr.fill(offset, length) {|i| jarr[i] }
         end
+
         def read_long()
           begin
             self.stream_.read_long()
@@ -198,6 +210,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_long_array(arr, offset, length)
           jarr = Array.new(arr.size).to_java(:int)
           begin
@@ -207,6 +220,7 @@ module R2CORBA
           end
           arr.fill(offset, length) {|i| jarr[i] }
         end
+
         def read_ulong()
           begin
             [self.stream_.read_ulong()].pack('l').unpack('L').first
@@ -214,6 +228,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_ulong_array(arr, offset, length)
           jarr = Array.new(arr.size).to_java(:int)
           begin
@@ -224,6 +239,7 @@ module R2CORBA
           jarr = jarr.pack('l*').unpack('L*')
           arr.fill(offset, length) {|i| jarr[i] }
         end
+
         def read_longlong()
           begin
             self.stream_.read_longlong()
@@ -231,6 +247,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_longlong_array(arr, offset, length)
           jarr = Array.new(arr.size).to_java(:long)
           begin
@@ -240,6 +257,7 @@ module R2CORBA
           end
           arr.fill(offset, length) {|i| jarr[i] }
         end
+
         def read_ulonglong()
           begin
             [self.stream_.read_ulonglong()].pack('q').unpack('Q').first
@@ -247,6 +265,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_ulonglong_array(arr, offset, length)
           jarr = Array.new(arr.size).to_java(:long)
           begin
@@ -257,6 +276,7 @@ module R2CORBA
           jarr = jarr.pack('q*').unpack('Q*')
           arr.fill(offset, length) {|i| jarr[i] }
         end
+
         def read_float()
           begin
             self.stream_.read_float()
@@ -264,6 +284,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_float_array(arr, offset, length)
           jarr = Array.new(arr.size).to_java(:float)
           begin
@@ -273,6 +294,7 @@ module R2CORBA
           end
           arr.fill(offset, length) {|i| jarr[i] }
         end
+
         def read_double()
           begin
             self.stream_.read_double()
@@ -280,6 +302,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_double_array(arr, offset, length)
           jarr = Array.new(arr.size).to_java(:double)
           begin
@@ -289,6 +312,7 @@ module R2CORBA
           end
           arr.fill(offset, length) {|i| jarr[i] }
         end
+
         def read_string()
           begin
             self.stream_.read_string()
@@ -296,6 +320,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_wstring()
           begin
             self.stream_.read_wstring()
@@ -303,6 +328,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_Object()
           begin
             CORBA::Object._wrap_native(self.stream_().read_Object())
@@ -310,6 +336,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_TypeCode()
           begin
             CORBA::TypeCode._wrap_native(self.stream_().read_TypeCode())
@@ -317,6 +344,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_fixed()
           begin
             java.math.BigDecimal.new(self.stream_.read_fixed().toString())
@@ -324,6 +352,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_construct(tc)
           begin
             jany = self.stream_.orb().create_any()
@@ -333,6 +362,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def read_Abstract()
           begin
             obj = self.stream_.read_abstract_interface()
@@ -342,6 +372,7 @@ module R2CORBA
           obj = CORBA::Object._wrap_native(obj) if obj.is_a?(CORBA::Native::Object)
           obj
         end
+
         def read_value()
           begin
             self.stream_.read_value()
@@ -403,7 +434,7 @@ module R2CORBA
           when TK_DOUBLE
             write_double(value)
           when TK_LONGDOUBLE
-            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported',0,CORBA::COMPLETED_NO)
+            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported', 0, CORBA::COMPLETED_NO)
           when TK_FIXED
             write_fixed(value)
           when TK_CHAR
@@ -437,6 +468,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_boolean(value)
           begin
             self.stream_.write_boolean(value)
@@ -444,6 +476,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_boolean_array(value, offset, length)
           begin
             self.stream_.write_boolean_array(value.to_java(:boolean), offset, length)
@@ -451,6 +484,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_char(value)
           begin
             self.stream_.write_char(value[0])
@@ -458,6 +492,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_char_array(value, offset, length)
           begin
             self.stream_.write_char_array(value.collect{|c| c[0]}.to_java(:char), offset, length)
@@ -465,9 +500,11 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_wchar(value)
           self.stream_.write_wchar(value)
         end
+
         def write_wchar_array(value, offset, length)
           begin
             self.stream_.write_wchar_array(value.to_java(:char), offset, length)
@@ -475,6 +512,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_octet(value)
           begin
             self.stream_.write_octet([value].pack('C').unpack('c').first)
@@ -482,6 +520,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_octet_array(value, offset, length)
           begin
             self.stream_.write_octet_array(value.pack('C*').unpack('c*').to_java(:byte), offset, length)
@@ -489,6 +528,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_short(value)
           begin
             self.stream_.write_short(value)
@@ -496,6 +536,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_short_array(value, offset, length)
           begin
             self.stream_.write_short_array(value.to_java(:short), offset, length)
@@ -503,6 +544,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_ushort(value)
           begin
             self.stream_.write_ushort([value].pack('S').unpack('s').first)
@@ -510,6 +552,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_ushort_array(value, offset, length)
           begin
             self.stream_.write_ushort_array(value.pack('S*').unpack('s*').to_java(:short), offset, length)
@@ -517,6 +560,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_long(value)
           begin
             self.stream_.write_long(value)
@@ -524,6 +568,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_long_array(value, offset, length)
           begin
             self.stream_.write_long_array(value.to_java(:int), offset, length)
@@ -531,6 +576,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_ulong(value)
           begin
             self.stream_.write_ulong([value].pack('L').unpack('l').first)
@@ -538,6 +584,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_ulong_array(value, offset, length)
           begin
             self.stream_.write_ulong_array(value.pack('L*').unpack('l*').to_java(:int), offset, length)
@@ -545,6 +592,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_longlong(value)
           begin
             self.stream_.write_longlong(value)
@@ -552,6 +600,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_longlong_array(value, offset, length)
           begin
             self.stream_.write_longlong_array(value.to_java(:long), offset, length)
@@ -559,6 +608,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_ulonglong(value)
           begin
             self.stream_.write_ulonglong([value].pack('Q').unpack('q').first)
@@ -566,6 +616,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_ulonglong_array(value, offset, length)
           begin
             self.stream_.write_ulonglong_array(value.pack('Q*').unpack('q*').to_java(:long), offset, length)
@@ -573,6 +624,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_float(value)
           begin
             self.stream_.write_float(value)
@@ -580,6 +632,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_float_array(value, offset, length)
           begin
             self.stream_.write_float_array(value.to_java(:float), offset, length)
@@ -587,6 +640,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_double(value)
           begin
             self.stream_.write_double(value)
@@ -594,6 +648,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_double_array(value, offset, length)
           begin
             self.stream_.write_double_array(value.to_java(:double), offset, length)
@@ -601,6 +656,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_string(value)
           begin
             self.stream_.write_string(value)
@@ -608,13 +664,15 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         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
         end
+
         def write_fixed(value)
           begin
             self.stream_.write_fixed(java.math.BigDecimal.new(value.to_s))
@@ -622,6 +680,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_Object(value)
           begin
             self.stream_.write_Object(value.objref_)
@@ -629,6 +688,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_TypeCode(value)
           begin
             self.stream_.write_TypeCode(value.tc_)
@@ -636,6 +696,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_construct(value, tc)
           begin
             CORBA::Any.to_any(value, tc).to_java(self.stream_().orb()).write_value(self.stream_)
@@ -643,6 +704,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_Abstract(value)
           begin
             self.stream_().write_abstract_interface(value.is_a?(CORBA::Object) ? value.objref_ : value)
@@ -650,6 +712,7 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
+
         def write_value(value)
           begin
             self.stream_.write_value(value)
@@ -668,4 +731,4 @@ module R2CORBA
       end
     end
   end
-end
+end

data/lib/corba/jbase/Stub.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA

data/lib/corba/jbase/Typecode.rb

@@ -8,9 +8,8 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
-require "corba/jbase/Any.rb"
+require 'corba/jbase/Any.rb'
 require 'bigdecimal'
 
 module R2CORBA
@@ -163,7 +162,7 @@ module R2CORBA
             content_tc = args.shift
             length = args
             raise ArgumentError, 'expected CORBA::TypeCode' unless content_tc.is_a?(CORBA::TypeCode)
-            if length.size>1
+            if length.size > 1
               this_len = length.shift
               content_tc = self.class.new(content_tc, *length)
             else
@@ -232,12 +231,12 @@ module R2CORBA
             @members = []
             members_.each { |n, tc, access| add_member(n, tc, access) }
             jmembers = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::ValueMember.java_class, @members.size)
-            @members.each_with_index do |(mn, mtc, access),i|
+            @members.each_with_index do |(mn, mtc, access), i|
               m_id = mtc.is_a?(IdentifiedTypeCode) ? mtc.id : 'IDL:*primitive*:1.0'
               jmembers[i] = CORBA::Native::ValueMember.new(mn.to_s, m_id,
                                                            name, id.split(':').last,
                                                            mtc.tc_, nil,
-                                                           access==:public ?
+                                                           access == :public ?
                                                               CORBA::PUBLIC_MEMBER :
                                                               CORBA::PRIVATE_MEMBER)
             end
@@ -248,7 +247,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name,modifier,base,jmembers)
+        def _create_tc(id, name, modifier, base, jmembers)
           begin
             CORBA::ORB._orb.create_value_tc(id.to_s,
                                             name.to_s,
@@ -266,7 +265,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name,modifier,base,jmembers)
+        def _create_tc(id, name, modifier, base, jmembers)
           # JaCORB 2.3.1' does not support tk_event typecodes yet;
           # so just let it be a regular valuetype
           # NOTE: this will not be interoperable between jR2CORBA and R2CORBA
@@ -369,7 +368,7 @@ module R2CORBA
             @members = []
             members_.each { |n, tc| add_member(n, tc) }
             jmembers = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::StructMember.java_class, @members.size)
-            @members.each_with_index {|(mn, mtc),i| jmembers[i] = CORBA::Native::StructMember.new(mn.to_s, mtc.tc_, nil) }
+            @members.each_with_index {|(mn, mtc), i| jmembers[i] = CORBA::Native::StructMember.new(mn.to_s, mtc.tc_, nil) }
             @tc_ = _create_tc(id, name, jmembers)
             super(id)
           end
@@ -377,7 +376,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name,jmembers)
+        def _create_tc(id, name, jmembers)
           begin
             CORBA::ORB._orb.create_struct_tc(id.to_s, name.to_s, jmembers)
           rescue ::NativeException
@@ -390,20 +389,20 @@ module R2CORBA
       class Except < Struct
 
         def from_java(jex)
-          raise CORBA::BAD_PARAM.new('org.om.CORBA.UserException expected',0,CORBA::COMPLETED_NO) unless jex.is_a?(CORBA::Native::UserException)
+          raise CORBA::BAD_PARAM.new('org.om.CORBA.UserException expected', 0, CORBA::COMPLETED_NO) unless jex.is_a?(CORBA::Native::UserException)
           ex = get_type.new
-          members.each {|mname,mtc| ex.__send__("#{mname}=".to_sym, jex.__send__(mname.to_sym)) }
+          members.each {|mname, mtc| ex.__send__("#{mname}=".to_sym, jex.__send__(mname.to_sym)) }
           ex
         end
 
         def is_compatible?(jex)
-          raise CORBA::BAD_PARAM.new('org.om.CORBA.UserException expected',0,CORBA::COMPLETED_NO) unless jex.is_a?(CORBA::Native::UserException)
-          members.all? {|mname,mtc| jex.respond_to?(mname.to_sym) }
+          raise CORBA::BAD_PARAM.new('org.om.CORBA.UserException expected', 0, CORBA::COMPLETED_NO) unless jex.is_a?(CORBA::Native::UserException)
+          members.all? {|mname, mtc| jex.respond_to?(mname.to_sym) }
         end
 
         protected
 
-        def _create_tc(id,name,jmembers)
+        def _create_tc(id, name, jmembers)
           begin
             CORBA::ORB._orb.create_exception_tc(id.to_s, name.to_s, jmembers)
           rescue ::NativeException
@@ -424,7 +423,7 @@ module R2CORBA
             @members = []
             def_inx = @tc_.default_index
             @tc_.member_count.times do |i|
-              if def_inx < 0  || def_inx != i
+              if def_inx < 0 || def_inx != i
                 ml_ = Any.from_java(@tc_.member_label(i))
               else
                 ml_ = :default
@@ -450,6 +449,7 @@ module R2CORBA
             super(id)
           end
         end
+
         # because creating the native tc involves creating Any's we postpone until actually needed
         def tc_
           @tc_ ||= begin
@@ -468,7 +468,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name, disctc,jmembers)
+        def _create_tc(id, name, disctc, jmembers)
           begin
             CORBA::ORB._orb.create_union_tc(id.to_s, name.to_s, disctc.tc_, jmembers)
           rescue ::NativeException
@@ -505,7 +505,7 @@ module R2CORBA
       def TypeCode.get_primitive_tc(kind)
         case kind
         when CORBA::TK_OBJREF
-          TypeCode::ObjectRef.new("IDL:omg.org/CORBA/Object:1.0", "Object", CORBA::Object).freeze
+          TypeCode::ObjectRef.new('IDL:omg.org/CORBA/Object:1.0', 'Object', CORBA::Object).freeze
         else
           TypeCode._wrap_native(CORBA::ORB._orb.get_primitive_tc(CORBA::Native::TCKind.from_int(kind.to_i)))
         end

data/lib/corba/jbase/Values.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
@@ -22,6 +21,7 @@ module R2CORBA
         end
       end
     end
+
     module ValueBase
       def self.included(mod)
         mod.module_eval do
@@ -112,6 +112,7 @@ module R2CORBA
         class FactoryBase < CORBA::Portable::ValueFactoryBase
           ## generic factory base
         end
+
         def self.included(mod)
           mod.module_eval do
             include CORBA::ValueBase unless self.include?(CORBA::ValueBase)

data/lib/corba/jbase/exception.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 # import all java CORBA exceptions into the R2CORBA::CORBA namespace
@@ -74,6 +73,7 @@ module R2CORBA
         end
         raise exklass.new(jex)
       end
+
       def initialize(*args)
         if (NativeException === args.first and args.first.cause.is_a? Native::SystemException) or args.first.is_a?(Native::SystemException)
           java_ex = args.first.is_a?(Native::SystemException) ? args.first : args.first.cause
@@ -83,7 +83,7 @@ module R2CORBA
           self.set_backtrace(args.first.backtrace) if NativeException === args.first
         else
           super(args.shift.to_s)
-          @minor, @completed = (args + [0,0][args.size..2])
+          @minor, @completed = (args + [0, 0][args.size..2])
         end
       end
     end