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

data/lib/corba/jbase/Typecode.rb

@@ -9,12 +9,11 @@
 #
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
-require 'corba/jbase/Any.rb'
+require 'corba/jbase/Any'
 require 'bigdecimal'
 
 module R2CORBA
   module CORBA
-
     # define typecode kind constants
     ['tk_null',
       'tk_void',
@@ -53,7 +52,6 @@ module R2CORBA
     end
 
     class TypeCode
-
       def TypeCode.native_kind(ntc)
         ntc.kind.value
       end
@@ -75,7 +73,6 @@ module R2CORBA
       end
 
       class Recursive < CORBA::TypeCode
-
         def initialize(id)
           begin
             @tc_ = CORBA::ORB._orb.create_recursive_tc(id)
@@ -83,11 +80,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
@@ -99,11 +94,9 @@ module R2CORBA
             end
           end
         end
-
       end # String
 
       class WString < CORBA::TypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -115,11 +108,9 @@ module R2CORBA
             end
           end
         end
-
       end # WString
 
       class Fixed < CORBA::TypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -132,17 +123,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::ORB._orb.create_sequence_tc(bound.to_i, element_tc.tc_)
             rescue ::NativeException
@@ -150,11 +140,9 @@ module R2CORBA
             end
           end
         end
-
       end
 
       class Array < CORBA::TypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -162,6 +150,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)
@@ -175,19 +164,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
@@ -196,6 +181,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::ORB._orb.create_alias_tc(id.to_s, name.to_s, orig_tc.tc_)
             rescue ::NativeException
@@ -205,11 +191,9 @@ module R2CORBA
             super(id)
           end
         end
-
       end # Alias
 
       class Valuetype < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -223,6 +207,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_ = []
@@ -258,11 +243,9 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
-
       end # Valuetype
 
       class Eventtype < Valuetype
-
         protected
 
         def _create_tc(id, name, modifier, base, jmembers)
@@ -279,11 +262,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
@@ -292,6 +273,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::ORB._orb.create_value_box_tc(id.to_s, name.to_s, boxed_tc.tc_)
             rescue ::NativeException
@@ -301,11 +283,9 @@ module R2CORBA
             super(id)
           end
         end
-
       end # Valuebox
 
       class ObjectRef < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -322,11 +302,9 @@ module R2CORBA
             super(id)
           end
         end
-
       end # ObjectRef
 
       class AbstractInterface < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -343,11 +321,9 @@ module R2CORBA
             super(id)
           end
         end
-
       end # AbstractInterface
 
       class Struct < IdentifiedTypeCode
-
         def initialize(*args)
           if CORBA::Native::TypeCode === args.first
             @tc_ = args.first
@@ -360,6 +336,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_ = []
@@ -368,7 +345,7 @@ module R2CORBA
             @members = []
             members_.each { |n, tc| add_member(n, tc) }
             jmembers = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::StructMember.java_class, @members.size)
-            @members.each_with_index {|(mn, mtc), i| jmembers[i] = CORBA::Native::StructMember.new(mn.to_s, mtc.tc_, nil) }
+            @members.each_with_index { |(mn, mtc), i| jmembers[i] = CORBA::Native::StructMember.new(mn.to_s, mtc.tc_, nil) }
             @tc_ = _create_tc(id, name, jmembers)
             super(id)
           end
@@ -383,21 +360,21 @@ module R2CORBA
             CORBA::Exception.native2r($!)
           end
         end
-
       end # Struct
 
       class Except < Struct
-
         def from_java(jex)
           raise CORBA::BAD_PARAM.new('org.om.CORBA.UserException expected', 0, CORBA::COMPLETED_NO) unless jex.is_a?(CORBA::Native::UserException)
+
           ex = get_type.new
-          members.each {|mname, mtc| ex.__send__("#{mname}=".to_sym, jex.__send__(mname.to_sym)) }
+          members.each { |mname, mtc| ex.__send__("#{mname}=".to_sym, jex.__send__(mname.to_sym)) }
           ex
         end
 
         def is_compatible?(jex)
           raise CORBA::BAD_PARAM.new('org.om.CORBA.UserException expected', 0, CORBA::COMPLETED_NO) unless jex.is_a?(CORBA::Native::UserException)
-          members.all? {|mname, mtc| jex.respond_to?(mname.to_sym) }
+
+          members.all? { |mname, mtc| jex.respond_to?(mname.to_sym) }
         end
 
         protected
@@ -409,11 +386,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
@@ -436,6 +411,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
@@ -454,7 +430,7 @@ module R2CORBA
         def tc_
           @tc_ ||= begin
             jmembers = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::UnionMember.java_class, @members.size)
