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

data/lib/corba/jbase/Object.rb

@@ -11,11 +11,9 @@
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
-
     module Object
-
       # ret InterfaceDef
-      def _get_interface()
+      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?
@@ -24,10 +22,11 @@ module R2CORBA
       # ::String logical_type_id
       # ret boolean
       def _is_a?(logical_type_id)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
         ## JacORB's LocalObjects throw NO_IMPLEMENT on _is_a?() and _ids() is also not always defined
         return true if self.objref_.is_a?(CORBA::Native::LocalObject) &&
-                        (!self.objref_.respond_to?(:_ids) || self.objref_._ids().include?(logical_type_id))
+                        (!self.objref_.respond_to?(:_ids) || self.objref_._ids.include?(logical_type_id))
+
         begin
           self.objref_._is_a(logical_type_id)
         rescue ::NativeException
@@ -36,10 +35,11 @@ module R2CORBA
       end
 
       # ret ::String
-      def _repository_id()
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+      def _repository_id
+        raise CORBA::INV_OBJREF.new if self._is_nil?
         ## if this object ref has already been narrowed
         return self._interface_repository_id if self.respond_to?(:_interface_repository_id)
+
         ## ask the remote side
         ## have to do this ourselves since JacORB only resolves this locally (never calling remote)
         req = self._request('_repository_id')
@@ -49,8 +49,9 @@ module R2CORBA
 
       unless CORBA::Native::Portable::ObjectImpl.public_instance_methods.include?(:_get_component)
         # ret ::CORBA::Object
-        def _get_component()
-          raise CORBA::INV_OBJREF.new if self._is_nil?()
+        def _get_component
+          raise CORBA::INV_OBJREF.new if self._is_nil?
+
           ## ask the remote side
           ## have to do this ourselves since JacORB does not support this remote method on Object
           ## and we can't use #invoke since this should work without narrowing
@@ -92,7 +93,6 @@ module R2CORBA
           CORBA::Exception.native2r($!)
         end
       end
-
     end # Object
   end # CORBA
 end # R2CORBA

data/lib/corba/jbase/Request.rb

@@ -11,7 +11,6 @@
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
-
     module Request
       @@wrapper_klass = Class.new do
         include CORBA::Request
@@ -25,12 +24,13 @@ module R2CORBA
 
       def self._wrap_native(nreq, target)
         raise ArgumentError, 'Expected org.omg.CORBA.Request' unless nreq.nil? || nreq.is_a?(Native::Request)
-        nreq.nil?() ? nreq : @@wrapper_klass.new(nreq, target)
+
+        nreq.nil? ? nreq : @@wrapper_klass.new(nreq, target)
       end
 
       def operation
         begin
-          self.req_.operation()
+          self.req_.operation
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -80,10 +80,11 @@ module R2CORBA
 
       def arguments=(*args)
         if args.size == 1
-          raise ArgumentError, 'invalid argument list' unless ::Array === args.first && args.first.all? {|a| ::Array === a }
+          raise ArgumentError, 'invalid argument list' unless ::Array === args.first && args.first.all? { |a| ::Array === a }
+
           args = args.first
         else
-          raise ArgumentError, 'invalid argument list' unless args.all? {|a| ::Array === a }
+          raise ArgumentError, 'invalid argument list' unless args.all? { |a| ::Array === a }
         end
         # clear current arguments
         begin
@@ -153,7 +154,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-        jex = self.req_.env().exception()
+        jex = self.req_.env.exception
         unless jex.nil?
           STDERR.puts "#{jex}\n#{jex.backtrace.join("\n")}" if $VERBOSE
           if jex.is_a?(CORBA::Native::SystemException)
@@ -161,7 +162,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
@@ -218,8 +219,6 @@ module R2CORBA
           return *rc
         end
       end
-
     end
-
   end # CORBA
 end # R2CORBA

data/lib/corba/jbase/Servant.rb

@@ -11,11 +11,8 @@
 #--------------------------------------------------------------------
 
 module R2CORBA
-
   module PortableServer
-
     module DSI
-
       class Servant < PortableServer::Native::DynamicImplementation
         def self.new_instance(rsrv)
           srv = PortableServer::DSI::Servant.new
@@ -33,38 +30,39 @@ module R2CORBA
           @rsrv
         end
 
-        def detach_rbServant()
+        def detach_rbServant
           @rsrv = nil
         end
 
         def invoke(jsrvreq)
           begin
             raise CORBA::NO_IMPLEMENT.new('', 0, CORBA::COMPLETED_NO) unless @rsrv
-            rsrvreq = CORBA::ServerRequest._wrap_native(jsrvreq, self._orb())
+
+            rsrvreq = CORBA::ServerRequest._wrap_native(jsrvreq, self._orb)
             begin
-              case rsrvreq.srvreq_.operation()
+              case rsrvreq.srvreq_.operation
               when '_is_a'
-                rsrvreq.describe({:arg_list => [['', CORBA::ARG_IN, CORBA._tc_string]], :result_type => CORBA._tc_boolean})
+                rsrvreq.describe({arg_list: [['', CORBA::ARG_IN, CORBA._tc_string]], result_type: CORBA._tc_boolean})
                 rc = self._is_a(*rsrvreq.arguments)
