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

data/lib/corba/common/Any.rb

@@ -12,14 +12,13 @@
 module R2CORBA
   module CORBA
     class Any
-
       def Any.typecode_for_value(val)
         case val
           when CORBA::Any
             return val._tc
           when ::NilClass
             return CORBA._tc_null
-          when ::Bignum
+          when BIGNUM_KLASS
             return CORBA._tc_longlong
           when ::Integer
             return CORBA._tc_long
@@ -64,6 +63,7 @@ module R2CORBA
           if tc.is_a?(CORBA::TypeCode)
             return new(o, tc)
           end
+
           raise CORBA::MARSHAL.new('missing TypeCode', 0, CORBA::COMPLETED_NO)
         end
         return new(o, tc)
@@ -85,7 +85,6 @@ module R2CORBA
         @__tc = tc
         @__value = o
       end
-
     end # Any
   end # CORBA
 end # R2CORBA

data/lib/corba/common/IDL.rb

@@ -21,9 +21,7 @@ ENV['RIDL_BE_SELECT'] = 'ruby'
 require 'ridl/ridl'
 
 module R2CORBA
-
   module CORBA
-
     module IDL
       CLIENT_STUB = 1
       SERVANT_INTF = 2
@@ -63,12 +61,13 @@ module R2CORBA
             f = p + '/' + fname
             File.file?(f) && File.readable?(f)
           end
-          fp += '/' + fname if !fp.nil?
+          fp += '/' + fname unless fp.nil?
           fp
         end
-        if not fpath.nil?
+        unless fpath.nil?
           return fpath
         end
+
         raise "Cannot open IDL file '#{fname}'"
       end
 
@@ -92,9 +91,6 @@ module R2CORBA
           end
         end
       end
-
     end
-
   end
-
 end

data/lib/corba/common/ORB.rb

@@ -12,7 +12,6 @@
 
 module R2CORBA
   module CORBA
-
     def CORBA.ORB_init(*args)
       # actual CORBA wrapper implementation implements
       # the ORB.init method
@@ -30,7 +29,8 @@ module R2CORBA
 
       def self._wrap_native(norb)
         raise ArgumentError, 'Expected org.omg.CORBA.ORB' unless norb.nil? || norb.is_a?(Native::ORB)
-        norb.nil?() ? norb : @@wrapper_klass.new(norb)
+
+        norb.nil? ? norb : @@wrapper_klass.new(norb)
       end
 
       ## init() or init(orb_id, prop = {}) or init(argv, orb_id, prop={}) or init(argv, prop={})
@@ -64,6 +64,7 @@ module R2CORBA
       # ret ::String
       def object_to_string(obj)
         raise CORBA::BAD_PARAM.new('CORBA::Object required', 0, CORBA::COMPLETED_NO) unless obj.is_a?(CORBA::Object)
+
         begin
           self.orb_.object_to_string(obj.objref_)
         rescue ::NativeException
@@ -94,7 +95,7 @@ module R2CORBA
       end
 
       # ret Context
-      def get_default_context()
+      def get_default_context
         raise CORBA::NO_IMPLEMENT
       end
 
@@ -111,12 +112,12 @@ module R2CORBA
       end
 
       # ret boolean
-      def poll_next_response()
+      def poll_next_response
         raise CORBA::NO_IMPLEMENT
       end
 
       # ret Request
-      def get_next_response()
+      def get_next_response
         raise CORBA::NO_IMPLEMENT
       end
 
@@ -129,8 +130,8 @@ module R2CORBA
       end
 
       # ret [::String, ...]
-      def list_initial_services()
-        self.orb_.list_initial_services()
+      def list_initial_services
+        self.orb_.list_initial_services
       end
 
 =begin
@@ -283,27 +284,27 @@ module R2CORBA
 =end
 
       # ret boolean
-      def work_pending()
+      def work_pending
         begin
-          self.orb_.work_pending()
+          self.orb_.work_pending
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end
 
       # ret void
-      def perform_work()
+      def perform_work
         begin
-          self.orb_.perform_work()
+          self.orb_.perform_work
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end
 
       # ret void
-      def run()
+      def run
         begin
