r2corba 1.5.4 → 1.6.1

data/lib/corba/common/Typecode.rb

@@ -49,6 +49,7 @@ module R2CORBA
           @name_types = {}
           super
         end
+
         def []=(id, tc)
           synchronize do
             @id_types[id] = tc
@@ -57,6 +58,7 @@ module R2CORBA
             @name_types[tc.name] = types_for_name_
           end
         end
+
         def [](id)
           tc = nil
           synchronize do
@@ -64,6 +66,7 @@ module R2CORBA
           end
           tc
         end
+
         def types_for_name(name)
           tcs = nil
           synchronize do
@@ -92,10 +95,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 +160,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
@@ -184,7 +187,7 @@ module R2CORBA
       end
 
       def equal?(tc)
-        raise ArgumentError, "expected CORBA::TypeCode" unless tc.is_a?(CORBA::TypeCode)
+        raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
         begin
           self.tc_.equal(tc.tc_)
         rescue ::NativeException
@@ -193,7 +196,7 @@ module R2CORBA
       end
 
       def equivalent?(tc)
-        raise ArgumentError, "expected CORBA::TypeCode" unless tc.is_a?(CORBA::TypeCode)
+        raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
         begin
           self.tc_.equivalent(tc.tc_)
         rescue ::NativeException
@@ -342,7 +345,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 +370,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}",
@@ -397,19 +400,24 @@ module R2CORBA
           @recursive_tc ||= TypeCode.typecode_for_id(self.id)
           @recursive_tc || ::CORBA::TypeCode.new(TK_NULL)
         end
+
         def resolved_tc
           recursed_tc.resolved_tc
         end
+
         def is_recursive_tc?
           true
         end
+
         def get_type
           @recursive_tc ||= TypeCode.typecode_for_id(self.id)
           if @recursive_tc.nil? then nil; else @recursive_tc.get_type; end
         end
+
         def validate(val)
           recursed_tc.validate(val)
         end
+
         def needs_conversion(val)
           recursed_tc.needs_conversion(val)
         end
@@ -431,7 +439,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,9 +472,9 @@ 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)",
+            'invalid widestring element(s)',
             1, ::CORBA::COMPLETED_NO) if val.any? { |el| !(UShortRange === (el.respond_to?(:to_int) ? el.to_int : el)) }
           val.any? { |el| !(::Integer === el) } ? val.collect { |el| el.to_int } : val
         end
@@ -538,7 +546,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 +567,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 +588,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
 
@@ -607,6 +615,7 @@ module R2CORBA
         def get_type
           @type || self.content_type.get_type
         end
+
         def validate(val)
           self.content_type.validate(val)
         end
@@ -625,6 +634,7 @@ module R2CORBA
         def initialize(*args)
           raise 'overload required'
         end
+
         def add_member(name, tc, access)
           raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
           @members << [name, tc, access]
@@ -653,7 +663,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 +678,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 +687,26 @@ 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
@@ -773,6 +785,7 @@ module R2CORBA
         def initialize(*args)
           raise 'overload required'
         end
+
         def add_member(name, tc)
           raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
           @members << [name, tc]
@@ -785,7 +798,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 +820,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 +828,26 @@ 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 +875,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}
@@ -883,16 +898,20 @@ module R2CORBA
         def initialize(*args)
           raise 'overload required'
         end
+
         # because creating the native tc involves creating Any's we postpone until actually needed
         def tc_
           raise 'overload required'
         end
+
         def id
           @id
         end
+
         def name
           @name
         end
+
         def add_member(label, name, tc)
           raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
           @switchtype.validate(label) unless label == :default
@@ -935,14 +954,14 @@ module R2CORBA
           return val if val.nil?
           super(val)
           @switchtype.validate(val._disc) unless val._disc == :default
-          #raise CORBA::MARSHAL.new(
+          # raise CORBA::MARSHAL.new(
           #  "invalid discriminator value (#{val._disc.to_s}) for union #{name}",
           #  1, CORBA::COMPLETED_NO) unless @labels.has_key?(val._disc)
           if @labels.has_key?(val._disc)  # no need to check for implicit defaults
             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)
@@ -958,28 +977,33 @@ module R2CORBA
         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][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
           @switchtype
         end
+
         def default_index
           if @labels.has_key? :default then @labels[:default]; else -1; end
         end
 
         def label_index(val)
           val = @switchtype.validate(val) unless val == :default
-          #raise CORBA::MARSHAL.new(
+          # raise CORBA::MARSHAL.new(
           #  "invalid discriminator value (#{val}) for union #{name}",
           #  1, CORBA::COMPLETED_NO) unless val == :default || @labels.has_key?(val) || @labels.has_key?(:default)
           if val == :default then @labels[:default]; elsif @labels.has_key?(val) then @labels[val] else nil end
@@ -992,7 +1016,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
@@ -1002,6 +1026,7 @@ module R2CORBA
         def initialize(*args)
           raise 'overload required'
         end
+
         def get_type
           ::Integer
         end
@@ -1021,8 +1046,9 @@ module R2CORBA
         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]
         end
       end # Enum