-                jany = rsrvreq.orb_.create_any()
+                jany = rsrvreq.orb_.create_any
                 jany.insert_boolean(rc == true)
                 jsrvreq.set_result(jany)
               when '_non_existent'
-                rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_boolean})
+                rsrvreq.describe({arg_list: [], result_type: CORBA._tc_boolean})
                 rc = self._non_existent(*rsrvreq.arguments)
-                jany = rsrvreq.orb_.create_any()
+                jany = rsrvreq.orb_.create_any
                 jany.insert_boolean(rc == true)
                 jsrvreq.set_result(jany)
               when '_repository_id'
-                rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_string})
+                rsrvreq.describe({arg_list: [], result_type: CORBA._tc_string})
                 rc = self._repository_id(*rsrvreq.arguments)
-                jany = rsrvreq.orb_.create_any()
+                jany = rsrvreq.orb_.create_any
                 jany.insert_string(rc)
                 jsrvreq.set_result(jany)
               when '_component'
-                rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_Object})
+                rsrvreq.describe({arg_list: [], result_type: CORBA._tc_Object})
                 rc = self._get_component(*rsrvreq.arguments)
-                jany = rsrvreq.orb_.create_any()
+                jany = rsrvreq.orb_.create_any
                 jany.insert_Object(rc)
                 jsrvreq.set_result(jany)
               else
@@ -75,14 +73,14 @@ module R2CORBA
             end
           rescue CORBA::UserException => ex_
             STDERR.puts "#{ex_}\n#{ex_.backtrace.join("\n")}" if $VERBOSE
-            if rsrvreq.exc_list_.nil? || rsrvreq.exc_list_.any? {|extc| extc.id == ex_.class._tc.id }
-              jsrvreq.set_exception(CORBA::Any.to_any(ex_).to_java(self._orb()))
+            if rsrvreq.exc_list_.nil? || rsrvreq.exc_list_.any? { |extc| extc.id == ex_.class._tc.id }
+              jsrvreq.set_exception(CORBA::Any.to_any(ex_).to_java(self._orb))
             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)))
               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_
@@ -91,14 +89,14 @@ module R2CORBA
               jex_klass = CORBA::Native.const_get(ex_.class::Name)
               jsrvreq.setSystemException(jex_klass.new(ex_.reason, ex_.minor, CORBA::Native::CompletionStatus.from_int(ex_.completed)))
             else
-              jsrvreq.set_exception(CORBA::Any.to_any(ex_).to_java(self._orb()))
+              jsrvreq.set_exception(CORBA::Any.to_any(ex_).to_java(self._orb))
             end
           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)))
             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
@@ -108,7 +106,7 @@ module R2CORBA
             return [].to_java(:string)
           elsif @rsrv.respond_to?(:_ids)
             return @rsrv._ids.to_java(:string)
-          elsif @rsrv.class.constants.any? {|c| c.to_sym == :Ids }
+          elsif @rsrv.class.constants.any? { |c| c.to_sym == :Ids }
             return @rsrv.class::Ids.to_java(:string)
           elsif @rsrv.respond_to?(:_primary_interface)
             return [@rsrv._primary_interface(oid, poa)].to_java(:string)
@@ -141,7 +139,7 @@ module R2CORBA
           end
         end
 
-        def _non_existent()
+        def _non_existent
           if @rsrv.nil?
             return true
           elsif @rsrv.respond_to?(:_non_existent)
@@ -151,7 +149,7 @@ module R2CORBA
           end
         end
 
-        def _get_component()
+        def _get_component
           if @rsrv.nil?
             return nil
           elsif @rsrv.respond_to?(:_get_component)
@@ -163,7 +161,7 @@ module R2CORBA
         end
         protected
         def invoke_SI(rsrvreq)
-          opsym = rsrvreq.srvreq_.operation().to_sym
+          opsym = rsrvreq.srvreq_.operation.to_sym
           opsig = @rsrv.get_operation_signature(opsym)
           # explicitly define empty (but not nil) exceptionlist if not yet specified
           opsig[:exc_list] = [] if (Hash === opsig) && !opsig.has_key?(:exc_list)
@@ -174,17 +172,17 @@ module R2CORBA
           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
-              rsrvreq.nvlist_.count().times do |i|
+              rsrvreq.nvlist_.count.times do |i|
                 jnv = rsrvreq.nvlist_.item(i)
                 if [CORBA::ARG_OUT, CORBA::ARG_INOUT].include?(jnv.flags)
                   rval = results.shift
                   rtc = rsrvreq.arg_list_[i][2]
-                  CORBA::Any.to_any(rval, rtc).to_java(self._orb(), jnv.value())
+                  CORBA::Any.to_any(rval, rtc).to_java(self._orb, jnv.value)
                 end
               end
             end
             unless rsrvreq.result_type_.kind == CORBA::TK_VOID
