r2corba 1.6.2 → 1.7.1

data/lib/corba/cbase/Typecode.rb

@@ -13,7 +13,6 @@
 module R2CORBA
   module CORBA
     class TypeCode
-
       def kind
         begin
           self.tc_.kind
@@ -31,7 +30,6 @@ module R2CORBA
       end
 
       class Recursive < CORBA::TypeCode
-
         def initialize(id)
           begin
             @tc_ = CORBA::Native::TypeCode.create_recursive_tc(id)
@@ -39,11 +37,9 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
-
       end # Recursive
 
       class String < CORBA::TypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -55,11 +51,9 @@ module R2CORBA
             end
           end
         end
-
       end # String
 
       class WString < CORBA::TypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -71,11 +65,9 @@ module R2CORBA
             end
           end
         end
-
       end # WString
 
       class Fixed < CORBA::TypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -88,17 +80,16 @@ module R2CORBA
             end
           end
         end
-
       end # Fixed
 
       class Sequence < CORBA::TypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
           else
             element_tc, bound = args
             raise ArgumentError, 'expected CORBA::TypeCode' unless element_tc.is_a?(CORBA::TypeCode)
+
             begin
               @tc_ = CORBA::Native::TypeCode.create_tc(TK_SEQUENCE, bound.to_i, element_tc.tc_)
             rescue ::NativeException
@@ -106,11 +97,9 @@ module R2CORBA
             end
           end
         end
-
       end
 
       class Array < CORBA::TypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -118,6 +107,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
               this_len = length.shift
               content_tc = self.class.new(content_tc, *length)
@@ -131,19 +121,15 @@ module R2CORBA
             end
           end
         end
-
       end # Array
 
       class IdentifiedTypeCode < CORBA::TypeCode
-
         def initialize(id)
           CORBA::TypeCode.register_id_type(id.to_s, self)
         end
-
       end # IdentifiedTypeCode
 
       class Alias < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -152,6 +138,7 @@ module R2CORBA
           else
             id, name, orig_tc, type = args
             raise ArgumentError, 'expected CORBA::TypeCode' unless orig_tc.is_a?(CORBA::TypeCode)
+
             begin
               @tc_ = CORBA::Native::TypeCode.create_tc(TK_ALIAS, id.to_s, name.to_s, orig_tc.tc_)
             rescue ::NativeException
@@ -161,11 +148,9 @@ module R2CORBA
             super(id)
           end
         end
-
       end # Alias
 
       class Valuetype < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -179,6 +164,7 @@ module R2CORBA
             id, name, modifier, base, members_, type_ = args
             raise ArgumentError, 'expected CORBA::Typecode' unless base.nil? || base.is_a?(CORBA::TypeCode)
             raise ArgumentError, 'expected members Array' unless members_.is_a?(::Array) || type_.nil?
+
             if type_.nil? && !members_.is_a?(::Array)
               type_ = members_
               members_ = []
@@ -206,11 +192,9 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
-
       end # Valuetype
 
       class Eventtype < Valuetype
-
         protected
 
         def _create_tc(id, name, modifier, base, members)
@@ -223,11 +207,9 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
-
       end # Eventtype
 
       class Valuebox < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -236,6 +218,7 @@ module R2CORBA
           else
             id, name, boxed_tc, type = args
             raise ArgumentError, 'expected CORBA::TypeCode' unless boxed_tc.is_a?(CORBA::TypeCode)
+
             begin
               @tc_ = CORBA::Native::TypeCode.create_tc(TK_VALUE_BOX, id.to_s, name.to_s, boxed_tc.tc_)
             rescue ::NativeException
@@ -247,11 +230,9 @@ module R2CORBA
             CORBA::ORB._check_value_factory(@type::Factory) if @type < CORBA::Portable::BoxedValueBase
           end
         end
-
       end # Valuebox
 
       class ObjectRef < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -268,11 +249,9 @@ module R2CORBA
             super(id)
           end
         end
-
       end # ObjectRef
 
       class AbstractInterface < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -289,11 +268,9 @@ module R2CORBA
             super(id)
           end
         end
-
       end # AbstractInterface
 
       class Struct < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -306,6 +283,7 @@ module R2CORBA
           else
             id, name, members_, type_ = args
             raise ArgumentError, 'expected members Array' unless members_.is_a?(::Array) || type_.nil?
+
             if type_.nil? && !members_.is_a?(::Array)
               type_ = members_
               members_ = []
@@ -313,7 +291,7 @@ module R2CORBA
             @type = type_
             @members = []
             members_.each { |n, tc| add_member(n, tc) }
-            n_members = @members.collect {|n, tc| [n.to_s(), tc.tc_] }
+            n_members = @members.collect { |n, tc| [n.to_s, tc.tc_] }
             @tc_ = _create_tc(id, name, n_members)
             super(id)
           end
@@ -328,11 +306,9 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
-
       end # Struct
 
       class Except < Struct
-
         protected
 
         def _create_tc(id, name, members)
