r2corba 1.5.5 → 1.6.0

data/lib/corba/common/Stub.rb

@@ -31,12 +31,12 @@ module R2CORBA
           end
         end
 
-        Id  = "IDL:omg.org/CORBA/Object:1.0".freeze
+        Id  = 'IDL:omg.org/CORBA/Object:1.0'.freeze
         Ids = [ Id ].freeze
 
         protected
         def init_corba_portable_stub()
-          @ids ||= ["IDL:omg.org/CORBA/Object:1.0"]
+          @ids ||= ['IDL:omg.org/CORBA/Object:1.0']
         end
 
         def _ids; @ids; end
@@ -47,7 +47,7 @@ module R2CORBA
 
         public
         def _narrow!(klass)
-          raise CORBA::OBJECT_NOT_EXIST.new("Nil object narrowed!") if self._is_nil?
+          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)
@@ -55,7 +55,7 @@ module R2CORBA
         end
 
         def _unchecked_narrow!(klass)
-          raise CORBA::OBJECT_NOT_EXIST.new("Nil object narrowed!") if self._is_nil?
+          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)
@@ -67,10 +67,10 @@ module R2CORBA
         end
 
         def inspect()
-          s = ""
+          s = ''
           s << self.class.name.to_s << "\n" <<
                "type_id: \n" <<
-               "  " << @ids.join("\n  ") << "\n"
+               '  ' << @ids.join("\n  ") << "\n"
         end
       end # Stub
     end # Portable

data/lib/corba/common/Typecode.rb

@@ -49,6 +49,7 @@ module R2CORBA
           @name_types = {}
           super
         end
+
         def []=(id, tc)
           synchronize do
             @id_types[id] = tc
@@ -57,6 +58,7 @@ module R2CORBA
             @name_types[tc.name] = types_for_name_
           end
         end
+
         def [](id)
           tc = nil
           synchronize do
@@ -64,6 +66,7 @@ module R2CORBA
           end
           tc
         end
+
         def types_for_name(name)
           tcs = nil
           synchronize do
@@ -184,7 +187,7 @@ module R2CORBA
       end
 
       def equal?(tc)
-        raise ArgumentError, "expected CORBA::TypeCode" unless tc.is_a?(CORBA::TypeCode)
+        raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
         begin
           self.tc_.equal(tc.tc_)
         rescue ::NativeException
@@ -193,7 +196,7 @@ module R2CORBA
       end
 
       def equivalent?(tc)
-        raise ArgumentError, "expected CORBA::TypeCode" unless tc.is_a?(CORBA::TypeCode)
+        raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
         begin
           self.tc_.equivalent(tc.tc_)
         rescue ::NativeException
@@ -397,19 +400,24 @@ module R2CORBA
           @recursive_tc ||= TypeCode.typecode_for_id(self.id)
           @recursive_tc || ::CORBA::TypeCode.new(TK_NULL)
         end
+
         def resolved_tc
           recursed_tc.resolved_tc
         end
+
         def is_recursive_tc?
           true
         end
+
         def get_type
           @recursive_tc ||= TypeCode.typecode_for_id(self.id)
           if @recursive_tc.nil? then nil; else @recursive_tc.get_type; end
         end
+
         def validate(val)
           recursed_tc.validate(val)
         end
+
         def needs_conversion(val)
           recursed_tc.needs_conversion(val)
         end
@@ -466,7 +474,7 @@ module R2CORBA
             "widestring size exceeds bound: #{self.length.to_s}",
             1, ::CORBA::COMPLETED_NO) unless self.length == 0 || val.size <= self.length
           raise ::CORBA::MARSHAL.new(
-            "invalid widestring element(s)",
+            'invalid widestring element(s)',
             1, ::CORBA::COMPLETED_NO) if val.any? { |el| !(UShortRange === (el.respond_to?(:to_int) ? el.to_int : el)) }
           val.any? { |el| !(::Integer === el) } ? val.collect { |el| el.to_int } : val
         end
@@ -607,6 +615,7 @@ module R2CORBA
         def get_type
           @type || self.content_type.get_type
         end
+
         def validate(val)
           self.content_type.validate(val)
         end
@@ -625,6 +634,7 @@ module R2CORBA
         def initialize(*args)
           raise 'overload required'
         end
+
         def add_member(name, tc, access)
           raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
           @members << [name, tc, access]
@@ -683,10 +693,12 @@ module R2CORBA
         def member_count
           @members.size
         end
+
         def member_name(index)
           raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][0]
         end
+
         def member_type(index)
           raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][1]
