r2corba 1.5.4 → 1.5.5

data/lib/corba/cbase/Typecode.rb

@@ -118,7 +118,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
@@ -196,7 +196,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name,modifier,base,members)
+        def _create_tc(id, name, modifier, base, members)
           begin
             CORBA::Native::TypeCode.create_tc(TK_VALUE, id.to_s, name.to_s,
                                               CORBA::VT_MODIFIERS[modifier],
@@ -213,7 +213,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name,modifier,base,members)
+        def _create_tc(id, name, modifier, base, members)
           begin
             CORBA::Native::TypeCode.create_tc(TK_EVENT, id.to_s, name.to_s,
                                               CORBA::VT_MODIFIERS[modifier],
@@ -321,7 +321,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name,members)
+        def _create_tc(id, name, members)
           begin
             CORBA::Native::TypeCode.create_tc(TK_STRUCT, id.to_s, name.to_s, members)
           rescue ::NativeException
@@ -335,7 +335,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name,members)
+        def _create_tc(id, name, members)
           begin
             CORBA::Native::TypeCode.create_tc(TK_EXCEPT, id.to_s, name.to_s, members)
           rescue ::NativeException
@@ -356,7 +356,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_ = @tc_.member_label(i)
               else
                 ml_ = :default

data/lib/corba/cbase/exception.rb

@@ -40,9 +40,9 @@ module R2CORBA
         if exklass.nil? || !(CORBA::SystemException > exklass)
           Kernel.raise InternalError,
                 "Unknown SystemException raised: " +
-                id.to_s+' ['+reason.to_s+']'
+                id.to_s + ' [' + reason.to_s + ']'
         else
-          Kernel.raise exklass.new(reason,minor,completed)
+          Kernel.raise exklass.new(reason, minor, completed)
         end
       end
       def initialize(reason="", minor=0, completed=nil)

data/lib/corba/cbase/policies.rb

@@ -24,7 +24,7 @@ module R2CORBA
 
     module ORB
       def create_policy(type, val)
-        raise CORBA::BAD_PARAM.new('Any expected',0,CORBA::COMPLETED_NO) unless CORBA::Any === val
+        raise CORBA::BAD_PARAM.new('Any expected', 0, CORBA::COMPLETED_NO) unless CORBA::Any === val
         begin
           self.orb_.create_policy(type.to_i, val)
         rescue ::NativeException

data/lib/corba/cmds/base.rb

@@ -48,7 +48,7 @@ module R2CORBA
     def self.parse_args(args)
       opts = OptionParser.new
       opts.banner = "Usage: r2corba [global options] command [command options]\n\n" +
