r2corba 1.6.2-universal-java → 1.7.1-universal-java

data/lib/corba/common/Typecode.rb

@@ -28,7 +28,8 @@ module R2CORBA
 
       def self._wrap_native(ntc)
         raise ArgumentError, 'Expected org.omg.CORBA.TypeCode' unless ntc.nil? || ntc.is_a?(Native::TypeCode)
-        ntc.nil?() ? ntc : @@wrapper_klass.new(ntc)
+
+        ntc.nil? ? ntc : @@wrapper_klass.new(ntc)
       end
 
       def TypeCode._tc
@@ -188,6 +189,7 @@ module R2CORBA
 
       def equal?(tc)
         raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
+
         begin
           self.tc_.equal(tc.tc_)
         rescue ::NativeException
@@ -197,6 +199,7 @@ module R2CORBA
 
       def equivalent?(tc)
         raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
+
         begin
           self.tc_.equivalent(tc.tc_)
         rescue ::NativeException
@@ -206,7 +209,7 @@ module R2CORBA
 
       def id
         begin
-          self.tc_.id()
+          self.tc_.id
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -214,7 +217,7 @@ module R2CORBA
 
       def name
         begin
-          self.tc_.name()
+          self.tc_.name
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -222,7 +225,7 @@ module R2CORBA
 
       def member_count
         begin
-          self.tc_.member_count()
+          self.tc_.member_count
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -254,7 +257,7 @@ module R2CORBA
 
       def default_index
         begin
-          self.tc_.default_index()
+          self.tc_.default_index
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -262,7 +265,7 @@ module R2CORBA
 
       def length
         begin
-          self.tc_.length()
+          self.tc_.length
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -274,7 +277,7 @@ module R2CORBA
 
       def fixed_digits
         begin
-          self.tc_.fixed_digits()
+          self.tc_.fixed_digits
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -282,7 +285,7 @@ module R2CORBA
 
       def fixed_scale
         begin
-          self.tc_.fixed_scale()
+          self.tc_.fixed_scale
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -298,7 +301,7 @@ module R2CORBA
 
       def type_modifier
         begin
-          self.tc_.type_modifier()
+          self.tc_.type_modifier
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -391,7 +394,6 @@ module R2CORBA
       end
 
       class Recursive < CORBA::TypeCode
-
         def initialize(id)
           raise 'overload required'
         end
@@ -424,7 +426,6 @@ module R2CORBA
       end # Recursive
 
       class String < CORBA::TypeCode
-
         def initialize(*args)
           raise 'overload required'
         end
@@ -435,6 +436,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val) unless ::String === val || val.respond_to?(:to_str)
           val = ::String === val ? val : val.to_str
           raise ::CORBA::MARSHAL.new(
@@ -449,7 +451,6 @@ module R2CORBA
       end # String
 
       class WString < CORBA::TypeCode
-
         def initialize(*args)
           raise 'overload required'
         end
@@ -460,6 +461,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val) unless ::Array === val || val.respond_to?(:to_str) || val.respond_to?(:to_ary)
           val = if ::Array === val
             val
@@ -495,7 +497,6 @@ module R2CORBA
       end # WString
 
       class Fixed < CORBA::TypeCode
-
         def initialize(*args)
           raise 'overload required'
         end
@@ -506,6 +507,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val) unless ::BigDecimal === val || val.respond_to?(:to_str)
           val = ::BigDecimal === val ? val : BigDecimal(val.to_str)
           val
@@ -517,7 +519,6 @@ module R2CORBA
       end # Fixed
 
       class Sequence < CORBA::TypeCode
-
         def initialize(*args)
           raise 'overload required'
         end
@@ -528,6 +529,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val) unless val.respond_to?(:to_str) || val.respond_to?(:to_ary)
           val = if self.content_type.kind == TK_OCTET || self.content_type.kind == TK_CHAR
             if val.respond_to?(:to_str)
@@ -574,7 +576,6 @@ module R2CORBA
       end
 
       class Array < CORBA::TypeCode
-
         def initialize(*args)
           raise 'overload required'
         end
@@ -585,6 +586,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val)
           raise ::CORBA::MARSHAL.new(
             "array size exceeds bound: #{self.length.to_s}",
@@ -601,7 +603,6 @@ module R2CORBA
       end # Array
 
       class IdentifiedTypeCode < CORBA::TypeCode
-
         def initialize(id)
           CORBA::TypeCode.register_id_type(id.to_s, self)
         end
@@ -637,6 +638,7 @@ module R2CORBA
 
         def add_member(name, tc, access)
           raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
+
           @members << [name, tc, access]
         end
 
@@ -674,6 +676,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val)
           if needs_conversion(val)
             vorg = val