@@ -773,6 +785,7 @@ module R2CORBA
         def initialize(*args)
           raise 'overload required'
         end
+
         def add_member(name, tc)
           raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
           @members << [name, tc]
@@ -821,10 +834,12 @@ module R2CORBA
         def member_count
           @members.size
         end
+
         def member_name(index)
           raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][0]
         end
+
         def member_type(index)
           raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][1]
@@ -883,16 +898,20 @@ module R2CORBA
         def initialize(*args)
           raise 'overload required'
         end
+
         # because creating the native tc involves creating Any's we postpone until actually needed
         def tc_
           raise 'overload required'
         end
+
         def id
           @id
         end
+
         def name
           @name
         end
+
         def add_member(label, name, tc)
           raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
           @switchtype.validate(label) unless label == :default
@@ -935,7 +954,7 @@ module R2CORBA
           return val if val.nil?
           super(val)
           @switchtype.validate(val._disc) unless val._disc == :default
-          #raise CORBA::MARSHAL.new(
+          # raise CORBA::MARSHAL.new(
           #  "invalid discriminator value (#{val._disc.to_s}) for union #{name}",
           #  1, CORBA::COMPLETED_NO) unless @labels.has_key?(val._disc)
           if @labels.has_key?(val._disc)  # no need to check for implicit defaults
@@ -958,28 +977,33 @@ module R2CORBA
         def member_count
           @members.size
         end
+
         def member_name(index)
           raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][1]
         end
+
         def member_type(index)
           raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][2]
         end
+
         def member_label(index)
           raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][0]
         end
+
         def discriminator_type
           @switchtype
         end
+
         def default_index
           if @labels.has_key? :default then @labels[:default]; else -1; end
         end
 
         def label_index(val)
           val = @switchtype.validate(val) unless val == :default
-          #raise CORBA::MARSHAL.new(
+          # raise CORBA::MARSHAL.new(
           #  "invalid discriminator value (#{val}) for union #{name}",
           #  1, CORBA::COMPLETED_NO) unless val == :default || @labels.has_key?(val) || @labels.has_key?(:default)
           if val == :default then @labels[:default]; elsif @labels.has_key?(val) then @labels[val] else nil end
@@ -1002,6 +1026,7 @@ module R2CORBA
         def initialize(*args)
           raise 'overload required'
         end
+
         def get_type
           ::Integer
         end
@@ -1021,6 +1046,7 @@ module R2CORBA
         def member_count
           @members.size
         end
+
         def member_name(index)
           raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index]
@@ -1093,17 +1119,17 @@ module R2CORBA
     end
 
     def CORBA._tc_CCMObject
-      @@tc_CCMObject ||= TypeCode::Component.new("IDL:omg.org/CORBA/CCMObject:1.0", "CCMObject", CORBA::Object).freeze
+      @@tc_CCMObject ||= TypeCode::Component.new('IDL:omg.org/CORBA/CCMObject:1.0', 'CCMObject', CORBA::Object).freeze
     end
 
     def CORBA._tc_CCHome
-      @@tc_CCHome ||= TypeCode::Home.new("IDL:omg.org/CORBA/CCHome:1.0", "CCHome", CORBA::Object).freeze
+      @@tc_CCHome ||= TypeCode::Home.new('IDL:omg.org/CORBA/CCHome:1.0', 'CCHome', CORBA::Object).freeze
     end
 
     # define system exception related typecode constants
 
     def CORBA._tc_CompletionStatus