@@ -1093,17 +1119,17 @@ module R2CORBA
     end
 
     def CORBA._tc_CCMObject
-      @@tc_CCMObject ||= TypeCode::Component.new("IDL:omg.org/CORBA/CCMObject:1.0", "CCMObject", CORBA::Object).freeze
+      @@tc_CCMObject ||= TypeCode::Component.new('IDL:omg.org/CORBA/CCMObject:1.0', 'CCMObject', CORBA::Object).freeze
     end
 
     def CORBA._tc_CCHome
-      @@tc_CCHome ||= TypeCode::Home.new("IDL:omg.org/CORBA/CCHome:1.0", "CCHome", CORBA::Object).freeze
+      @@tc_CCHome ||= TypeCode::Home.new('IDL:omg.org/CORBA/CCHome:1.0', 'CCHome', CORBA::Object).freeze
     end
 
     # define system exception related typecode constants
 
     def CORBA._tc_CompletionStatus
-      @@tc_CompletionStatus ||= TypeCode::Enum.new("IDL:omg.org/CORBA/CompletionStatus:1.0", "CompletionStatus",
+      @@tc_CompletionStatus ||= TypeCode::Enum.new('IDL:omg.org/CORBA/CompletionStatus:1.0', 'CompletionStatus',
                                                    CORBA::COMPLETED_TXT.collect {|t| "COMPLETED_#{t}"})
     end
 
@@ -1111,6 +1137,7 @@ module R2CORBA
       def to_d(precision)
         BigDecimal(self.to_s(precision))
       end
+
       def LongDouble._tc
         CORBA._tc_longdouble
       end

data/lib/corba/common/Union.rb

@@ -19,16 +19,20 @@ module R2CORBA
           @discriminator = nil
           @value = nil
         end
+
         def _is_at_default?
           @discriminator == :default
         end
+
         def _value_tc
           ix = self.class._tc.label_index(@discriminator)
           self.class._tc.member_type(ix)
         end
+
         def _disc
           @discriminator
         end
+
         def _disc=(val)
           m_cur = self.class._tc.label_member(@discriminator) unless @discriminator.nil?
           m_new = self.class._tc.label_member(val)
@@ -39,6 +43,7 @@ module R2CORBA
           @discriminator = val
           disc_
         end
+
         def _value
           @value
         end

data/lib/corba/common/Values.rb

@@ -42,6 +42,7 @@ module R2CORBA
         def marshal(os)
           raise CORBA::NO_IMPLEMENT
         end
+
         def unmarshal(is)
           raise CORBA::NO_IMPLEMENT
         end

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/exception.rb

@@ -13,7 +13,7 @@
 module R2CORBA
   module CORBA
     COMPLETED_YES, COMPLETED_NO, COMPLETED_MAYBE = (0..2).to_a
-    COMPLETED_TXT = ["YES", "NO", "MAYBE"].freeze
+    COMPLETED_TXT = ['YES', 'NO', 'MAYBE'].freeze
     class Exception < StandardError
     end
 
@@ -29,6 +29,7 @@ module R2CORBA
       def reason
         self.message
       end
+
       def to_s
         "CORBA::#{self.class::Name}(#{super}) [minor=#{@minor};completed=#{COMPLETED_TXT[@completed.to_i]}]"
       end

data/lib/corba/common/version.rb

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

data/lib/corba/idl/IDL.rb

@@ -12,7 +12,7 @@
 module R2CORBA
 
   module CORBA
-    def CORBA.implement(idlfile, params={}, genbits = IDL::CLIENT_STUB, &block)
+    def CORBA.implement(idlfile, params = {}, genbits = IDL::CLIENT_STUB, &block)
       IDL.implement(idlfile, params, genbits, &block)
     end
   end

data/lib/corba/jbase/Any.rb

@@ -15,21 +15,23 @@ module R2CORBA
       module Dynamic
         include_package 'org.omg.DynamicAny'
       end
+
       module Reflect
         java_import java.lang.reflect.Array
       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 +62,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 +70,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,15 +96,15 @@ 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
             dynFactory = CORBA::Native::Dynamic::DynAnyFactoryHelper.narrow(
-                          (jorb || CORBA::ORB._orb).resolve_initial_references("DynAnyFactory"))
+                          (jorb || CORBA::ORB._orb).resolve_initial_references('DynAnyFactory'))
             jdynany = dynFactory.create_dyn_any_from_type_code(rtc.tc_)
             begin
               unless rval.nil?
@@ -112,15 +114,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 +136,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?
@@ -152,15 +154,15 @@ module R2CORBA
         end
       end # to_java
 
-      def Any.from_java(jany, jorb=nil, rtc=nil)
+      def Any.from_java(jany, jorb = nil, rtc = nil)
         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 +191,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,14 +219,14 @@ 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(
-                          (jorb || CORBA::ORB._orb).resolve_initial_references("DynAnyFactory"))
+                          (jorb || CORBA::ORB._orb).resolve_initial_references('DynAnyFactory'))
             jdynany = dynFactory.create_dyn_any(jany)
             begin
               restc = rtc.resolved_tc
@@ -239,7 +241,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 +257,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