Changeset 106 for ruby/trunk/lib/models/rm/data_types/basic.rb

Timestamp:

Sep 27, 2008, 1:12:51 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #48, #52, #39

File:

• ruby/trunk/lib/models/rm/data_types/basic.rb (modified) (4 diffs)

ruby/trunk/lib/models/rm/data_types/basic.rb

@@ -15 +15 @@
         class DV_Boolean < Data_Value
           def initialize(value)
-            check_not_nil(value)
+            self.value = value
+          end
+          def value=(value)
+            raise ArgumentError, "value must not be nil" if value.nil?
             if value == "TRUE" or value == true
               @value = true
@@ -22 +25 @@
             end
           end
-          def value=(value)
-            check_not_nil(value)
-            @value = value
-          end
           def value?
             @value == true
-          end
-          private
-          def check_not_nil(value)
-            if value == nil
-              raise ArgumentError, "value must not be empty"
-            end
           end
         end  # end of DV_Boolean
@@ -55 +48 @@
             @is_terminal = s
           end
-          private
-          def value_validity?
-            @value.instance_of? OpenEHR::Data_Types::Text::DV_Coded_Text
-          end
         end # end of DV_State
 
@@ -64 +53 @@
           attr_accessor :issuer, :assigner, :id, :type
           def initialize(assigner, id, issuer, type)
-            if assigner == nil or id == nil or issuer == nil or type == nil
+            if assigner.nil? or assigner.empty?\
+              or id.nil? or id.empty? or issuer.nil? or issuer.empty?\
+              or type.nil? or type.empty?
               raise ArgumentError, "invalid argument"
             end