-          self.orb_.run()
+          self.orb_.run
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -320,9 +321,9 @@ module R2CORBA
       end
 
       # ret void
-      def destroy()
+      def destroy
         begin
-          self.orb_.destroy()
+          self.orb_.destroy
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -347,21 +348,20 @@ module R2CORBA
       # ValueFactory factory
       # ret ValueFactory
       def register_value_factory(id, factory)
-        self.orb_().register_value_factory(id, factory)
+        self.orb_.register_value_factory(id, factory)
       end
 
       # RepositoryId id
       # ret void
       def unregister_value_factory(id)
-        self.orb_().unregister_value_factory(id)
+        self.orb_.unregister_value_factory(id)
       end
 
       # RepositoryId id
       # ret ValueFactory
       def lookup_value_factory(id)
-        self.orb_().lookup_value_factory(id)
+        self.orb_.lookup_value_factory(id)
       end
     end # ORB
-
   end # CORBA
 end # R2CORBA

data/lib/corba/common/Object.rb

@@ -11,13 +11,13 @@
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
-
     def CORBA.is_nil(obj)
       if obj.nil?
         return true
       elsif obj.is_a?(R2CORBA::CORBA::Object) || obj.respond_to?(:_is_nil?)
-        return obj._is_nil?()
+        return obj._is_nil?
       end
+
       false
     end
 
@@ -39,11 +39,13 @@ module R2CORBA
 
       def self._wrap_native(nobj)
         raise ArgumentError, 'Expected org.omg.CORBA.Object' unless nobj.nil? || nobj.is_a?(Native::Object)
+
         (nobj.nil? || (nobj.respond_to?(:_is_nil) && nobj._is_nil)) ? nil : @@wrapper_klass.new(nobj)
       end
 
       def self._narrow(obj)
         raise CORBA::BAD_PARAM.new('not an object reference', 0, CORBA::COMPLETED_NO) unless obj.nil? || obj.is_a?(CORBA::Object) || obj.is_a?(Native::Object)
+
         obj = self._wrap_native(obj) if obj.is_a?(Native::Object)
         obj
       end
@@ -71,18 +73,19 @@ module R2CORBA
       end
 
       # ret InterfaceDef
-      def _get_interface()
+      def _get_interface
         raise ::CORBA::NO_IMPLEMENT
       end
 
       # ret boolean
-      def _is_nil?()
+      def _is_nil?
         self.objref_.nil? || (self.objref_.respond_to?(:_is_nil) && self.objref_._is_nil)
       end
 
       # ret ::CORBA::Object
-      def _duplicate()
-        return nil if self._is_nil?()
+      def _duplicate
+        return nil if self._is_nil?
+
         begin
           self._wrap_native(self.objref_._duplicate)
         rescue ::NativeException
@@ -91,7 +94,7 @@ module R2CORBA
       end
 
       # ret void
-      def _release()
+      def _release
         self.objref_._release unless self.objref_.nil?
         @objref_ = nil
       end
@@ -99,7 +102,8 @@ module R2CORBA
       # ::String logical_type_id
       # ret boolean
       def _is_a?(logical_type_id)
-        return false if self._is_nil?()
+        return false if self._is_nil?
+
         begin
           self.objref_._is_a(logical_type_id)
         rescue ::NativeException
@@ -108,8 +112,9 @@ module R2CORBA
       end
 
       # ret boolean
-      def _non_existent?()
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+      def _non_existent?
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           self.objref_._non_existent
         rescue ::NativeException
@@ -120,7 +125,8 @@ module R2CORBA
       # ::CORBA::Object other_object
       # ret boolean
       def _is_equivalent?(other_object)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           self.objref_._is_equivalent(other_object)
         rescue ::NativeException
@@ -131,7 +137,8 @@ module R2CORBA
       # Integer(ulong) maximum
       # ret unsigned long
       def _hash(maximum)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           self.objref_._hash(maximum)
         rescue ::NativeException
@@ -140,13 +147,14 @@ 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
         begin
-          self.objref_._repository_id()
+          self.objref_._repository_id
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -178,18 +186,20 @@ module R2CORBA
       end
 
       # 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?
+
         begin