@@ -687,6 +690,7 @@ module R2CORBA
 
         def needs_conversion(val)
           return false if val.nil?
+
           @members.any? { |name, tc| tc.needs_conversion(val.__send__(name.intern)) }
         end
 
@@ -696,11 +700,13 @@ module R2CORBA
 
         def member_name(index)
           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)
+
           @members[index][1]
         end
 
@@ -741,6 +747,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           if CORBA::Portable::BoxedValueBase === val
             super(val)
             val.value = self.content_type.validate(val.value)
@@ -752,6 +759,7 @@ module R2CORBA
 
         def needs_conversion(val)
           return false if val.nil?
+
           if CORBA::Portable::BoxedValueBase === val
             self.content_type.needs_conversion(val.value)
           else
@@ -788,6 +796,7 @@ module R2CORBA
 
         def add_member(name, tc)
           raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
+
           @members << [name, tc]
         end
 
@@ -798,7 +807,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}
@@ -816,6 +825,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val)
           if needs_conversion(val)
             vorg = val
@@ -837,11 +847,13 @@ module R2CORBA
 
         def member_name(index)
           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)
+
           @members[index][1]
         end
 
@@ -875,7 +887,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}
@@ -914,6 +926,7 @@ module R2CORBA
 
         def add_member(label, name, tc)
           raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
+
           @switchtype.validate(label) unless label == :default
           @labels[label] = @members.size
           @members << [label, name.to_s, tc]
@@ -952,12 +965,13 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val)
           @switchtype.validate(val._disc) unless val._disc == :default
           # 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 @labels.has_key?(val._disc) # no need to check for implicit defaults
             if needs_conversion(val)
               vorg = val
               val = vorg.class.new
@@ -980,16 +994,19 @@ module R2CORBA
 
         def member_name(index)
           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)
+
           @members[index][2]
         end
 
         def member_label(index)
           raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
+
           @members[index][0]
         end
 
@@ -1011,6 +1028,7 @@ module R2CORBA
 
         def label_member(val)
           return nil unless (lbl_ix = label_index(val))
+
           member_name(lbl_ix)
         end
 
@@ -1032,7 +1050,7 @@ module R2CORBA
         end
 
         def validate(val)
-          super(val) if !val.respond_to?(:to_int)
+          super(val) unless val.respond_to?(:to_int)
           raise CORBA::MARSHAL.new(
             "value (#{val}) out of range (#{@range}) for enum: #{name}",
             1, CORBA::COMPLETED_NO) unless @range === (::Integer === val ? val : val.to_int)
@@ -1049,6 +1067,7 @@ module R2CORBA
 
         def member_name(index)
           raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
+
           @members[index]
         end
       end # Enum
@@ -1077,18 +1096,17 @@ module R2CORBA
 
         BadKind._tc
       end
-
     end # TypeCode
 
     # define typecode constants for primitive types
-    [ 'null', 'void',
+    ['null', 'void',
       'short', 'long', 'ushort', 'ulong', 'longlong', 'ulonglong',
       'float', 'double', 'longdouble',
       'boolean',
       'char', 'octet',
       'wchar',
       'any',
-    ].each do |tck|
+].each do |tck|
       CORBA.module_eval %Q{
         def CORBA._tc_#{tck}
           @@tc_#{tck} ||= TypeCode.get_primitive_tc(CORBA::TK_#{tck.upcase})
@@ -1097,11 +1115,11 @@ module R2CORBA
     end
 
     def CORBA._tc_string
-      @@tc_string ||= TypeCode::String.new()
+      @@tc_string ||= TypeCode::String.new
     end
 
     def CORBA._tc_wstring
-      @@tc_wstring ||= TypeCode::WString.new()
+      @@tc_wstring ||= TypeCode::WString.new
     end
 
     # define special typecode constants
@@ -1130,7 +1148,7 @@ module R2CORBA
 
     def CORBA._tc_CompletionStatus
       @@tc_CompletionStatus ||= TypeCode::Enum.new('IDL:omg.org/CORBA/CompletionStatus:1.0', 'CompletionStatus',
-                                                   CORBA::COMPLETED_TXT.collect {|t| "COMPLETED_#{t}"})
+                                                   CORBA::COMPLETED_TXT.collect { |t| "COMPLETED_#{t}" })
     end
 
     class LongDouble
@@ -1142,6 +1160,5 @@ module R2CORBA
         CORBA._tc_longdouble
       end
     end
-
   end ## module CORBA
 end ## module R2CORBA

data/lib/corba/common/Values.rb