-          "    command\t\tSpecifies R2CORBA command to execute.\n"+
+          "    command\t\tSpecifies R2CORBA command to execute.\n" +
           "           \t\tDefault = list :== list commands\n"
       opts.separator ''
       opts.on('-v', '--verbose',

data/lib/corba/common/Any.rb

@@ -64,7 +64,7 @@ module R2CORBA
           if tc.is_a?(CORBA::TypeCode)
             return new(o, tc)
           end
-          raise CORBA::MARSHAL.new('missing TypeCode',0,CORBA::COMPLETED_NO)
+          raise CORBA::MARSHAL.new('missing TypeCode', 0, CORBA::COMPLETED_NO)
         end
         return new(o, tc)
       end

data/lib/corba/common/ORB.rb

@@ -259,7 +259,7 @@ module R2CORBA
       # Identifier name
       # TypeCode boxed_type
       # ret TypeCode
-      def create_value_box_tc (id, name, boxed_type)
+      def create_value_box_tc(id, name, boxed_type)
         return CORBA::TypeCode::Valuebox.new(id, name, boxed_type)
       end
 

data/lib/corba/common/Object.rb

@@ -208,4 +208,3 @@ module R2CORBA
     end # Object
   end # CORBA
 end # R2CORBA
-

data/lib/corba/common/Stub.rb

@@ -70,7 +70,7 @@ module R2CORBA
           s = ""
           s << self.class.name.to_s << "\n" <<
                "type_id: \n" <<
-               "  " <<  @ids.join("\n  ") << "\n"
+               "  " << @ids.join("\n  ") << "\n"
         end
       end # Stub
     end # Portable

data/lib/corba/common/Typecode.rb

@@ -92,10 +92,10 @@ module R2CORBA
       end
 
       def TypeCode.from_native(ntc)
-        if [TK_NULL,TK_VOID,TK_ANY,TK_BOOLEAN,TK_SHORT,TK_LONG,TK_USHORT,
-            TK_WCHAR,TK_ULONG,TK_LONGLONG,TK_ULONGLONG,TK_OCTET,
-            TK_FLOAT,TK_DOUBLE,TK_LONGDOUBLE,TK_CHAR,
-            TK_TYPECODE,TK_PRINCIPAL].include?(native_kind(ntc))
+        if [TK_NULL, TK_VOID, TK_ANY, TK_BOOLEAN, TK_SHORT, TK_LONG, TK_USHORT,
+            TK_WCHAR, TK_ULONG, TK_LONGLONG, TK_ULONGLONG, TK_OCTET,
+            TK_FLOAT, TK_DOUBLE, TK_LONGDOUBLE, TK_CHAR,
+            TK_TYPECODE, TK_PRINCIPAL].include?(native_kind(ntc))
           ## primitive typecode; wrap it
           return TypeCode._wrap_native(ntc)
         else
@@ -157,9 +157,9 @@ module R2CORBA
               rtc = TypeCode::Valuetype.new(ntc)
             end
           when TK_NATIVE
-            raise CORBA::NO_IMPLEMENT.new('typecode #{native_kind(ntc)} not supported',0,CORBA::COMPLETED_NO)
+            raise CORBA::NO_IMPLEMENT.new('typecode #{native_kind(ntc)} not supported', 0, CORBA::COMPLETED_NO)
           else
-            raise CORBA::MARSHAL.new("unknown kind [#{native_kind(ntc)}]",0,CORBA::COMPLETED_NO)
+            raise CORBA::MARSHAL.new("unknown kind [#{native_kind(ntc)}]", 0, CORBA::COMPLETED_NO)
           end
           return rtc
         end
@@ -342,7 +342,7 @@ module R2CORBA
         when TK_ANY
           return CORBA::Any === val ? val : Any.to_any(val)
         when TK_BOOLEAN
-          return val if ((val.is_a? TrueClass) || (val.is_a? FalseClass))
+          return val if (val.is_a? TrueClass) || (val.is_a? FalseClass)
         when TK_SHORT
           return val.to_int if val.respond_to?(:to_int) && ShortRange === val.to_int
         when TK_LONG
@@ -367,7 +367,7 @@ module R2CORBA
             return val.respond_to?(:to_str) ? val.to_str : val.to_int.chr
           end
         else
-          return val if (val.nil? || val.is_a?(self.get_type))
+          return val if val.nil? || val.is_a?(self.get_type)
         end
         raise CORBA::MARSHAL.new(
           "value does not match type: value = #{val}, value type == #{val.class.name}, type == #{get_type.name}",
@@ -431,7 +431,7 @@ module R2CORBA
           val = ::String === val ? val : val.to_str
           raise ::CORBA::MARSHAL.new(
             "string size exceeds bound: #{self.length.to_s}",
-            1, ::CORBA::COMPLETED_NO) unless (self.length==0 || val.size<=self.length)
+            1, ::CORBA::COMPLETED_NO) unless self.length == 0 || val.size <= self.length
           val
         end
 
@@ -464,7 +464,7 @@ module R2CORBA
           end
           raise ::CORBA::MARSHAL.new(
             "widestring size exceeds bound: #{self.length.to_s}",
-            1, ::CORBA::COMPLETED_NO) unless (self.length==0 || val.size<=self.length)
+            1, ::CORBA::COMPLETED_NO) unless self.length == 0 || val.size <= self.length
           raise ::CORBA::MARSHAL.new(
             "invalid widestring element(s)",
             1, ::CORBA::COMPLETED_NO) if val.any? { |el| !(UShortRange === (el.respond_to?(:to_int) ? el.to_int : el)) }
