r2corba 1.5.4 → 1.6.1

data/lib/corba/jbase/poa.rb

@@ -36,11 +36,11 @@ module R2CORBA
     module POA
       def destroy(etherealize_objects, wait_for_completion)
         begin
-          self.objref_.destroy(etherealize_objects!=false, wait_for_completion!=false)
+          self.objref_.destroy(etherealize_objects != false, wait_for_completion != false)
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation destroy
+      end # of operation destroy
 
       def the_name()
         begin
@@ -48,7 +48,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_the_name
+      end # of attribute get_the_name
 
       def the_POAManager()
         begin
@@ -56,7 +56,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_the_POAManager
+      end # of attribute get_the_POAManager
 
       def the_parent()
         begin
@@ -64,7 +64,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_the_parent
+      end # of attribute get_the_parent
 
       def the_children()
         begin
@@ -72,7 +72,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_the_children
+      end # of attribute get_the_children
 
       def activate_object(p_servant)
         begin
@@ -80,7 +80,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation activate_object
+      end # of operation activate_object
 
       def activate_object_with_id(r_id, p_servant)
         begin
@@ -88,7 +88,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation activate_object_with_id
+      end # of operation activate_object_with_id
 
       def deactivate_object(oid)
         begin
@@ -96,7 +96,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation deactivate_object
+      end # of operation deactivate_object
 
       def create_reference(intf)
         begin
@@ -104,7 +104,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_reference
+      end # of operation create_reference
 
       def create_reference_with_id(oid, intf)
         begin
@@ -112,7 +112,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_reference_with_id
+      end # of operation create_reference_with_id
 
       def servant_to_id(p_servant)
         begin
@@ -120,7 +120,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation servant_to_id
+      end # of operation servant_to_id
 
       def servant_to_reference(p_servant)
         begin
@@ -128,7 +128,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation servant_to_reference
+      end # of operation servant_to_reference
 
       def reference_to_servant(reference)
         begin
@@ -136,7 +136,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation reference_to_servant
+      end # of operation reference_to_servant
 
       def reference_to_id(reference)
         begin
@@ -144,7 +144,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation reference_to_id
+      end # of operation reference_to_id
 
       def id_to_servant(oid)
         begin
@@ -152,7 +152,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation id_to_servant
+      end # of operation id_to_servant
 
       def id_to_reference(oid)
         begin
@@ -160,19 +160,19 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation id_to_reference
+      end # of operation id_to_reference
 
       def create_POA(adapter_name, a_POAManager, policies)
         raise CORBA::BAD_PARAM.new('expected POAManager', 0, CORBA::COMPLETED_NO) unless a_POAManager.is_a?(PortableServer::POAManager)
         CORBA::PolicyList._tc.validate(policies) unless policies.nil? || policies.empty?
         jpolicies = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Policy.java_class, policies.nil? ? 0 : policies.size)
-        policies.each_with_index {|p,i| jpolicies[i] = p.objref_ } unless policies.nil?
+        policies.each_with_index {|p, i| jpolicies[i] = p.objref_ } unless policies.nil?
         begin
           PortableServer::POA._narrow(CORBA::Object._wrap_native(self.objref_.create_POA(adapter_name, a_POAManager.objref_, jpolicies)))
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_POA
+      end # of operation create_POA
 
       def find_POA(adapter_name, activate_it)
         begin
@@ -180,7 +180,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation find_POA
+      end # of operation find_POA
     end # POA
 
     module POAManager

data/lib/corba/jbase/policies.rb

@@ -16,7 +16,7 @@ module R2CORBA
 
     module ORB
       def create_policy(type, val)
-        raise CORBA::BAD_PARAM.new('Any expected',0,CORBA::COMPLETED_NO) unless CORBA::Any === val
+        raise CORBA::BAD_PARAM.new('Any expected', 0, CORBA::COMPLETED_NO) unless CORBA::Any === val
         begin
           Policy._wrap_native(self.orb_.create_policy(type.to_i, val.to_java(self.orb_)))
         rescue ::NativeException
@@ -53,12 +53,12 @@ module R2CORBA
           end
           jpolicies.collect {|jpol| Policy._wrap_native(jpol) }
         end