-          CORBA::Object._wrap_native(self.objref_._get_component())
+          CORBA::Object._wrap_native(self.objref_._get_component)
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end
 
       # ret CORBA::ORB
-      def _get_orb()
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+      def _get_orb
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           CORBA::ORB._wrap_native(self.objref_._get_orb)
         rescue ::NativeException
@@ -198,14 +208,14 @@ module R2CORBA
       end
 
       def _request(operation)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           self.objref_._request(operation.to_s)
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end
-
     end # Object
   end # CORBA
 end # R2CORBA

data/lib/corba/common/Request.rb

@@ -11,9 +11,7 @@
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
-
     module Request
     end
-
   end # CORBA
 end # R2CORBA

data/lib/corba/common/Servant.rb

@@ -11,14 +11,11 @@
 #--------------------------------------------------------------------
 
 module R2CORBA
-
   module PortableServer
-
     class Servant
-
       module Intf
         Id  = 'IDL:omg.org/CORBA/Object:1.0'.freeze
-        Ids = [ Id ].freeze
+        Ids = [Id].freeze
         Operations = {}.freeze
       end
 
@@ -46,21 +43,21 @@ module R2CORBA
       end
 
       def Servant.include_srv(srv)
-        if !self.const_defined?('Id')
+        unless self.const_defined?('Id')
           if self.superclass == R2CORBA::PortableServer::Servant || !self.constants.include?('Id')
             self.const_set('Id', srv::Id.dup.freeze)
           else
             self.const_set('Id', self::Id.dup.freeze)
           end
         end
-        if !self.const_defined?('Ids')
+        unless self.const_defined?('Ids')
           if self.superclass == R2CORBA::PortableServer::Servant || !self.constants.include?('Ids')
             self.const_set('Ids', [])
           else
             self.const_set('Ids', self::Ids.dup)
           end
         end
-        if !self.const_defined?('Operations')
+        unless self.const_defined?('Operations')
           if self.superclass == R2CORBA::PortableServer::Servant || !self.constants.include?('Operations')
             self.const_set('Operations', {})
           else
@@ -101,7 +98,5 @@ module R2CORBA
         end
       end
     end
-
   end
-
 end

data/lib/corba/common/Stub.rb

@@ -13,18 +13,18 @@ module R2CORBA
   module CORBA
     module Portable
       module Stub
-
         def self.included(klass)
           klass.class_eval do
 
-            def init()
-              init_corba_portable_stub()
+            def init
+              init_corba_portable_stub
             end
 
             def self.create_stub(obj)
               raise CORBA::INV_OBJREF.new unless obj.is_a?(CORBA::Object)
+
               obj.extend(self) unless obj.is_a?(self)
-              obj.init()
+              obj.init
               return obj
             end
 
@@ -32,10 +32,10 @@ module R2CORBA
         end
 
         Id  = 'IDL:omg.org/CORBA/Object:1.0'.freeze
-        Ids = [ Id ].freeze
+        Ids = [Id].freeze
 
         protected
-        def init_corba_portable_stub()
+        def init_corba_portable_stub
           @ids ||= ['IDL:omg.org/CORBA/Object:1.0']
         end
 
@@ -49,6 +49,7 @@ module R2CORBA
         def _narrow!(klass)
           raise CORBA::OBJECT_NOT_EXIST.new('Nil object narrowed!') if self._is_nil?
           raise(TypeError, "invalid object narrowed: #{self.class}") unless self.is_a?(CORBA::Stub) && self._is_a?(klass::Id)
+
           self.extend klass
           _append_ids(*klass::Ids)
           return self
@@ -57,6 +58,7 @@ module R2CORBA
         def _unchecked_narrow!(klass)
           raise CORBA::OBJECT_NOT_EXIST.new('Nil object narrowed!') if self._is_nil?
           raise(TypeError, "invalid object narrowed: #{self.class}") unless self.is_a?(CORBA::Stub)
+
           self.extend klass
           _append_ids(*klass::Ids)
           return self
@@ -66,7 +68,7 @@ module R2CORBA
           _ids.include?(str) || super(str)
         end
 
-        def inspect()
+        def inspect
           s = ''
           s << self.class.name.to_s << "\n" <<
                "type_id: \n" <<