r2corba 1.5.1-universal-java → 1.5.5-universal-java

data/lib/corba/jbase/policies.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
@@ -17,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
@@ -59,7 +58,7 @@ module R2CORBA
       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
@@ -126,7 +125,7 @@ module R2CORBA
 
       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
@@ -297,4 +296,4 @@ module R2CORBA
 
   end # BiDirPolicy
 
-end # R2CORBA
+end # R2CORBA

data/lib/corba/jbase/post_require.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba/jbase/IORMap'

data/lib/corba/jbase/require.rb

@@ -8,14 +8,13 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 require 'rbconfig'
 require 'java'
 
 module R2CORBA
   if ENV['JACORB_HOME'] &&
-      (File.exists?(File.join(ENV['JACORB_HOME'], 'lib', 'jacorb.jar')) ||
+      (File.exist?(File.join(ENV['JACORB_HOME'], 'lib', 'jacorb.jar')) ||
        Dir[File.join(ENV['JACORB_HOME'], 'lib', 'jacorb-*.jar')].any? {|p| p =~ /\/jacorb\-\d\.\d\.jar\Z/})
     JACORB_HOME = ENV['JACORB_HOME']
   else

data/lib/corba/naming.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba/idl/CosNamingC'

data/lib/corba/naming_service.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba/naming.rb'

data/lib/corba/poa.rb

@@ -8,8 +8,7 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 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

@@ -8,11 +8,10 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 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

@@ -8,10 +8,9 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 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

@@ -1,21 +1,18 @@
 #--------------------------------------------------------------------
 # cos_naming.rb - Implementation of CosNaming servants
-#                 for full featured naming service 
+#                 for full featured naming service
 #
 # Author: Martin Corino
 #
-# $Id: $
-#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the R2CORBA LICENSE which is
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 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
 
@@ -29,12 +26,12 @@ module CosNaming
     # 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 
+    # convert stringified name back to NameComponent
     def self.from_string(snc)
       raise CosNaming::NamingContext::InvalidName.new if snc.empty?
       esc_ = false
@@ -46,9 +43,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
@@ -63,7 +60,7 @@ end
 
 module R2CORBA
   module INS
-    
+
     ##
     # Binding iterator servant class
     #
@@ -72,25 +69,25 @@ module R2CORBA
         @rl = reglist
         @id = iterator_id
       end
-    
+
       attr_accessor :oid
-    
+
       def next_one
         reg = @rl.shift
         [!reg.nil?, reg ? CosNaming::Binding.new(reg[:name], reg[:type]) : nil]
       end
-    
+
       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
         end
         [!bindings.empty?, bindings]
       end
-    
+
       def destroy
         poa = self._default_POA
         poa.deactivate_object(self.oid)
@@ -103,11 +100,11 @@ module R2CORBA
     # Naming context servant class
     #
     class NamingContext < POA::CosNaming::NamingContextExt
-      
+
       # 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
@@ -167,18 +164,18 @@ module R2CORBA
           end
         end
       end
-            
+
       @@iterators = MAP_TYPE.new
       @@iterator_max = 100
-      
+
       def self.set_iterator_max(max)
         @@iterator_max = max.to_i
       end
-      
+
       def self.clear_iterator(id)
-        @@iterators.delete(id) 
+        @@iterators.delete(id)
       end
-      
+
       def self.alloc_iterator(reglist)
         @@iterators.synchronize do
           unless @@iterators.size < @@iterator_max
@@ -189,64 +186,64 @@ module R2CORBA
           return (@@iterators[itid] = INS::BindingIterator.new(reglist, itid))
         end
       end
-      
+
       def initialize(orb)
-        @orb = orb        
+        @orb = orb
         @map = MAP_TYPE.new
       end
-    
+
       attr_accessor :oid
-    
+
       # 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
           register_object(n.first, n, CosNaming::Nobject, obj)
         end
       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
           reregister_object(n.first, n, CosNaming::Nobject, obj)
         end
       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
           register_object(n.first, n, CosNaming::Ncontext, nc_new)
         end
       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
           reregister_object(n.first, n, CosNaming::Ncontext, nc_new)
         end
       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
@@ -257,33 +254,33 @@ module R2CORBA
           end
         end
       end
-    
+
       def new_context()
         poa = self._default_POA
         naming_srv = NamingContext.new(@orb)
         naming_srv.oid = poa.activate_object(naming_srv)
         ::CosNaming::NamingContextExt::_narrow(poa.id_to_reference(naming_srv.oid))
       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)
         @orb = nil
       end
-    
+
       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
@@ -297,27 +294,27 @@ module R2CORBA
         end
         [bindings, CosNaming::BindingIterator._narrow(bi_obj)]
       end
-    
+
       # 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
-    
+
       def to_name(sn)
         raise CosNaming::NamingContext::InvalidName.new if sn.to_s.empty?
         snc_arr = []
         off_ = 0
         esc_ = false
         sn.size.times do |i|
-          case sn[i,1]
+          case sn[i, 1]
           when '\\'
-            esc_ = !esc_ 
+            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,10 +324,10 @@ module R2CORBA
         snc_arr << sn[off_, sn.size]
         [snc_arr.collect { |snc| CosNaming::NameComponent.from_string(snc) }]
       end
-    
+
       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
@@ -340,7 +337,7 @@ module R2CORBA
         end
         url
       end
-    
+
       def resolve_str(sn)
         self.resolve(self.to_name(sn).first)
       end
@@ -348,7 +345,7 @@ module R2CORBA
       # Helper methods
       #
       protected
-    
+
       # register the object reference for a certain NameComponent id
       # no reregistering or duplicates allowed
       #
@@ -363,7 +360,7 @@ module R2CORBA
           }
         end
       end
-    
+
       # reregister the object reference for a certain NameComponent id
       #
       def reregister_object(name, full_name, type, obj)
@@ -380,7 +377,7 @@ module R2CORBA
           }
         end
       end
-    
+
       # walk all segments of the given CosNaming::Name to find the object
       # bound by this full name
       # NOTE that #find_context is used when the Name contains > 1 level
@@ -388,7 +385,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
@@ -400,7 +397,7 @@ module R2CORBA
           end
         end
       end
-    
+
       # check if there exists a naming context in the current context
       # with the id from the first segment of the given CosNaming::Name
       # return the object reference to the naming context if found
@@ -419,8 +416,8 @@ module R2CORBA
           @map[key_][:object]
         end
       end
-    
+
     end #of NamingContext servant
-    
+
   end
 end