r2corba 1.5.1-universal-java → 1.6.1-universal-java

data/lib/corba/common/require.rb

@@ -8,9 +8,16 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
+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',
   'const',
   'IDL',

data/lib/corba/common/version.rb

@@ -8,14 +8,13 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
 
-  R2CORBA_MAJOR = 1.freeze
-  R2CORBA_MINOR = 5.freeze
-  R2CORBA_RELEASE = '1'.freeze
+  R2CORBA_MAJOR = 1
+  R2CORBA_MINOR = 6
+  R2CORBA_RELEASE = 1
 
   R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
 

data/lib/corba/idl/BiDirPolicyC.rb

@@ -2,10 +2,9 @@
 #
 # ****  Code generated by the R2CORBA IDL Compiler ****
 # R2CORBA has been developed by:
-#        Remedy IT
-#        Nijkerk, GLD
+#        Remedy IT Expertise BV
 #        The Netherlands
-#        http://www.remedy.nl  http://www.theaceorb.nl
+#        https://www.remedy.nl
 #
 
 module R2CORBA

data/lib/corba/idl/CosNamingC.rb

@@ -2,10 +2,9 @@
 #
 # ****  Code generated by the R2CORBA IDL Compiler ****
 # R2CORBA has been developed by:
-#        Remedy IT
-#        Nijkerk, GLD
+#        Remedy IT Expertise BV
 #        The Netherlands
-#        http://www.remedy.nl  http://www.theaceorb.nl
+#        https://www.remedy.nl
 #
 require 'corba'
 
@@ -39,7 +38,7 @@ module CosNaming
         CORBA::TypeCode::Sequence.new(CosNaming::NameComponent._tc), self)
     end
   end # typedef Name