-      end #of operation get_policy_overrides
+      end # of operation get_policy_overrides
 
       def _set_policy_overrides(policies, set_add)
         raise CORBA::INV_OBJREF.new if self._is_nil?()
         jpolicies = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Policy.java_class, policies.size)
-        policies.each_with_index {|e,i| jpolicies[i] = e.objref_ }
+        policies.each_with_index {|e, i| jpolicies[i] = e.objref_ }
         begin
           obj = self.objref_._set_policy_override(jpolicies, Native::SetOverrideType.from_int(set_add))
         rescue ::NativeException
@@ -91,7 +91,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_policy_type
+      end # of attribute get_policy_type
 
       def copy()
         begin
@@ -99,7 +99,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation copy
+      end # of operation copy
 
       def destroy()
         begin
@@ -108,7 +108,7 @@ module R2CORBA
           CORBA::Exception.native2r($!)
         end
         @objref_ = nil
-      end #of operation destroy
+      end # of operation destroy
     end # Policy
 
     module PolicyManager
@@ -121,17 +121,17 @@ module R2CORBA
           CORBA::Exception.native2r($!)
         end
         jpolicies.collect {|jpol| Policy._wrap_native(jpol) }
-      end #of operation get_policy_overrides
+      end # of operation get_policy_overrides
 
       def set_policy_overrides(policies, set_add)
         jpolicies = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Policy.java_class, policies.size)
-        policies.each_with_index {|e,i| jpolicies[i] = e.objref_ }
+        policies.each_with_index {|e, i| jpolicies[i] = e.objref_ }
         begin
           self.objref_.set_policy_overrides(jpolicies, Native::SetOverrideType.from_int(set_add))
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation set_policy_overrides
+      end # of operation set_policy_overrides
     end # Policy
 
   end # CORBA
@@ -147,7 +147,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_thread_policy
+      end # of operation create_thread_policy
 
       def create_lifespan_policy(value)
         begin
@@ -157,7 +157,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_lifespan_policy
+      end # of operation create_lifespan_policy
 
       def create_id_uniqueness_policy(value)
         begin
@@ -167,7 +167,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_id_uniqueness_policy
+      end # of operation create_id_uniqueness_policy
 
       def create_id_assignment_policy(value)
         begin
@@ -177,7 +177,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_id_assignment_policy
+      end # of operation create_id_assignment_policy
 
       def create_implicit_activation_policy(value)
         begin
@@ -187,7 +187,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_implicit_activation_policy
+      end # of operation create_implicit_activation_policy
 
       def create_servant_retention_policy(value)
         begin
@@ -197,7 +197,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_servant_retention_policy
+      end # of operation create_servant_retention_policy
 
       def create_request_processing_policy(value)
         begin
@@ -207,7 +207,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_request_processing_policy
+      end # of operation create_request_processing_policy
     end # POA
 
     module ThreadPolicy  ## interface
@@ -217,8 +217,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface ThreadPolicy
+      end # of attribute get_value
+    end # of interface ThreadPolicy
 
     module LifespanPolicy  ## interface
       def value()
@@ -227,8 +227,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface LifespanPolicy
+      end # of attribute get_value
+    end # of interface LifespanPolicy
 
     module IdUniquenessPolicy  ## interface
       def value()
@@ -237,8 +237,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface IdUniquenessPolicy
+      end # of attribute get_value
+    end # of interface IdUniquenessPolicy
 
     module IdAssignmentPolicy  ## interface
       def value()
@@ -247,8 +247,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface IdAssignmentPolicy
+      end # of attribute get_value
+    end # of interface IdAssignmentPolicy
 
     module ImplicitActivationPolicy  ## interface
       def value()
@@ -257,8 +257,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface ImplicitActivationPolicy
+      end # of attribute get_value
+    end # of interface ImplicitActivationPolicy
 
     module ServantRetentionPolicy  ## interface
       def value()
@@ -267,8 +267,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface RequestProcessingPolicy
+      end # of attribute get_value
+    end # of interface RequestProcessingPolicy
 
     module RequestProcessingPolicy  ## interface
       def value()
@@ -277,8 +277,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface RequestProcessingPolicy
+      end # of attribute get_value
+    end # of interface RequestProcessingPolicy
 
   end # PortableServer
 
@@ -291,8 +291,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface BidirectionalPolicy
+      end # of attribute get_value
+    end # of interface BidirectionalPolicy
 
   end # BiDirPolicy
 

