r2corba 1.5.1-universal-java → 1.5.5-universal-java

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,7 +52,7 @@ 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)

data/lib/corba/jbase/Object.rb

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

data/lib/corba/jbase/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
@@ -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

data/lib/corba/jbase/Servant.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
@@ -40,7 +39,7 @@ module R2CORBA
 
         def invoke(jsrvreq)
           begin
-            raise CORBA::NO_IMPLEMENT.new('',0,CORBA::COMPLETED_NO) unless @rsrv
+            raise CORBA::NO_IMPLEMENT.new('', 0, CORBA::COMPLETED_NO) unless @rsrv
             rsrvreq = CORBA::ServerRequest._wrap_native(jsrvreq, self._orb())
             begin
               case rsrvreq.srvreq_.operation()
@@ -81,9 +80,9 @@ module R2CORBA
             else
               STDERR.puts "#{ex_}\n#{ex_.backtrace.join("\n")}" unless $VERBOSE
               if jsrvreq.respond_to?(:setSystemException) # JacORB special
-                jsrvreq.setSystemException(CORBA::Native::UNKNOWN.new("#{ex_}",0,CORBA::Native::CompletionStatus.from_int(CORBA::COMPLETED_MAYBE)))
+                jsrvreq.setSystemException(CORBA::Native::UNKNOWN.new("#{ex_}", 0, CORBA::Native::CompletionStatus.from_int(CORBA::COMPLETED_MAYBE)))
               else
-                jsrvreq.set_exception(CORBA::Any.to_any(CORBA::UNKNOWN.new("#{ex_}",0,CORBA::COMPLETED_MAYBE)).to_java(self._orb()))
+                jsrvreq.set_exception(CORBA::Any.to_any(CORBA::UNKNOWN.new("#{ex_}", 0, CORBA::COMPLETED_MAYBE)).to_java(self._orb()))
               end
             end
           rescue CORBA::SystemException => ex_
@@ -97,9 +96,9 @@ module R2CORBA
           rescue Exception => ex_
             STDERR.puts "#{ex_}\n#{ex_.backtrace.join("\n")}"
             if jsrvreq.respond_to?(:setSystemException) # JacORB special
-              jsrvreq.setSystemException(CORBA::Native::UNKNOWN.new("#{ex_}",0,CORBA::Native::CompletionStatus.from_int(CORBA::COMPLETED_MAYBE)))
+              jsrvreq.setSystemException(CORBA::Native::UNKNOWN.new("#{ex_}", 0, CORBA::Native::CompletionStatus.from_int(CORBA::COMPLETED_MAYBE)))
             else
-              jsrvreq.set_exception(CORBA::Any.to_any(CORBA::UNKNOWN.new("#{ex_}",0,CORBA::COMPLETED_MAYBE)).to_java(self._orb()))
+              jsrvreq.set_exception(CORBA::Any.to_any(CORBA::UNKNOWN.new("#{ex_}", 0, CORBA::COMPLETED_MAYBE)).to_java(self._orb()))
             end
           end
         end
@@ -173,8 +172,8 @@ module R2CORBA
           opsym = alt_opsym if alt_opsym && alt_opsym.is_a?(Symbol)
           results = @rsrv.__send__(opsym, *rsrvreq.arguments)
           unless rsrvreq.result_type_.nil?
-            result_value = (rsrvreq.arg_out_>0 ? results.shift : results) unless rsrvreq.result_type_.kind == CORBA::TK_VOID
-            if rsrvreq.arg_out_>0
+            result_value = (rsrvreq.arg_out_ > 0 ? results.shift : results) unless rsrvreq.result_type_.kind == CORBA::TK_VOID
+            if rsrvreq.arg_out_ > 0
               rsrvreq.nvlist_.count().times do |i|
                 jnv = rsrvreq.nvlist_.item(i)
                 if [CORBA::ARG_OUT, CORBA::ARG_INOUT].include?(jnv.flags)