-            @members.each_with_index {|(ml, mn, mt), i|
+            @members.each_with_index { |(ml, mn, mt), i|
               if ml == :default
                 # label octet:0 means default label
                 jmembers[i] = CORBA::Native::UnionMember.new(mn, Any.to_any(0, CORBA._tc_octet).to_java, mt.tc_, nil)
@@ -475,21 +451,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::ORB._orb.create_enum_tc(id.to_s, name.to_s, @members.to_java(:string))
@@ -499,7 +474,6 @@ module R2CORBA
             super(id)
           end
         end
-
       end # Enum
 
       def TypeCode.get_primitive_tc(kind)
@@ -512,9 +486,7 @@ module R2CORBA
       end
 
       # final initialization
-      self._init()
-
+      self._init
     end # TypeCode
-
   end ## module CORBA
 end ## module R2CORBA

data/lib/corba/jbase/Values.rb

@@ -168,7 +168,6 @@ module R2CORBA
           end
         end
       end
-
     end # Portable
   end # CORBA
 end # R2CORBA

data/lib/corba/jbase/exception.rb

@@ -41,7 +41,7 @@ module R2CORBA
           java_ex = jex.is_a?(Native::UserException) ? jex : jex.cause
           exname = java_ex.class.name.split('::').last
           tcs = CORBA::TypeCode.typecodes_for_name(exname) || []
-          extc = tcs.detect {|tc| tc.is_a?(TypeCode::Except) && tc.is_compatible?(java_ex)}
+          extc = tcs.detect { |tc| tc.is_a?(TypeCode::Except) && tc.is_compatible?(java_ex) }
           if extc
             ex = extc.from_java(java_ex)
             ex.set_backtrace(jex.backtrace) if NativeException === jex
@@ -63,6 +63,7 @@ module R2CORBA
     class SystemException
       def self._raise(jex)
         raise ArgumentError unless (NativeException === jex and jex.cause.is_a?(Native::SystemException)) or jex.is_a?(Native::SystemException)
+
         java_ex = jex.is_a?(Native::SystemException) ? jex : jex.cause
         exname = java_ex.class.name.split('::').last
         exklass = CORBA.const_get(exname.to_sym)

data/lib/corba/jbase/poa.rb

@@ -18,10 +18,10 @@ module R2CORBA
   end
 end
 
-require 'corba/common/Servant.rb'
-require 'corba/idl/POAC.rb'
-require 'corba/jbase/Servant.rb'
-require 'corba/jbase/ServerRequest.rb'
+require 'corba/common/Servant'
+require 'corba/idl/POAC'
+require 'corba/jbase/Servant'
+require 'corba/jbase/ServerRequest'
 
 module R2CORBA
   module PortableServer
@@ -42,33 +42,33 @@ module R2CORBA
         end
       end # of operation destroy
 
-      def the_name()
+      def the_name
         begin
-          self.objref_.the_name()
+          self.objref_.the_name
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end # of attribute get_the_name
 
-      def the_POAManager()
+      def the_POAManager
         begin
-          PortableServer::POAManager._narrow(CORBA::Object._wrap_native(self.objref_.the_POAManager()))
+          PortableServer::POAManager._narrow(CORBA::Object._wrap_native(self.objref_.the_POAManager))
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end # of attribute get_the_POAManager
 
-      def the_parent()
+      def the_parent
         begin
-          PortableServer::POA._narrow(CORBA::Object._wrap_native(self.objref_.the_parent()))
+          PortableServer::POA._narrow(CORBA::Object._wrap_native(self.objref_.the_parent))
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end # of attribute get_the_parent
 
-      def the_children()
+      def the_children
         begin
-          self.objref_.the_children().collect {|c| PortableServer::POA._narrow(CORBA::Object._wrap_native(c)) }
+          self.objref_.the_children.collect { |c| PortableServer::POA._narrow(CORBA::Object._wrap_native(c)) }
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -164,9 +164,10 @@ module R2CORBA
 
       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
@@ -184,9 +185,9 @@ module R2CORBA
     end # POA
 
     module POAManager
-      def activate()
+      def activate
         begin
-          self.objref_.activate()
+          self.objref_.activate
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -216,9 +217,9 @@ module R2CORBA
         end
       end # deactivate
 
-      def get_state()
+      def get_state
         begin
-          self.objref_.get_state().value()
+          self.objref_.get_state.value
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end

data/lib/corba/jbase/policies.rb

@@ -11,12 +11,11 @@
 #--------------------------------------------------------------------
 
 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
           Policy._wrap_native(self.orb_.create_policy(type.to_i, val.to_java(self.orb_)))
         rescue ::NativeException
@@ -27,7 +26,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 = Policy._wrap_native(self.objref_._get_policy(policy_type))
         rescue ::NativeException
@@ -37,7 +37,8 @@ module R2CORBA
       end
 
       def _get_policy_overrides(ts)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         ## currently JacORB does not support #_get_policy_overrides so we emulate it in that case
         unless self.objref_.respond_to?(:_get_policy_overrides)
           begin
@@ -51,14 +52,15 @@ module R2CORBA
           rescue ::NativeException
             CORBA::Exception.native2r($!)
           end
-          jpolicies.collect {|jpol| Policy._wrap_native(jpol) }
+          jpolicies.collect { |jpol| Policy._wrap_native(jpol) }
         end
       end # of operation get_policy_overrides
 
       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?
+
         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
@@ -80,30 +82,31 @@ module R2CORBA
     module Policy
       def self._wrap_native(jpol)
         raise ArgumentError, 'Expected org.omg.CORBA.Policy' unless jpol.nil? || jpol.is_a?(Native::Policy)
+
         Policy._narrow(CORBA::Object._wrap_native(jpol))
       end
 
       #-------------------  "Policy Operations"
 
-      def policy_type()
+      def policy_type
         begin
-          self.objref_.policy_type()
+          self.objref_.policy_type
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end # of attribute get_policy_type
 
-      def copy()
+      def copy
         begin
-          Policy._wrap_native(self.objref_.copy())
+          Policy._wrap_native(self.objref_.copy)
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end # of operation copy
 
-      def destroy()
+      def destroy
         begin
-          self.objref_.destroy()
+          self.objref_.destroy
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -120,12 +123,12 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-        jpolicies.collect {|jpol| Policy._wrap_native(jpol) }
+        jpolicies.collect { |jpol| Policy._wrap_native(jpol) }
       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
@@ -133,11 +136,9 @@ module R2CORBA
         end
       end # of operation set_policy_overrides
     end # Policy
-
   end # CORBA
 
   module PortableServer
-
     module POA
       def create_thread_policy(value)
         begin
@@ -210,90 +211,86 @@ module R2CORBA
       end # of operation create_request_processing_policy
     end # POA
 
-    module ThreadPolicy  ## interface
-      def value()
+    module ThreadPolicy ## interface
+      def value
         begin
-          self.objref_.value().value()
+          self.objref_.value.value
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end # of attribute get_value
     end # of interface ThreadPolicy
 
-    module LifespanPolicy  ## interface
-      def value()
+    module LifespanPolicy ## interface
+      def value
         begin
-          self.objref_.value().value()
+          self.objref_.value.value
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end # of attribute get_value
     end # of interface LifespanPolicy
 
-    module IdUniquenessPolicy  ## interface
-      def value()
+    module IdUniquenessPolicy ## interface
+      def value
         begin
-          self.objref_.value().value()
+          self.objref_.value.value
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end # of attribute get_value
     end # of interface IdUniquenessPolicy
 
-    module IdAssignmentPolicy  ## interface
-      def value()
+    module IdAssignmentPolicy ## interface
+      def value
         begin
-          self.objref_.value().value()
+          self.objref_.value.value
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end # of attribute get_value
     end # of interface IdAssignmentPolicy
 
-    module ImplicitActivationPolicy  ## interface
-      def value()
+    module ImplicitActivationPolicy ## interface
+      def value
         begin
-          self.objref_.value().value()
+          self.objref_.value.value
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end # of attribute get_value
     end # of interface ImplicitActivationPolicy
 
-    module ServantRetentionPolicy  ## interface
-      def value()
+    module ServantRetentionPolicy ## interface
+      def value
         begin
-          self.objref_.value().value()
+          self.objref_.value.value
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end # of attribute get_value
     end # of interface RequestProcessingPolicy
 
-    module RequestProcessingPolicy  ## interface
-      def value()
+    module RequestProcessingPolicy ## interface
+      def value
         begin
-          self.objref_.value().value()
+          self.objref_.value.value
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end # of attribute get_value
     end # of interface RequestProcessingPolicy
-
   end # PortableServer
 
   module BiDirPolicy
-
-    module BidirectionalPolicy  ## interface
-      def value()
+    module BidirectionalPolicy ## interface
+      def value
         begin
-          self.objref_.value().value()
+          self.objref_.value.value
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end # of attribute get_value
     end # of interface BidirectionalPolicy
-
   end # BiDirPolicy
-
 end # R2CORBA

data/lib/corba/jbase/require.rb

@@ -15,11 +15,11 @@ require 'java'
 module R2CORBA
   if ENV['JACORB_HOME'] &&
       (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/})
+       Dir[File.join(ENV['JACORB_HOME'], 'lib', 'jacorb-*.jar')].any? { |p| p =~ /\/jacorb\-\d\.\d\.jar\Z/ })
     JACORB_HOME = ENV['JACORB_HOME']
   else
     # find jacorb.jar in library search path
-    JACORB_HOME = File.dirname(($:.find { |path| Dir[File.join(path, 'jacorb-*.jar')].any? {|p| p =~ /\/jacorb(\.jar|\-\d\.\d\.jar)\Z/} }).to_s)
+    JACORB_HOME = File.dirname(($:.find { |path| Dir[File.join(path, 'jacorb-*.jar')].any? { |p| p =~ /\/jacorb(\.jar|\-\d\.\d\.jar)\Z/ } }).to_s)
   end
 
   $LOAD_PATH << File.join(JACORB_HOME, 'lib')
@@ -80,7 +80,7 @@ module R2CORBA
   end
 end
 
-[ 'exception',
+['exception',
   'Object',
   'ORB',
   'Request',