data/lib/corba/jbase/require.rb

@@ -50,18 +50,22 @@ module R2CORBA
       module Portable
         include_package 'org.omg.CORBA.portable'
       end
+
       module V2_3
         include_package 'org.omg.CORBA_2_3'
         module Portable
           include_package 'org.omg.CORBA.portable'
         end
       end
+
       module V2_5
         include_package 'org.omg.CORBA_2_5'
       end
+
       module V3_0
         include_package 'org.omg.CORBA_3_0'
       end
+
       module Jacorb
         module Util
           java_import org.jacorb.util.Version

data/lib/corba/poa.rb

@@ -11,4 +11,4 @@
 #--------------------------------------------------------------------
 
 require 'corba.rb'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/poa.rb"
+require "corba/#{defined?(JRUBY_VERSION) ? 'jbase' : 'cbase'}/poa.rb"

data/lib/corba/policies.rb

@@ -14,4 +14,4 @@ require 'corba.rb'
 require 'corba/poa.rb'
 require 'corba/idl/BiDirPolicyC'
 require 'corba/idl/MessagingC'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/policies.rb"
+require "corba/#{defined?(JRUBY_VERSION) ? 'jbase' : 'cbase'}/policies.rb"

data/lib/corba/require.rb

@@ -11,6 +11,6 @@
 #--------------------------------------------------------------------
 
 require 'corba/common/require'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/require"
+require "corba/#{defined?(JRUBY_VERSION) ? 'jbase' : 'cbase'}/require"
 require 'corba/idl/require'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/post_require"
+require "corba/#{defined?(JRUBY_VERSION) ? 'jbase' : 'cbase'}/post_require"

data/lib/corba/svcs/ins/cos_naming.rb

@@ -12,7 +12,7 @@
 #--------------------------------------------------------------------
 
 require 'corba/naming_service'
-if (defined?(JRUBY_VERSION) or R2CORBA::TAO::RUBY_THREAD_SUPPORT)
+if defined?(JRUBY_VERSION) or R2CORBA::TAO::RUBY_THREAD_SUPPORT
   require 'monitor'
 end
 
@@ -23,14 +23,16 @@ module CosNaming
     def to_key
       "#{self.r_id}|#{self.kind}"
     end
+
     # convert NameComponent to stringified format according to spec
     def to_string
       s = ''
-      s = self.r_id.gsub(/([\/\.\\])/,'\\\1') unless self.r_id.to_s.empty?
+      s = self.r_id.gsub(/([\/\.\\])/, '\\\1') unless self.r_id.to_s.empty?
       s << '.' if s.empty? or !self.kind.to_s.empty?
-      s << self.kind.gsub(/([\/\.\\])/,'\\\1') unless self.kind.to_s.empty?
+      s << self.kind.gsub(/([\/\.\\])/, '\\\1') unless self.kind.to_s.empty?
       s
     end
+
     # convert stringified name back to NameComponent
     def self.from_string(snc)
       raise CosNaming::NamingContext::InvalidName.new if snc.empty?
@@ -43,9 +45,9 @@ module CosNaming
           esc_ = !esc_
         when '.'
           unless esc_
-            raise CosNaming::NamingContext::InvalidName.new if off_>0
+            raise CosNaming::NamingContext::InvalidName.new if off_ > 0
             id_ = snc[0, i].gsub(/\\(\.|\\)/, '\1')
-            off_ = i+1
+            off_ = i + 1
           end
           esc_ = false
         else
@@ -80,7 +82,7 @@ module R2CORBA
       def next_n(how_many)
         raise CORBA::BAD_PARAM.new if how_many < 1
         bindings = []
-        while how_many>0 and !@rl.empty?
+        while how_many > 0 and !@rl.empty?
           reg = @rl.shift
           bindings << CosNaming::Binding.new(reg[:name], reg[:type])
           how_many -= 1
@@ -104,12 +106,13 @@ module R2CORBA
       # Map type to store bindings.
       # Use synchronized version for multithreading capable implementations.
       #
-      if (defined?(JRUBY_VERSION) or R2CORBA::TAO::RUBY_THREAD_SUPPORT)
+      if defined?(JRUBY_VERSION) or R2CORBA::TAO::RUBY_THREAD_SUPPORT
         MAP_TYPE = Class.new(Monitor) do
           def initialize
             super
             @map_ = {}
           end
