r2corba 1.5.4 → 1.6.1

data/lib/corba/jbase/ORB.rb

@@ -38,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
@@ -52,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

@@ -14,11 +14,11 @@ module R2CORBA
 
     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
@@ -48,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
@@ -60,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

@@ -36,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
@@ -45,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
@@ -54,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
@@ -88,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
@@ -120,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_)
@@ -161,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
@@ -207,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

data/lib/corba/jbase/Servant.rb

@@ -39,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()
@@ -80,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_
@@ -96,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
@@ -172,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)
@@ -192,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)
@@ -233,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

data/lib/corba/jbase/ServerRequest.rb

@@ -52,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_)
@@ -65,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|
@@ -81,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
 
@@ -89,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())
@@ -113,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