@@ -538,7 +538,7 @@ module R2CORBA
           end
           raise ::CORBA::MARSHAL.new(
             "sequence size exceeds bound: #{self.length.to_s}",
-            1, ::CORBA::COMPLETED_NO) unless (self.length==0 || val.size<=self.length)
+            1, ::CORBA::COMPLETED_NO) unless self.length == 0 || val.size <= self.length
           if ::Array === val
             if val.any? { |e| self.content_type.needs_conversion(e) }
               val.collect { |e| self.content_type.validate(e) }
@@ -559,8 +559,8 @@ module R2CORBA
         end
 
         def inspect
-          "#{self.class.name}: "+
-              "length=#{if self.length.nil? then ""; else  self.length.to_s; end}; "+
+          "#{self.class.name}: " +
+              "length=#{if self.length.nil? then ""; else  self.length.to_s; end}; " +
               "content=#{self.content_type.inspect}"
         end
       end
@@ -580,10 +580,10 @@ module R2CORBA
           super(val)
           raise ::CORBA::MARSHAL.new(
             "array size exceeds bound: #{self.length.to_s}",
-            1, ::CORBA::COMPLETED_NO) unless val.nil? || val.size<=self.length
+            1, ::CORBA::COMPLETED_NO) unless val.nil? || val.size <= self.length
           raise ::CORBA::MARSHAL.new(
             "array size too small: #{self.length.to_s}",
-            1, ::CORBA::COMPLETED_NO) unless val.nil? || val.size>=self.length
+            1, ::CORBA::COMPLETED_NO) unless val.nil? || val.size >= self.length
           val.any? { |e| self.content_type.needs_conversion(e) } ? val.collect { |e| self.content_type.validate(e) } : val.each { |e| self.content_type.validate(e) }
         end
 
@@ -653,7 +653,7 @@ module R2CORBA
           tc.members.each do |nm_, tc_, access_|
             value_type::Intf.module_eval(%Q{attr_accessor :#{nm_}})
             value_type::Intf.__send__(:private, nm_.intern)
-            value_type::Intf.__send__(:private, (nm_+'=').intern)
+            value_type::Intf.__send__(:private, (nm_ + '=').intern)
           end
           value_type
         end
@@ -668,7 +668,7 @@ module R2CORBA
           if needs_conversion(val)
             vorg = val
             val = vorg.class.new
-            @members.each { |name, tc| val.__send__((name+'=').intern, tc.validate(vorg.__send__(name.intern))) }
+            @members.each { |name, tc| val.__send__((name + '=').intern, tc.validate(vorg.__send__(name.intern))) }
           else
             @members.each { |name, tc| tc.validate(val.__send__(name.intern)) }
           end
@@ -677,24 +677,24 @@ module R2CORBA
 
         def needs_conversion(val)
           return false if val.nil?
-          @members.any? { |name,tc| tc.needs_conversion(val.__send__(name.intern)) }
+          @members.any? { |name, tc| tc.needs_conversion(val.__send__(name.intern)) }
         end
 
         def member_count
           @members.size
         end
         def member_name(index)
-          raise ::CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][0]
         end
         def member_type(index)
-          raise ::CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][1]
         end
 
         def inspect
           s = "#{self.class.name}: #{name} - #{id}\n"
-          @members.each { |n, t| s += "  #{n} = "+t.inspect+"\n" }
+          @members.each { |n, t| s += "  #{n} = " + t.inspect + "\n" }
           s
         end
       end # Valuetype
@@ -785,7 +785,7 @@ module R2CORBA
                 @@tc_#{tc.name} ||= TypeCode.typecode_for_id('#{tc.id}')
               end
               def initialize(*param_)
-                #{tc.members.collect {|n,t| "@#{n}"}.join(', ')} = param_
+                #{tc.members.collect {|n, t| "@#{n}"}.join(', ')} = param_
               end
             end
             #{tc.name}
@@ -807,7 +807,7 @@ module R2CORBA
           if needs_conversion(val)
             vorg = val
             val = vorg.class.new