-  class BindingType < ::Fixnum
+  class BindingType < ::R2CORBA::FIXNUM_KLASS
     def BindingType._tc
       @@tc_BindingType ||= CORBA::TypeCode::Enum.new('IDL:omg.org/CosNaming/BindingType:1.0'.freeze, 'BindingType', [
           'Nobject',
@@ -96,7 +95,7 @@ module CosNaming
       CosNaming::NamingContext::Id
     end
 
-    class NotFoundReason < ::Fixnum
+    class NotFoundReason < ::R2CORBA::FIXNUM_KLASS
       def NotFoundReason._tc
         @@tc_NotFoundReason ||= CORBA::TypeCode::Enum.new('IDL:omg.org/CosNaming/NamingContext/NotFoundReason:1.0'.freeze, 'NotFoundReason', [
             'Missing_node',

data/lib/corba/idl/CosNamingS.rb

@@ -2,10 +2,9 @@
 #
 # ****  Code generated by the R2CORBA IDL Compiler ****
 # R2CORBA has been developed by:
-#        Remedy IT
-#        Nijkerk, GLD
+#        Remedy IT Expertise BV
 #        The Netherlands
-#        http://www.remedy.nl  http://www.theaceorb.nl
+#        https://www.remedy.nl
 #
 require 'corba/poa.rb'
 

data/lib/corba/idl/IDL.rb

@@ -8,12 +8,11 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 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/idl/IORTable.pidl

@@ -1,5 +1,4 @@
 // -*- IDL -*-
-// $Id$
 
 #ifndef R2TAO_IORTABLE_IORTABLE_PIDL
 #define R2TAO_IORTABLE_IORTABLE_PIDL

data/lib/corba/idl/MessagingC.rb

@@ -2,10 +2,9 @@
 #
 # ****  Code generated by the R2CORBA IDL Compiler ****
 # R2CORBA has been developed by:
-#        Remedy IT
-#        Nijkerk, GLD
+#        Remedy IT Expertise BV
 #        The Netherlands
-#        http://www.remedy.nl  http://www.theaceorb.nl
+#        https://www.remedy.nl
 #
 
 module R2CORBA

data/lib/corba/idl/POAC.rb

@@ -2,10 +2,9 @@
 #
 # ****  Code generated by the R2CORBA IDL Compiler ****
 # R2CORBA has been developed by:
-#        Remedy IT
-#        Nijkerk, GLD
+#        Remedy IT Expertise BV
 #        The Netherlands
-#        http://www.remedy.nl  http://www.theaceorb.nl
+#        https://www.remedy.nl
 #
 
 module R2CORBA
@@ -46,7 +45,7 @@ module R2CORBA
     IMPLICIT_ACTIVATION_POLICY_ID = 20
     SERVANT_RETENTION_POLICY_ID = 21
     REQUEST_PROCESSING_POLICY_ID = 22
-    class ThreadPolicyValue < ::Fixnum
+    class ThreadPolicyValue < ::R2CORBA::FIXNUM_KLASS
       def ThreadPolicyValue._tc
         @@tc_ThreadPolicyValue ||= CORBA::TypeCode::Enum.new('IDL:omg.org/PortableServer/ThreadPolicyValue:1.0'.freeze, 'ThreadPolicyValue', [
             'ORB_CTRL_MODEL',
@@ -91,7 +90,7 @@ module R2CORBA
       end #of attribute value getter
     end #of interface ThreadPolicy
 
-    class LifespanPolicyValue < ::Fixnum
+    class LifespanPolicyValue < ::R2CORBA::FIXNUM_KLASS
       def LifespanPolicyValue._tc
         @@tc_LifespanPolicyValue ||= CORBA::TypeCode::Enum.new('IDL:omg.org/PortableServer/LifespanPolicyValue:1.0'.freeze, 'LifespanPolicyValue', [
             'TRANSIENT',
@@ -134,7 +133,7 @@ module R2CORBA
       end #of attribute value getter
     end #of interface LifespanPolicy
 
-    class IdUniquenessPolicyValue < ::Fixnum
+    class IdUniquenessPolicyValue < ::R2CORBA::FIXNUM_KLASS
       def IdUniquenessPolicyValue._tc
         @@tc_IdUniquenessPolicyValue ||= CORBA::TypeCode::Enum.new('IDL:omg.org/PortableServer/IdUniquenessPolicyValue:1.0'.freeze, 'IdUniquenessPolicyValue', [
             'UNIQUE_ID',
@@ -177,7 +176,7 @@ module R2CORBA
       end #of attribute value getter
     end #of interface IdUniquenessPolicy
 
-    class IdAssignmentPolicyValue < ::Fixnum
+    class IdAssignmentPolicyValue < ::R2CORBA::FIXNUM_KLASS
       def IdAssignmentPolicyValue._tc
         @@tc_IdAssignmentPolicyValue ||= CORBA::TypeCode::Enum.new('IDL:omg.org/PortableServer/IdAssignmentPolicyValue:1.0'.freeze, 'IdAssignmentPolicyValue', [
             'USER_ID',
@@ -220,7 +219,7 @@ module R2CORBA
       end #of attribute value getter
     end #of interface IdAssignmentPolicy
 
-    class ImplicitActivationPolicyValue < ::Fixnum
+    class ImplicitActivationPolicyValue < ::R2CORBA::FIXNUM_KLASS
       def ImplicitActivationPolicyValue._tc
         @@tc_ImplicitActivationPolicyValue ||= CORBA::TypeCode::Enum.new('IDL:omg.org/PortableServer/ImplicitActivationPolicyValue:1.0'.freeze, 'ImplicitActivationPolicyValue', [
             'IMPLICIT_ACTIVATION',
@@ -263,7 +262,7 @@ module R2CORBA
       end #of attribute value getter
     end #of interface ImplicitActivationPolicy
 
-    class ServantRetentionPolicyValue < ::Fixnum
+    class ServantRetentionPolicyValue < ::R2CORBA::FIXNUM_KLASS
       def ServantRetentionPolicyValue._tc
         @@tc_ServantRetentionPolicyValue ||= CORBA::TypeCode::Enum.new('IDL:omg.org/PortableServer/ServantRetentionPolicyValue:1.0'.freeze, 'ServantRetentionPolicyValue', [
             'RETAIN',
@@ -306,7 +305,7 @@ module R2CORBA
       end #of attribute value getter
     end #of interface ServantRetentionPolicy
 
-    class RequestProcessingPolicyValue < ::Fixnum
+    class RequestProcessingPolicyValue < ::R2CORBA::FIXNUM_KLASS
       def RequestProcessingPolicyValue._tc
         @@tc_RequestProcessingPolicyValue ||= CORBA::TypeCode::Enum.new('IDL:omg.org/PortableServer/RequestProcessingPolicyValue:1.0'.freeze, 'RequestProcessingPolicyValue', [
             'USE_ACTIVE_OBJECT_MAP_ONLY',
@@ -381,7 +380,7 @@ module R2CORBA
         end
         self._tc  # register typecode
       end #of exception AdapterInactive
-      class State < ::Fixnum
+      class State < ::R2CORBA::FIXNUM_KLASS
         def State._tc
           @@tc_State ||= CORBA::TypeCode::Enum.new('IDL:omg.org/PortableServer/POAManager/State:1.0'.freeze, 'State', [
               'HOLDING',

data/lib/corba/idl/TAO_Ext.pidl

@@ -1,5 +1,4 @@
 // -*- IDL -*-
-// $Id$
 
 #ifndef R2TAO_TAO_EXT_IDL
 #define R2TAO_TAO_EXT_IDL

data/lib/corba/idl/r2c_orb.rb

@@ -2,10 +2,9 @@
 #
 # ****  Code generated by the R2CORBA IDL Compiler ****
 # R2CORBA has been developed by:
-#        Remedy IT
-#        Nijkerk, GLD
+#        Remedy IT Expertise BV
 #        The Netherlands
-#        http://www.remedy.nl  http://www.theaceorb.nl
+#        https://www.remedy.nl
 #
 
 module R2CORBA
@@ -278,7 +277,7 @@ module R2CORBA
       end
 
     end #of exception PolicyError
-    class SetOverrideType < ::Fixnum
+    class SetOverrideType < ::R2CORBA::FIXNUM_KLASS
       def SetOverrideType._tc
         @@tc_SetOverrideType ||= CORBA::TypeCode::Enum.new('IDL:omg.org/CORBA/SetOverrideType:1.0'.freeze, 'SetOverrideType', [
             'SET_OVERRIDE',
@@ -449,7 +448,7 @@ module R2CORBA
       def RepositoryId._tc; @@tc_RepositoryId ||= CORBA::TypeCode::Alias.new('IDL:omg.org/CORBA/RepositoryId:1.0', 'RepositoryId', CORBA::_tc_string, self); end
     end # typedef RepositoryId
     class TypeCode; end  ## interface forward
-    class TCKind < ::Fixnum
+    class TCKind < ::R2CORBA::FIXNUM_KLASS
       def TCKind._tc
         @@tc_TCKind ||= CORBA::TypeCode::Enum.new('IDL:omg.org/CORBA/TCKind:1.0'.freeze, 'TCKind', [
             'Tk_null',
@@ -551,7 +550,7 @@ module R2CORBA
 
     class ExceptionList; end  ## 'native' type
     class NamedValue; end  ## 'native' type
-    class Exception_type < ::Fixnum
+    class Exception_type < ::R2CORBA::FIXNUM_KLASS
       def Exception_type._tc
         @@tc_Exception_type ||= CORBA::TypeCode::Enum.new('IDL:omg.org/CORBA/exception_type:1.0'.freeze, 'Exception_type', [
             'NO_EXCEPTION',

data/lib/corba/idl/require.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba/idl/IDL.rb'

data/lib/corba/jbase/Any.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
@@ -16,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
@@ -61,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
@@ -69,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
@@ -95,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?
@@ -113,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?
@@ -135,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?
@@ -153,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
@@ -190,9 +191,9 @@ 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.new(jany.extract_fixed().toString())
+              rval = BigDecimal(jany.extract_fixed().toString())
             when TK_CHAR
               rval = jany.extract_char().chr
             when TK_STRING
@@ -218,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
@@ -240,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
@@ -256,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

data/lib/corba/jbase/IORMap.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
@@ -33,4 +32,4 @@ module R2CORBA
       end
     end
   end
-end
+end

data/lib/corba/jbase/ORB.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
@@ -39,12 +38,12 @@ module R2CORBA
           prop = nil
           a1, a2, a3 = args
           if Array === a1
-            raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size>3
+            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
+            raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size > 2
             orb_id = a1
             prop = a2
           else
@@ -53,14 +52,14 @@ module R2CORBA
           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
+          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)
         end
         @@wrapper_klass.new(n_orb)
       end
 
-      #str ::String
-      #ret ::CORBA::Object
+      # str ::String
+      # ret ::CORBA::Object
       def string_to_object(str)
         begin
           begin

data/lib/corba/jbase/Object.rb

@@ -8,18 +8,17 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
 
     module Object
 
-      #ret InterfaceDef
+      # ret InterfaceDef
       def _get_interface()
         raise ::CORBA::NO_IMPLEMENT
-        #ifdef_obj = self.objref_._get_interface_def rescue CORBA::Exception.native2r($!)
-        #(ifdef_obj = CORBA::Native::InterfaceDefHelper.narrow(ifdef_obj) rescue CORBA::Exception.native2r($!)) unless ifdef_obj.nil?
+        # ifdef_obj = self.objref_._get_interface_def rescue CORBA::Exception.native2r($!)
+        # (ifdef_obj = CORBA::Native::InterfaceDefHelper.narrow(ifdef_obj) rescue CORBA::Exception.native2r($!)) unless ifdef_obj.nil?
       end
 
       # ::String logical_type_id
@@ -49,7 +48,7 @@ module R2CORBA
       end
 
       unless CORBA::Native::Portable::ObjectImpl.public_instance_methods.include?(:_get_component)
-        #ret ::CORBA::Object
+        # ret ::CORBA::Object
         def _get_component()
           raise CORBA::INV_OBJREF.new if self._is_nil?()
           ## ask the remote side
@@ -61,27 +60,27 @@ module R2CORBA
         end
       end
 
-      #def PolicyType policy_type
+      # def PolicyType policy_type
       # ret Policy
       def _get_policy(policy_type)
         raise ::CORBA::NO_IMPLEMENT
       end
 
-      #PolicyList policies
-      #SetOverrideType set_add
-      #ret ::CORBA::Object
-      def _set_policy_overrides(policies, set_add )
+      # PolicyList policies
+      # SetOverrideType set_add
+      # ret ::CORBA::Object
+      def _set_policy_overrides(policies, set_add)
         raise ::CORBA::NO_IMPLEMENT
       end
 
-      #int[] types
-      #ret PolicyList
+      # int[] types
+      # ret PolicyList
       def _get_policy_overrides(types)
         raise ::CORBA::NO_IMPLEMENT
       end
 
-      #PolicyList inconsistent_policies
-      #ret bool
+      # PolicyList inconsistent_policies
+      # ret bool
       def _validate_connection(inconsistent_policies)
         raise ::CORBA::NO_IMPLEMENT
       end

data/lib/corba/jbase/Request.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
@@ -37,7 +36,7 @@ module R2CORBA
         end
       end
 
-      def add_in_arg(tc, val, nm='')
+      def add_in_arg(tc, val, nm = '')
         begin
           self.req_.arguments.add_value(nm, Any.to_any(val, tc).to_java(self.req_.target._orb), CORBA::ARG_IN)
         rescue ::NativeException
@@ -46,7 +45,7 @@ module R2CORBA
         self.req_.arguments.count
       end
 
-      def add_out_arg(tc, nm='')
+      def add_out_arg(tc, nm = '')
         begin
           self.req_.arguments.add_value(nm, Any.to_any(nil, tc).to_java(self.req_.target._orb), CORBA::ARG_OUT)
         rescue ::NativeException
@@ -55,7 +54,7 @@ module R2CORBA
         self.req_.arguments.count
       end
 
-      def add_inout_arg(tc, val, nm='')
+      def add_inout_arg(tc, val, nm = '')
         begin
           self.req_.arguments.add_value(nm, Any.to_any(val, tc).to_java(self.req_.target._orb), CORBA::ARG_INOUT)
         rescue ::NativeException
@@ -89,7 +88,7 @@ module R2CORBA
         # clear current arguments
         begin
           nvl = self.req_.arguments
-          nvl.remove(0) while nvl.count>0
+          nvl.remove(0) while nvl.count > 0
         rescue
           CORBA::Exception.native2r($!)
         end
@@ -121,7 +120,7 @@ module R2CORBA
         begin
           # clear current exceptions
           jexl = self.req_.exceptions
-          jexl.remove(0) while jexl.count>0
+          jexl.remove(0) while jexl.count > 0
           # add new exceptions
           exl.each do |extc|
             jexl.add(extc.tc_)
@@ -162,7 +161,7 @@ module R2CORBA
           elsif jex.is_a?(CORBA::Native::UnknownUserException)
             CORBA::UserException._raise(jex)
           else
-            raise CORBA::UNKNOWN.new(jex.getMessage(),0,CORBA::COMPLETED_MAYBE)
+            raise CORBA::UNKNOWN.new(jex.getMessage(), 0, CORBA::COMPLETED_MAYBE)
           end
         end
         self.result
@@ -208,12 +207,12 @@ module R2CORBA
           nvl = self.req_.arguments
           nvl.count.times do |i|
             nv = nvl.item(i)
-            rc << Any.from_java(nv.value,self.req_.target._orb) unless nv.flags == CORBA::ARG_IN
+            rc << Any.from_java(nv.value, self.req_.target._orb) unless nv.flags == CORBA::ARG_IN
           end
         rescue
           CORBA::Exception.native2r($!)
         end
-        if rc.size<2
+        if rc.size < 2
           return rc.shift
         else
           return *rc
@@ -223,4 +222,4 @@ module R2CORBA
     end
 
   end # CORBA
-end # R2CORBA
+end # R2CORBA