@@ -193,8 +192,8 @@ module R2CORBA
         def invoke_DSI(rsrvreq)
           results = @rsrv.invoke(rsrvreq)
           unless rsrvreq.result_type_.nil?
-            result_value = (rsrvreq.arg_out_>0 ? results.shift : results) unless rsrvreq.result_type_.kind == CORBA::TK_VOID
-            if rsrvreq.arg_out_>0
+            result_value = (rsrvreq.arg_out_ > 0 ? results.shift : results) unless rsrvreq.result_type_.kind == CORBA::TK_VOID
+            if rsrvreq.arg_out_ > 0
               rsrvreq.nvlist_.count().times do |i|
                 jnv = rsrvreq.nvlist_.item(i)
                 if [CORBA::ARG_OUT, CORBA::ARG_INOUT].include?(jnv.flags)
@@ -234,7 +233,7 @@ module R2CORBA
             # not in call context or not associated with ORB yet
           end
         end
-        raise CORBA::BAD_INV_ORDER.new('no ORB initialized',0,CORBA::COMPLETED_NO) if CORBA::ORB._orb.nil?
+        raise CORBA::BAD_INV_ORDER.new('no ORB initialized', 0, CORBA::COMPLETED_NO) if CORBA::ORB._orb.nil?
         begin
           return CORBA::Object._wrap_native(self.srvref_._this_object(CORBA::ORB._orb))
         rescue ::NativeException
@@ -245,4 +244,4 @@ module R2CORBA
 
   end # PortableServer
 
-end # R2CORBA
+end # R2CORBA

data/lib/corba/jbase/ServerRequest.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
@@ -53,12 +52,12 @@ module R2CORBA
       end
 
       def describe(opsig)
-        raise CORBA::BAD_INV_ORDER.new('',0,CORBA::COMPLETED_NO) if @nvlist_
-        raise CORBA::NO_IMPLEMENT.new('',0,CORBA::COMPLETED_NO) unless opsig && (Hash === opsig)
+        raise CORBA::BAD_INV_ORDER.new('', 0, CORBA::COMPLETED_NO) if @nvlist_
+        raise CORBA::NO_IMPLEMENT.new('', 0, CORBA::COMPLETED_NO) unless opsig && (Hash === opsig)
         @arg_list_ = opsig[:arg_list]
         @result_type_ = opsig[:result_type]
         @exc_list_ = opsig[:exc_list]
-        raise CORBA::BAD_PARAM.new('',0,CORBA::COMPLETED_NO) unless (@arg_list_.nil? || @arg_list_.is_a?(Array)) &&
+        raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETED_NO) unless (@arg_list_.nil? || @arg_list_.is_a?(Array)) &&
                                                                     (@result_type_.nil? || @result_type_.is_a?(CORBA::TypeCode)) &&
                                                                     (@exc_list_.nil? || @exc_list_.is_a?(Array))
         @nvlist_ = extract_arguments_(@arg_list_)
@@ -66,7 +65,7 @@ module R2CORBA
       end
 
       def arguments
-        raise CORBA::BAD_INV_ORDER.new('',0,CORBA::COMPLETED_NO) unless @nvlist_
+        raise CORBA::BAD_INV_ORDER.new('', 0, CORBA::COMPLETED_NO) unless @nvlist_
         unless @arg_
           @arg_ = []
           @nvlist_.count().times do |i|
@@ -82,7 +81,7 @@ module R2CORBA
         self.arguments # make sure the @arg_ member has been initialized
         key = arg_index_from_name(key) if String === key
         key = key.to_i if key
-        raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETD_NO) unless key && (key>=0) && (key<@arg_.size)
+        raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETD_NO) unless key && (key >= 0) && (key < @arg_.size)
         @arg_[key]
       end
 
@@ -90,7 +89,7 @@ module R2CORBA
         self.arguments # make sure the @arg_ member has been initialized
         key = arg_index_from_name(key) if String === key
         key = key.to_i if key