-            @members.each { |name, tc| val.__send__((name+'=').intern, tc.validate(vorg.__send__(name.intern))) }
+            @members.each { |name, tc| val.__send__((name + '=').intern, tc.validate(vorg.__send__(name.intern))) }
           else
             @members.each { |name, tc| tc.validate(val.__send__(name.intern)) }
           end
@@ -815,24 +815,24 @@ module R2CORBA
         end
 
         def needs_conversion(val)
-          @members.any? { |name,tc| tc.needs_conversion(val.__send__(name.intern)) }
+          @members.any? { |name, tc| tc.needs_conversion(val.__send__(name.intern)) }
         end
 
         def member_count
           @members.size
         end
         def member_name(index)
-          raise ::CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][0]
         end
         def member_type(index)
-          raise ::CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][1]
         end
 
         def inspect
           s = "#{self.class.name}: #{name} - #{id}\n"
-          @members.each { |n, t| s += "  #{n} = "+t.inspect+"\n" }
+          @members.each { |n, t| s += "  #{n} = " + t.inspect + "\n" }
           s
         end
       end # Struct
@@ -860,7 +860,7 @@ module R2CORBA
                 @@tc_#{tc.name} ||= TypeCode.typecode_for_id('#{tc.id}')
               end
               def initialize(*param_)
-                #{tc.members.collect {|n,t| "@#{n}"}.join(',')} = param_
+                #{tc.members.collect {|n, t| "@#{n}"}.join(',')} = param_
               end
             end
             #{tc.name}
@@ -942,7 +942,7 @@ module R2CORBA
             if needs_conversion(val)
               vorg = val
               val = vorg.class.new
-              val.__send__((@members[@labels[vorg._disc]][1]+'=').intern,
+              val.__send__((@members[@labels[vorg._disc]][1] + '=').intern,
                             @members[@labels[vorg._disc]][2].validate(vorg._value))
             else
               @members[@labels[val._disc]][2].validate(val._value)
@@ -959,15 +959,15 @@ module R2CORBA
           @members.size
         end
         def member_name(index)
-          raise CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][1]
         end
         def member_type(index)
-          raise CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][2]
         end
         def member_label(index)
-          raise CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][0]
         end
         def discriminator_type
@@ -992,7 +992,7 @@ module R2CORBA
 
         def inspect
           s = "#{self.class.name}: #{name} - #{id}\n"
-          @members.each { |l, n, t| s += "  case #{l.to_s}: #{n} = "+t.inspect+"\n" }
+          @members.each { |l, n, t| s += "  case #{l.to_s}: #{n} = " + t.inspect + "\n" }
           s
         end
       end # Union
@@ -1022,7 +1022,7 @@ module R2CORBA
           @members.size
         end
         def member_name(index)
-          raise CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index]
         end
       end # Enum

data/lib/corba/common/const.rb

@@ -11,8 +11,8 @@
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
-    BIG_ENDIAN, LTL_ENDIAN = 0,1
-    ENDIAN = ("Ruby".unpack("i")[0] == 2036495698)? LTL_ENDIAN: BIG_ENDIAN
+    BIG_ENDIAN, LTL_ENDIAN = 0, 1
+    ENDIAN = ("Ruby".unpack("i")[0] == 2036495698) ? LTL_ENDIAN : BIG_ENDIAN
 
     ARG_IN = 1
     ARG_OUT = 2

data/lib/corba/common/version.rb

@@ -14,7 +14,7 @@ module R2CORBA
 
   R2CORBA_MAJOR = 1
   R2CORBA_MINOR = 5
-  R2CORBA_RELEASE = 4
+  R2CORBA_RELEASE = 5
 
   R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
 

data/lib/corba/jbase/Any.rb

@@ -20,16 +20,16 @@ module R2CORBA
       end
     end
     class Any
-      def to_java(jorb=nil,jany=nil)
+      def to_java(jorb=nil, jany=nil)
         rtc = self._tc
         rval = self._value.nil? ? self._value : rtc.validate(self._value)
         restc = rtc.resolved_tc
         begin
           if [TK_VALUE, TK_VALUE_BOX, TK_ABSTRACT_INTERFACE].include?(restc.kind) ||