@@ -342,11 +318,9 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
-
       end # Except
 
       class Union < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -369,6 +343,7 @@ module R2CORBA
             id, name, switchtype_, members_, type_, implicit_default_ = args
             raise ::CORBA::BAD_PARAM unless members_.is_a? ::Array
             raise ::CORBA::BAD_PARAM unless switchtype_.is_a?(CORBA::TypeCode)
+
             @type = type_
             @implicit_default = implicit_default_
             @switchtype = switchtype_.resolved_tc
@@ -400,21 +375,20 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
-
       end # Union
 
       class Enum < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
             @range = (0..@tc_.member_count).freeze
-            @members = @range.to_a.collect {|i| @tc_.member_name(i) }
+            @members = @range.to_a.collect { |i| @tc_.member_name(i) }
             super(@tc_.id)
           else
             id, name, members_ = args
             raise CORBA::BAD_PARAM unless members_.is_a? ::Array
-            @members = members_.collect {|m| m.to_s}
+
+            @members = members_.collect { |m| m.to_s }
             @range = (0...@members.size).freeze
             begin
               @tc_ = CORBA::Native::TypeCode.create_tc(TK_ENUM, id.to_s, name.to_s, @members)
@@ -424,7 +398,6 @@ module R2CORBA
             super(id)
           end
         end
-
       end # Enum
 
       def TypeCode.get_primitive_tc(kind)
@@ -432,9 +405,7 @@ module R2CORBA
       end
 
       # final initialization
-      self._init()
-
+      self._init
     end # TypeCode
-
   end ## module CORBA
 end ## module R2CORBA

data/lib/corba/cbase/Values.rb

@@ -56,7 +56,6 @@ module R2CORBA
 
     module Portable
       class ValueFactoryBase
-
         def self.inherited(value_factory_base)
           # value_factory_base is the <valuetype>Factory base class
           # generated from IDL
@@ -69,9 +68,8 @@ module R2CORBA
 
         def self._check_factory
           f = self._lookup_value_factory(self.value_id)
-          self._register_value_factory(self.value_id(), self.new) if f.nil?
+          self._register_value_factory(self.value_id, self.new) if f.nil?
         end
-
       end # ValueFactoryBase
 
       module CustomValueBase
@@ -124,7 +122,6 @@ module R2CORBA
           end
         end
       end
-
     end # Portable
   end # CORBA
 end # R2CORBA

data/lib/corba/cbase/exception.rb

@@ -13,7 +13,6 @@
 # import all java CORBA exceptions into the R2CORBA::CORBA namespace
 module R2CORBA
   module CORBA
-
     class Exception
       def self.native2r(nex)
         raise nex
@@ -59,7 +58,6 @@ module R2CORBA
         self.class::Id
       end
     end
-
   end # CORBA
 end # R2CORBA
 

data/lib/corba/cbase/poa.rb

@@ -10,8 +10,8 @@
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
 
-require 'corba/common/Servant.rb'
-require 'corba/idl/POAC.rb'
+require 'corba/common/Servant'
+require 'corba/idl/POAC'
 require 'corba/idl/IORTableC'
 
 begin

data/lib/corba/cbase/policies.rb

@@ -19,12 +19,11 @@ rescue LoadError
 end
 
 module R2CORBA
-
   module CORBA
-
     module ORB
       def create_policy(type, val)
         raise CORBA::BAD_PARAM.new('Any expected', 0, CORBA::COMPLETED_NO) unless CORBA::Any === val
+
         begin
           self.orb_.create_policy(type.to_i, val)
         rescue ::NativeException
@@ -35,7 +34,8 @@ module R2CORBA
 
     module Object
       def _get_policy(policy_type)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           pol = self.objref_._get_policy(policy_type)
         rescue ::NativeException
@@ -45,7 +45,8 @@ module R2CORBA
       end
 
       def _set_policy_overrides(policies, set_add)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           CORBA::Object._wrap_native(self.objref_._set_policy_overrides(policies, set_add))
         rescue ::NativeException
@@ -54,7 +55,8 @@ module R2CORBA
       end
 
       def _get_policy_overrides(types)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           self.objref_._get_policy_overrides(types)
         rescue ::NativeException
@@ -63,7 +65,8 @@ module R2CORBA
       end
 
       def _validate_connection(inconsistent_policies)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           self.objref_._validate_connection(inconsistent_policies)
         rescue ::NativeException
@@ -71,7 +74,5 @@ module R2CORBA
         end
       end
     end # Object
-
   end # CORBA
-
 end # R2CORBA

data/lib/corba/cbase/require.rb

@@ -26,7 +26,7 @@ rescue LoadError
   raise
 end
 
-[ 'exception',
+['exception',
   'ORB',
   'Request',
   'Typecode',

data/lib/corba/cmds/base.rb

@@ -14,14 +14,13 @@ require 'optparse'
 
 module R2CORBA
   module Commands
-
     @@commands = Hash.new do |hash, key|
       $stderr.puts "Unknown command #{key} specified."
       exit(1)
     end
 
     @@options = {
-      :verbose => false
+      verbose: false
     }
 
     def self.register(cmdid, cmdhandler)

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