-        raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETD_NO) unless key && (key>=0) && (key<@arg_.size)
+        raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETD_NO) unless key && (key >= 0) && (key < @arg_.size)
         jnv = @nvlist_.item(key)
         rtc = @arg_list_[key][2]
         CORBA::Any.to_any(val, rtc).to_java(self.orb_, jnv.value())
@@ -114,7 +113,7 @@ module R2CORBA
         unless arg_list.nil?
           arg_list.each do |argnm, argf, argtc|
             raise CORBA::BAD_PARAM.new('', 0, CORBA::COMPLETED_NO) if argf.nil? || argtc.nil? || !argtc.is_a?(CORBA::TypeCode)
-            jnvlist.add_value(argnm.to_s, Any.to_any(nil,argtc).to_java(@orb_), argf.to_i)
+            jnvlist.add_value(argnm.to_s, Any.to_any(nil, argtc).to_java(@orb_), argf.to_i)
           end
           self.srvreq_.arguments(jnvlist)
         end
@@ -125,4 +124,4 @@ module R2CORBA
 
   end # CORBA
 
-end # R2CORBA
+end # R2CORBA

data/lib/corba/jbase/Streams.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
@@ -58,7 +57,7 @@ module R2CORBA
           when TK_DOUBLE
             read_double()
           when TK_LONGDOUBLE
-            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported',0,CORBA::COMPLETED_NO)
+            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported', 0, CORBA::COMPLETED_NO)
           when TK_FIXED
             read_fixed()
           when TK_CHAR
@@ -403,7 +402,7 @@ module R2CORBA
           when TK_DOUBLE
             write_double(value)
           when TK_LONGDOUBLE
-            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported',0,CORBA::COMPLETED_NO)
+            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported', 0, CORBA::COMPLETED_NO)
           when TK_FIXED
             write_fixed(value)
           when TK_CHAR
@@ -610,7 +609,7 @@ module R2CORBA
         end
         def write_wstring(value)
           begin
-            self.stream_.write_wstring(value.inject('') {|s,b| s << b.chr})
+            self.stream_.write_wstring(value.inject('') {|s, b| s << b.chr})
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
@@ -668,4 +667,4 @@ module R2CORBA
       end
     end
   end
-end
+end

data/lib/corba/jbase/Stub.rb

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

data/lib/corba/jbase/Typecode.rb

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

data/lib/corba/jbase/Values.rb

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

data/lib/corba/jbase/exception.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 # import all java CORBA exceptions into the R2CORBA::CORBA namespace
@@ -83,7 +82,7 @@ module R2CORBA
           self.set_backtrace(args.first.backtrace) if NativeException === args.first
         else
           super(args.shift.to_s)
-          @minor, @completed = (args + [0,0][args.size..2])
+          @minor, @completed = (args + [0, 0][args.size..2])
         end
       end
     end

data/lib/corba/jbase/poa.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
@@ -37,7 +36,7 @@ module R2CORBA
     module POA
       def destroy(etherealize_objects, wait_for_completion)
         begin
-          self.objref_.destroy(etherealize_objects!=false, wait_for_completion!=false)
+          self.objref_.destroy(etherealize_objects != false, wait_for_completion != false)
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -167,7 +166,7 @@ module R2CORBA
         raise CORBA::BAD_PARAM.new('expected POAManager', 0, CORBA::COMPLETED_NO) unless a_POAManager.is_a?(PortableServer::POAManager)
         CORBA::PolicyList._tc.validate(policies) unless policies.nil? || policies.empty?
         jpolicies = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Policy.java_class, policies.nil? ? 0 : policies.size)
-        policies.each_with_index {|p,i| jpolicies[i] = p.objref_ } unless policies.nil?
+        policies.each_with_index {|p, i| jpolicies[i] = p.objref_ } unless policies.nil?
         begin
           PortableServer::POA._narrow(CORBA::Object._wrap_native(self.objref_.create_POA(adapter_name, a_POAManager.objref_, jpolicies)))
         rescue ::NativeException
@@ -226,4 +225,4 @@ module R2CORBA
       end # get_state
     end # POAManager
   end
-end
+end