-             (!rval.nil? && [TK_NULL,TK_ANY,TK_BOOLEAN,TK_SHORT,TK_LONG,TK_USHORT,
-                            TK_WCHAR,TK_ULONG,TK_LONGLONG,TK_ULONGLONG,TK_OCTET,
-                            TK_FLOAT,TK_DOUBLE,TK_LONGDOUBLE,TK_CHAR,TK_STRING,TK_WSTRING,
-                            TK_VALUE, TK_VALUE_BOX,TK_TYPECODE,TK_OBJREF,TK_PRINCIPAL].include?(restc.kind))
+             (!rval.nil? && [TK_NULL, TK_ANY, TK_BOOLEAN, TK_SHORT, TK_LONG, TK_USHORT,
+                            TK_WCHAR, TK_ULONG, TK_LONGLONG, TK_ULONGLONG, TK_OCTET,
+                            TK_FLOAT, TK_DOUBLE, TK_LONGDOUBLE, TK_CHAR, TK_STRING, TK_WSTRING,
+                            TK_VALUE, TK_VALUE_BOX, TK_TYPECODE, TK_OBJREF, TK_PRINCIPAL].include?(restc.kind))
             jorb ||= CORBA::ORB._orb
             jany ||= jorb.create_any()
             case restc.kind
@@ -60,7 +60,7 @@ module R2CORBA
             when TK_DOUBLE
               jany.insert_double(rval)
             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
               jany.insert_fixed(java.math.BigDecimal.new(rval.to_s))
             when TK_CHAR
@@ -68,7 +68,7 @@ module R2CORBA
             when TK_STRING
               jany.insert_string(rval)
             when TK_WSTRING
-              jany.insert_wstring(rval.inject('') {|s,b| s << b.chr})
+              jany.insert_wstring(rval.inject('') {|s, b| s << b.chr})
             when TK_VALUE
               jany.insert_Value(rval, rtc.tc_)
             when TK_VALUE_BOX
@@ -94,10 +94,10 @@ module R2CORBA
                 jany.insert_Value(rval, rtc.tc_)
               end
             when TK_PRINCIPAL
-              raise CORBA::NO_IMPLEMENT.new('Principal not supported',0,CORBA::COMPLETED_NO)
+              raise CORBA::NO_IMPLEMENT.new('Principal not supported', 0, CORBA::COMPLETED_NO)
             ## TODO: TK_NATIVE
             else
-              raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]",0,CORBA::COMPLETED_NO)
+              raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]", 0, CORBA::COMPLETED_NO)
             end
             return jany
           else
@@ -112,15 +112,15 @@ module R2CORBA
                   jdynany.set_as_ulong(rval)
                 when TK_ARRAY
                   jelems = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Any.java_class, rval.size)
-                  rval.each_with_index {|e,i| jelems[i] = Any.to_any(e, restc.content_type).to_java(jorb) }
+                  rval.each_with_index {|e, i| jelems[i] = Any.to_any(e, restc.content_type).to_java(jorb) }
                   jdynany.set_elements(jelems)
                 when TK_SEQUENCE
                   jelems = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Any.java_class, rval.size)
-                  rval.each_with_index {|e,i| jelems[i] = Any.to_any(e, restc.content_type).to_java(jorb) }
+                  rval.each_with_index {|e, i| jelems[i] = Any.to_any(e, restc.content_type).to_java(jorb) }
                   jdynany.set_elements(jelems)
                 when TK_STRUCT, TK_EXCEPT
                   jmembers = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Dynamic::NameValuePair.java_class, restc.members.size)
-                  rtc.members.each_with_index {|(mn, mt),i| jmembers[i] = CORBA::Native::Dynamic::NameValuePair.new(mn, Any.to_any(rval.__send__(mn.intern), mt).to_java(jorb)) }
+                  rtc.members.each_with_index {|(mn, mt), i| jmembers[i] = CORBA::Native::Dynamic::NameValuePair.new(mn, Any.to_any(rval.__send__(mn.intern), mt).to_java(jorb)) }
                   jdynany.set_members(jmembers)
                 when TK_UNION
                   if rval._is_at_default?