@@ -79,14 +79,13 @@ module R2CORBA
     VM_TRUNCATABLE = 3
 
     VT_MODIFIERS = {
-      :none => VM_NONE,
-      :abstract => VM_ABSTRACT,
-      :truncatable => VM_TRUNCATABLE,
-      :custom => VM_CUSTOM
+      none: VM_NONE,
+      abstract: VM_ABSTRACT,
+      truncatable: VM_TRUNCATABLE,
+      custom: VM_CUSTOM
     }.freeze
 
     PRIVATE_MEMBER = 0
     PUBLIC_MEMBER = 1
-
   end # CORBA
 end # R2CORBA

data/lib/corba/common/require.rb

@@ -11,14 +11,12 @@
 #--------------------------------------------------------------------
 
 module R2CORBA
-
   # from Ruby 2.4 Fixnum and Bignum are deprecated
   FIXNUM_KLASS = (1.class == ::Integer ? ::Integer : ::Fixnum)
   BIGNUM_KLASS = (1.class == ::Integer ? ::Integer : ::Bignum)
-
 end
 
-[ 'version',
+['version',
   'const',
   'IDL',
   'exception',

data/lib/corba/common/version.rb

@@ -11,11 +11,9 @@
 #--------------------------------------------------------------------
 
 module R2CORBA
-
   R2CORBA_MAJOR = 1
-  R2CORBA_MINOR = 6
-  R2CORBA_RELEASE = 2
+  R2CORBA_MINOR = 7
+  R2CORBA_RELEASE = 1
 
   R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
-
 end

data/lib/corba/idl/IDL.rb

@@ -10,11 +10,9 @@
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
 module R2CORBA
-
   module CORBA
     def CORBA.implement(idlfile, params = {}, genbits = IDL::CLIENT_STUB, &block)
       IDL.implement(idlfile, params, genbits, &block)
     end
   end
-
 end

data/lib/corba/idl/require.rb

@@ -10,8 +10,8 @@
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
 
-require 'corba/idl/IDL.rb'
-require 'corba/idl/r2c_orb.rb'
+require 'corba/idl/IDL'
+require 'corba/idl/r2c_orb'
 
 ## fake Ruby into believing 'orb.rb' has already been loaded
 ## which is what the IDL compiler will generate for

data/lib/corba/jbase/Any.rb

@@ -33,7 +33,7 @@ module R2CORBA
                             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()
+            jany ||= jorb.create_any
             case restc.kind
             when TK_NULL
               # leave any as is
@@ -70,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
@@ -114,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?
@@ -142,7 +142,7 @@ module R2CORBA
               if jany.nil?
                 jany = jdynany.to_any
               else
-                jany.read_value(jdynany.to_any.create_input_stream(), rtc.tc_)
+                jany.read_value(jdynany.to_any.create_input_stream, rtc.tc_)
               end
             ensure
               jdynany.destroy
@@ -167,52 +167,52 @@ module R2CORBA
             when TK_NULL, TK_VOID
               # leave as is
             when TK_ANY
-              rval = Any.from_java(jany.extract_any(), jorb)
+              rval = Any.from_java(jany.extract_any, jorb)
             when TK_BOOLEAN
-              rval = jany.extract_boolean()
+              rval = jany.extract_boolean
             when TK_SHORT
-              rval = jany.extract_short()
+              rval = jany.extract_short
             when TK_LONG
-              rval = jany.extract_long()
+              rval = jany.extract_long
             when TK_USHORT
-              rval = [jany.extract_ushort()].pack('s').unpack('S').first
+              rval = [jany.extract_ushort].pack('s').unpack('S').first
             when TK_WCHAR
-              rval = jany.extract_wchar()
+              rval = jany.extract_wchar
             when TK_ULONG
-              rval = [jany.extract_ulong()].pack('l').unpack('L').first
+              rval = [jany.extract_ulong].pack('l').unpack('L').first
             when TK_LONGLONG
-              rval = jany.extract_longlong()
+              rval = jany.extract_longlong
             when TK_ULONGLONG
-              rval = [jany.extract_ulonglong()].pack('q').unpack('Q').first
+              rval = [jany.extract_ulonglong].pack('q').unpack('Q').first
             when TK_OCTET
-              rval = [jany.extract_octet()].pack('c').unpack('C').first
+              rval = [jany.extract_octet].pack('c').unpack('C').first
             when TK_FLOAT
-              rval = jany.extract_float()
+              rval = jany.extract_float
             when TK_DOUBLE
-              rval = jany.extract_double()
+              rval = jany.extract_double
             when TK_LONGDOUBLE
               raise CORBA::NO_IMPLEMENT.new('LongDouble not supported', 0, CORBA::COMPLETED_NO)
             when TK_FIXED
-              rval = BigDecimal(jany.extract_fixed().toString())
+              rval = BigDecimal(jany.extract_fixed.toString)
             when TK_CHAR
-              rval = jany.extract_char().chr
+              rval = jany.extract_char.chr
             when TK_STRING
-              rval = jany.extract_string()
+              rval = jany.extract_string
             when TK_WSTRING
-              rval = jany.extract_wstring()
+              rval = jany.extract_wstring
             when TK_VALUE
-              rval = jany.extract_Value()
+              rval = jany.extract_Value
             when TK_VALUE_BOX
               rtc.get_type::Factory._check_factory(jorb || CORBA::ORB._orb) # make sure valuebox factory has been registered
-              rval = jany.extract_Value()
+              rval = jany.extract_Value
               rval = rval.value unless rval.nil?
             when TK_TYPECODE
-              rval = CORBA::TypeCode.from_native(jany.extract_TypeCode())
+              rval = CORBA::TypeCode.from_native(jany.extract_TypeCode)
             when TK_OBJREF
-              rval = CORBA::Object._wrap_native(jany.extract_Object())
+              rval = CORBA::Object._wrap_native(jany.extract_Object)
               rval = rtc.get_type._narrow(rval) if rval
             when TK_ABSTRACT_INTERFACE
-              jobj = jany.create_input_stream().read_abstract_interface()
+              jobj = jany.create_input_stream.read_abstract_interface
               rval = if jobj.is_a?(CORBA::Native::Object)
                 rtc.get_type._narrow(CORBA::Object._wrap_native(jobj))
               else
@@ -232,24 +232,24 @@ module R2CORBA
               restc = rtc.resolved_tc
               case restc.kind
               when TK_ENUM
-                rval = jdynany.get_as_ulong()
+                rval = jdynany.get_as_ulong
               when TK_ARRAY
                 rval = rtc.get_type.new
-                jdynany.get_elements().each {|e| rval << Any.from_java(e, jorb, restc.content_type) }
+                jdynany.get_elements.each { |e| rval << Any.from_java(e, jorb, restc.content_type) }
               when TK_SEQUENCE
                 rval = rtc.get_type.new
-                jdynany.get_elements().each {|e| rval << Any.from_java(e, jorb, restc.content_type) }
+                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
-                  rdisc = jdynany.get_discriminator().get_octet()
+                if jdynany.get_discriminator.type.kind.value == CORBA::TK_OCTET
+                  rdisc = jdynany.get_discriminator.get_octet
                   # Octet 0 designates default member
                   rdisc = rdisc == 0 ? :default : rdisc
                 else
-                  rdisc = Any.from_java(jdynany.get_discriminator().to_any(), jorb, restc.discriminator_type)
+                  rdisc = Any.from_java(jdynany.get_discriminator.to_any, jorb, restc.discriminator_type)
                 end
                 rval.instance_variable_set('@discriminator', rdisc)
                 unless jdynany.has_no_active_member
@@ -268,7 +268,6 @@ module R2CORBA
         end
         return rval
       end # from_java
-
     end # Any
   end # CORBA
 end # R2CORBA

data/lib/corba/jbase/ORB.rb

@@ -12,9 +12,7 @@
 
 module R2CORBA
   module CORBA
-
     module ORB
-
       class << self
         protected
         def _singleton_orb_init
@@ -39,21 +37,24 @@ module R2CORBA
           a1, a2, a3 = args
           if Array === a1
             raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size > 3
+
             argv = a1
             orb_id = (Hash === a2 ? nil : a2)
             prop = (Hash === a2 ? a2 : a3)
           elsif args.size == 1 || Hash === a2
             raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size > 2
+
             orb_id = a1
             prop = a2
           else
             argv = args
           end
           raise ArgumentError, "Invalid argument #{prop.class}; expected Hash" unless prop.nil? || Hash === prop
+
           jprop = Java::JavaUtil::Properties.new
           jprop.setProperty('ORBid', orb_id) if orb_id
           prop.each { |k, v| jprop.setProperty(k.to_s, v.to_s) } if prop
-          @@cached_orb = CORBA::Native::ORB.init(argv.collect {|a| a.to_s }.to_java(:string), jprop)
+          @@cached_orb = CORBA::Native::ORB.init(argv.collect { |a| a.to_s }.to_java(:string), jprop)
         end
         @@wrapper_klass.new(n_orb)
       end
@@ -84,7 +85,7 @@ module R2CORBA
             rescue ::NativeException
               CORBA::Exception.native2r($!)
             end
-          end).join()
+          end).join
         else
           # need to start a shutdown *with* waiting in a thread because JacORB
           # occasionally fails with a comm error when #shutdown(false) is called
@@ -104,8 +105,6 @@ module R2CORBA
       def ior_map
         @iormap ||= R2CORBA::IORMap.new(self)
       end
-
     end
-
   end # CORBA
 end # R2CORBA