Changeset 89 for ruby/trunk/lib/models/rm

Timestamp:

Jul 26, 2008, 8:05:09 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #48,#52

Location:

ruby/trunk/lib/models/rm/data_types

Files:

• basic.rb (modified) (2 diffs)
• text.rb (modified) (2 diffs)

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

@@ +1 @@
+# This module is implemented from this UML:
+# http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109067591791_562382_3151Report.html
+# Ticket refs #52
 module OpenEHR
   module RM
@@ -35 +38 @@
 
         class DV_State < Data_Value
-          attr_accessor :value
-          attr_writer :terminal
-          def initialize(value, terminal)
-            if value == nil or terminal == nil
-              raise ArgumentError, "argument mandatory"
-            end
-            @value = value
-            @terminal = terminal
+          attr_reader :value
+
+          def initialize(value, is_terminal)
+            self.value=value
+            self.is_terminal=is_terminal
+          end
+          def value=(v)
+            raise ArgumentError, "value should not be nil" if v.nil?
+            @value = v
           end
           def is_terminal?
-            @terminal == true
+            @is_terminal
+          end
+          def is_terminal=(s)
+            raise ArgumentError, "terminal should not be nil" if s.nil?
+            @is_terminal = s
+          end
+          private
+          def value_validity?
+            @value.instance_of? OpenEHR::Data_Types::Text::DV_Coded_Text
           end
         end # end of DV_State

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

@@ +1 @@
+# This module implemented from this UML
+# http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109067605961_209522_3179Report.html
+# Ticket refs #48
 module OpenEHR
   module RM
@@ -44 +47 @@
           attr_reader :terminology_id, :code_string
           def initialize(terminology_id, code_string)
-            if terminlogyID == nil
+            if terminlogyID.nil?
               raise Exception.new("nil terminology")
             end
-            if code_string == nil
+            if code_string.nil?
               raise Exception.new("empty codeString")
             end