-              rsrvreq.srvreq_.set_result(CORBA::Any.to_any(result_value, rsrvreq.result_type_).to_java(self._orb()))
+              rsrvreq.srvreq_.set_result(CORBA::Any.to_any(result_value, rsrvreq.result_type_).to_java(self._orb))
             end
           end
         end
@@ -194,22 +192,21 @@ module R2CORBA
           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
-              rsrvreq.nvlist_.count().times do |i|
+              rsrvreq.nvlist_.count.times do |i|
                 jnv = rsrvreq.nvlist_.item(i)
                 if [CORBA::ARG_OUT, CORBA::ARG_INOUT].include?(jnv.flags)
                   rval = results.shift
                   rtc = rsrvreq.arg_list_[i][2]
-                  CORBA::Any.to_any(rval, rtc).to_java(self._orb(), jnv.value())
+                  CORBA::Any.to_any(rval, rtc).to_java(self._orb, jnv.value)
                 end
               end
             end
             unless rsrvreq.result_type_.kind == CORBA::TK_VOID
-              rsrvreq.srvreq_.set_result(CORBA::Any.to_any(result_value, rsrvreq.result_type_).to_java(self._orb()))
+              rsrvreq.srvreq_.set_result(CORBA::Any.to_any(result_value, rsrvreq.result_type_).to_java(self._orb))
             end
           end
         end
       end # Servant
-
     end # DSI
 
     class Servant
@@ -217,23 +214,24 @@ module R2CORBA
         @srvref_ ||= PortableServer::DSI::Servant.new_instance(self)
       end
 
-      def _default_POA()
+      def _default_POA
         begin
-          return PortableServer::POA._narrow(CORBA::Object._wrap_native(self.srvref_._default_POA()))
+          return PortableServer::POA._narrow(CORBA::Object._wrap_native(self.srvref_._default_POA))
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end
 
-      def _this()
+      def _this
         unless @srvref_.nil?
           begin
-            return CORBA::Object._wrap_native(self.srvref_._this_object())
+            return CORBA::Object._wrap_native(self.srvref_._this_object)
           rescue NativeException
             # 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?
+
         begin
           return CORBA::Object._wrap_native(self.srvref_._this_object(CORBA::ORB._orb))
         rescue ::NativeException
@@ -241,7 +239,5 @@ module R2CORBA
         end
       end
     end # Servant
-
   end # PortableServer
-
 end # R2CORBA

data/lib/corba/jbase/ServerRequest.rb

@@ -11,9 +11,7 @@
 #--------------------------------------------------------------------
 
 module R2CORBA
-
   module CORBA
-
     module ServerRequest
       @@wrapper_klass = Class.new do
         include CORBA::ServerRequest
@@ -40,6 +38,7 @@ module R2CORBA
       def self._wrap_native(jsrvreq, jorb)
         raise ArgumentError, 'Expected org.omg.CORBA.ServerRequest' unless jsrvreq.is_a?(Native::ServerRequest)
         raise ArgumentError, 'Expected org.omg.CORBA.ORB' unless jorb.is_a?(Native::ORB)
+
         @@wrapper_klass.new(jsrvreq, jorb)
       end
 
@@ -54,21 +53,24 @@ module R2CORBA
       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)
+
         @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)) &&
                                                                     (@result_type_.nil? || @result_type_.is_a?(CORBA::TypeCode)) &&
                                                                     (@exc_list_.nil? || @exc_list_.is_a?(Array))
+
         @nvlist_ = extract_arguments_(@arg_list_)
         self
       end
 
       def arguments
         raise CORBA::BAD_INV_ORDER.new('', 0, CORBA::COMPLETED_NO) unless @nvlist_
+
         unless @arg_
           @arg_ = []
-          @nvlist_.count().times do |i|
+          @nvlist_.count.times do |i|
             jnv = @nvlist_.item(i)
             @arg_ << CORBA::Any.from_java(jnv.value, self.orb_, @arg_list_[i][2]) if [CORBA::ARG_IN, CORBA::ARG_INOUT].include?(jnv.flags)
             @arg_out_ += 1 if [CORBA::ARG_OUT, CORBA::ARG_INOUT].include?(jnv.flags)
@@ -82,6 +84,7 @@ module R2CORBA
         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)
+
         @arg_[key]
       end
 
@@ -90,9 +93,10 @@ module R2CORBA
         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)
+
         jnv = @nvlist_.item(key)
         rtc = @arg_list_[key][2]
-        CORBA::Any.to_any(val, rtc).to_java(self.orb_, jnv.value())
+        CORBA::Any.to_any(val, rtc).to_java(self.orb_, jnv.value)
         @arg_[key] = val
       end
 
@@ -100,7 +104,7 @@ module R2CORBA
       def arg_index_from_name(arg_name)
         unless @arg_index_
           @arg_index_ = {}
-          @nvlist_.count().times do |i|
+          @nvlist_.count.times do |i|
             jnv = @nvlist_.item(i)
             @arg_index_[jnv.name] = i
           end
@@ -113,15 +117,13 @@ 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)
           end
           self.srvreq_.arguments(jnvlist)
         end
         jnvlist
       end
-
     end # ServerRequest
-
   end # CORBA
-
 end # R2CORBA