-      @@tc_CompletionStatus ||= TypeCode::Enum.new("IDL:omg.org/CORBA/CompletionStatus:1.0", "CompletionStatus",
+      @@tc_CompletionStatus ||= TypeCode::Enum.new('IDL:omg.org/CORBA/CompletionStatus:1.0', 'CompletionStatus',
                                                    CORBA::COMPLETED_TXT.collect {|t| "COMPLETED_#{t}"})
     end
 
@@ -1111,6 +1137,7 @@ module R2CORBA
       def to_d(precision)
         BigDecimal(self.to_s(precision))
       end
+
       def LongDouble._tc
         CORBA._tc_longdouble
       end

data/lib/corba/common/Union.rb

@@ -19,16 +19,20 @@ module R2CORBA
           @discriminator = nil
           @value = nil
         end
+
         def _is_at_default?
           @discriminator == :default
         end
+
         def _value_tc
           ix = self.class._tc.label_index(@discriminator)
           self.class._tc.member_type(ix)
         end
+
         def _disc
           @discriminator
         end
+
         def _disc=(val)
           m_cur = self.class._tc.label_member(@discriminator) unless @discriminator.nil?
           m_new = self.class._tc.label_member(val)
@@ -39,6 +43,7 @@ module R2CORBA
           @discriminator = val
           disc_
         end
+
         def _value
           @value
         end

data/lib/corba/common/Values.rb

@@ -42,6 +42,7 @@ module R2CORBA
         def marshal(os)
           raise CORBA::NO_IMPLEMENT
         end
+
         def unmarshal(is)
           raise CORBA::NO_IMPLEMENT
         end

data/lib/corba/common/const.rb

@@ -12,7 +12,7 @@
 module R2CORBA
   module CORBA
     BIG_ENDIAN, LTL_ENDIAN = 0, 1
-    ENDIAN = ("Ruby".unpack("i")[0] == 2036495698) ? LTL_ENDIAN : BIG_ENDIAN
+    ENDIAN = ('Ruby'.unpack('i')[0] == 2036495698) ? LTL_ENDIAN : BIG_ENDIAN
 
     ARG_IN = 1
     ARG_OUT = 2

data/lib/corba/common/exception.rb

@@ -13,7 +13,7 @@
 module R2CORBA
   module CORBA
     COMPLETED_YES, COMPLETED_NO, COMPLETED_MAYBE = (0..2).to_a
-    COMPLETED_TXT = ["YES", "NO", "MAYBE"].freeze
+    COMPLETED_TXT = ['YES', 'NO', 'MAYBE'].freeze
     class Exception < StandardError
     end
 
@@ -29,6 +29,7 @@ module R2CORBA
       def reason
         self.message
       end
+
       def to_s
         "CORBA::#{self.class::Name}(#{super}) [minor=#{@minor};completed=#{COMPLETED_TXT[@completed.to_i]}]"
       end

data/lib/corba/common/version.rb

@@ -13,8 +13,8 @@
 module R2CORBA
 
   R2CORBA_MAJOR = 1
-  R2CORBA_MINOR = 5
-  R2CORBA_RELEASE = 5
+  R2CORBA_MINOR = 6
+  R2CORBA_RELEASE = 0
 
   R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
 

data/lib/corba/idl/IDL.rb

@@ -12,7 +12,7 @@
 module R2CORBA
 
   module CORBA
-    def CORBA.implement(idlfile, params={}, genbits = IDL::CLIENT_STUB, &block)
+    def CORBA.implement(idlfile, params = {}, genbits = IDL::CLIENT_STUB, &block)
       IDL.implement(idlfile, params, genbits, &block)
     end
   end

data/lib/corba/jbase/Any.rb

@@ -15,12 +15,14 @@ module R2CORBA
       module Dynamic
         include_package 'org.omg.DynamicAny'
       end
+
       module Reflect
         java_import java.lang.reflect.Array
       end
     end
+
     class Any
-      def to_java(jorb=nil, jany=nil)
+      def to_java(jorb = nil, jany = nil)
         rtc = self._tc
         rval = self._value.nil? ? self._value : rtc.validate(self._value)
         restc = rtc.resolved_tc
@@ -102,7 +104,7 @@ module R2CORBA
             return jany
           else
             dynFactory = CORBA::Native::Dynamic::DynAnyFactoryHelper.narrow(
-                          (jorb || CORBA::ORB._orb).resolve_initial_references("DynAnyFactory"))
+                          (jorb || CORBA::ORB._orb).resolve_initial_references('DynAnyFactory'))
             jdynany = dynFactory.create_dyn_any_from_type_code(rtc.tc_)
             begin
               unless rval.nil?
@@ -152,7 +154,7 @@ module R2CORBA
         end
       end # to_java
 
-      def Any.from_java(jany, jorb=nil, rtc=nil)
+      def Any.from_java(jany, jorb = nil, rtc = nil)
         rtc ||= CORBA::TypeCode.from_native(jany.type)
         rval = nil
         begin
@@ -224,7 +226,7 @@ module R2CORBA
             end
           else
             dynFactory = CORBA::Native::Dynamic::DynAnyFactoryHelper.narrow(
-                          (jorb || CORBA::ORB._orb).resolve_initial_references("DynAnyFactory"))
+                          (jorb || CORBA::ORB._orb).resolve_initial_references('DynAnyFactory'))
             jdynany = dynFactory.create_dyn_any(jany)
             begin
               restc = rtc.resolved_tc

data/lib/corba/jbase/ORB.rb

@@ -58,8 +58,8 @@ module R2CORBA
         @@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