@@ -134,7 +134,7 @@ module R2CORBA
                     jdynany.member.from_any(Any.to_any(rval._value, rval._value_tc).to_java(jorb))
                   end
                 else
-                  raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]",0,CORBA::COMPLETED_NO)
+                  raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]", 0, CORBA::COMPLETED_NO)
                 end
               end
               if jany.nil?
@@ -156,11 +156,11 @@ module R2CORBA
         rtc ||= CORBA::TypeCode.from_native(jany.type)
         rval = nil
         begin
-          if [TK_NULL,TK_VOID,TK_ANY,TK_BOOLEAN,TK_SHORT,TK_LONG,TK_USHORT,
-              TK_WCHAR,TK_ULONG,TK_LONGLONG,TK_ULONGLONG,TK_OCTET,
-              TK_FLOAT,TK_DOUBLE,TK_LONGDOUBLE,TK_CHAR,TK_STRING,TK_WSTRING,
-              TK_VALUE, TK_VALUE_BOX,TK_TYPECODE,TK_OBJREF,
-              TK_ABSTRACT_INTERFACE,TK_PRINCIPAL].include?(rtc.resolved_tc.kind)
+          if [TK_NULL, TK_VOID, TK_ANY, TK_BOOLEAN, TK_SHORT, TK_LONG, TK_USHORT,
+              TK_WCHAR, TK_ULONG, TK_LONGLONG, TK_ULONGLONG, TK_OCTET,
+              TK_FLOAT, TK_DOUBLE, TK_LONGDOUBLE, TK_CHAR, TK_STRING, TK_WSTRING,
+              TK_VALUE, TK_VALUE_BOX, TK_TYPECODE, TK_OBJREF,
+              TK_ABSTRACT_INTERFACE, TK_PRINCIPAL].include?(rtc.resolved_tc.kind)
             case rtc.resolved_tc.kind
             when TK_NULL, TK_VOID
               # leave as is
@@ -189,7 +189,7 @@ module R2CORBA
             when TK_DOUBLE
               rval = jany.extract_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
               rval = BigDecimal(jany.extract_fixed().toString())
             when TK_CHAR
@@ -217,10 +217,10 @@ module R2CORBA
                 jobj
               end
             when TK_PRINCIPAL
-              raise CORBA::NO_IMPLEMENT.new('Principal not supported',0,CORBA::COMPLETED_NO)
+              raise CORBA::NO_IMPLEMENT.new('Principal not supported', 0, CORBA::COMPLETED_NO)
             ## TODO: TK_NATIVE
             else
-              raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]",0,CORBA::COMPLETED_NO)
+              raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]", 0, CORBA::COMPLETED_NO)
             end
           else
             dynFactory = CORBA::Native::Dynamic::DynAnyFactoryHelper.narrow(
@@ -239,7 +239,7 @@ module R2CORBA
                 jdynany.get_elements().each {|e| rval << Any.from_java(e, jorb, restc.content_type) }
               when TK_STRUCT, TK_EXCEPT
                 rval = rtc.get_type.new
-                jdynany.get_members().each_with_index {|nvp,i| rval.__send__("#{nvp.id}=".intern, Any.from_java(nvp.value, jorb, restc.member_type(i))) }
+                jdynany.get_members().each_with_index {|nvp, i| rval.__send__("#{nvp.id}=".intern, Any.from_java(nvp.value, jorb, restc.member_type(i))) }
               when TK_UNION
                 rval = rtc.get_type.new
                 if jdynany.get_discriminator().type().kind().value() == CORBA::TK_OCTET
@@ -255,7 +255,7 @@ module R2CORBA
                   rval.instance_variable_set('@value', Any.from_java(jdynany.member.to_any, jorb, restc.member_type(minx)))
                 end
               else
-                raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]",0,CORBA::COMPLETED_NO)
+                raise CORBA::MARSHAL.new("unknown kind [#{rtc.kind}]", 0, CORBA::COMPLETED_NO)
               end
             ensure
               jdynany.destroy