+
           def size()
             rc = 0
             synchronize do
@@ -117,6 +120,7 @@ module R2CORBA
             end
             return rc
           end
+
           def has_key?(key)
             rc = false
             synchronize do
@@ -124,6 +128,7 @@ module R2CORBA
             end
             return rc
           end
+
           def [](key)
             rc = nil
             synchronize do
@@ -131,12 +136,14 @@ module R2CORBA
             end
             return rc
           end
+
           def []=(key, value)
             synchronize do
               @map_[key] = value
             end
             value
           end
+
           def delete(key)
             rc = nil
             synchronize do
@@ -144,6 +151,7 @@ module R2CORBA
             end
             return rc
           end
+
           def values
             rc = nil
             synchronize do
@@ -151,6 +159,7 @@ module R2CORBA
             end
             return rc
           end
+
           def each(&block)
             synchronize do
               @map_.each &block
@@ -197,8 +206,8 @@ module R2CORBA
       # CosNaming::NamingContext methods
       #
       def bind(n, obj)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
-        if n.size>1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.bind(n, obj)
         else
@@ -207,8 +216,8 @@ module R2CORBA
       end
 
       def rebind(n, obj)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
-        if n.size>1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.rebind(n, obj)
         else
@@ -217,8 +226,8 @@ module R2CORBA
       end
 
       def bind_context(n, nc_new)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
-        if n.size>1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.bind_context(n, nc_new)
         else
@@ -227,8 +236,8 @@ module R2CORBA
       end
 
       def rebind_context(n, nc_new)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
-        if n.size>1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.rebind_context(n, nc_new)
         else
@@ -237,13 +246,13 @@ module R2CORBA
       end
 
       def resolve(n)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
         find_object(n)
       end
 
       def unbind(n)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
-        if n.size>1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.unbind(n)
         else
@@ -263,14 +272,14 @@ module R2CORBA
       end
 
       def bind_new_context(n)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
         nc = self.new_context()
         self.bind_context(n, nc)
         nc
       end
 
       def destroy()
-        raise CosNaming::NamingContext::NotEmpty.new if @map.size>0
+        raise CosNaming::NamingContext::NotEmpty.new if @map.size > 0
         return if self.oid.nil? ## no oid for root context
         poa = self._default_POA
         poa.deactivate_object(self.oid)
@@ -280,7 +289,7 @@ module R2CORBA
       def list(how_many)
         reglist = @map.values
         bindings = []
-        while how_many>0 and !reglist.empty?
+        while how_many > 0 and !reglist.empty?
           reg = reglist.shift
           bindings << CosNaming::Binding.new(reg[:name], reg[:type])
           how_many -= 1
@@ -298,7 +307,7 @@ module R2CORBA
       # CosNaming::NamingContextExt methods
       #
       def to_string(n)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
         n.collect { |nc| nc.to_string }.join('/')
       end
 
@@ -308,13 +317,13 @@ module R2CORBA
         off_ = 0
         esc_ = false
         sn.size.times do |i|
-          case sn[i,1]
+          case sn[i, 1]
           when '\\'
             esc_ = !esc_
           when '/'
             unless esc_
-              snc_arr << sn[off_, i-off_]
-              off_ = i+1
+              snc_arr << sn[off_, i - off_]
+              off_ = i + 1
             end
             esc_ = false
           else
@@ -327,7 +336,7 @@ module R2CORBA
 
       def to_url(addr, sn)
         raise CosNaming::NamingContext::InvalidName.new if addr.to_s.empty? or sn.to_s.empty?
-        url = 'corbaname:'+addr+'#'
+        url = 'corbaname:' + addr + '#'
         sn.scan(/./) do |ch|
           if /[a-zA-Z0-9;\/:\?@=+\$,\-_\.!~*\'\(\)]/ =~ ch
             url << ch
@@ -385,7 +394,7 @@ module R2CORBA
       # resolving the context levels
       #
       def find_object(n)
-        if n.size>1
+        if n.size > 1
           nc = find_context(n)
           nc.resolve(n)
         else
@@ -417,7 +426,7 @@ module R2CORBA
         end
       end
 
-    end #of NamingContext servant
+    end # of NamingContext servant
 
   end
 end