entry.rb in openehr-1.2.8

- old
+ new

@@ -1,20 +1,20 @@
 # rm::composition::content::entry
 # entry module
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109264528523_312165_346Report.html
 # refs #56
-include OpenEHR::RM::Composition::Content
 require 'locale/info'
 
 module OpenEHR
   module RM
     module Composition
       module Content
         module Entry
-          class Entry < ContentItem
+          class Entry < ::OpenEHR::RM::Composition::Content::ContentItem
             attr_reader :language, :encoding, :subject
             attr_accessor :provider, :other_participations, :workflow_id
+
             def initialize(args = { })
               super(args)
               self.language = args[:language]
               self.encoding = args[:encoding]
               self.subject = args[:subject]
@@ -127,11 +127,11 @@
               end
               @activities = activities
             end
           end
 
-          class Activity < Locatable
+          class Activity < OpenEHR::RM::Common::Archetyped::Locatable
             attr_reader :description, :timing, :action_archetype_id
 
             def initialize(args = { })
               super(args)
               self.description = args[:description]
@@ -193,11 +193,11 @@
               end
               @ism_transition = ism_transition
             end
           end
 
-          class InstructionDetails < Pathable
+          class InstructionDetails < OpenEHR::RM::Common::Archetyped::Pathable
             attr_reader :instruction_id, :activity_id
             attr_accessor :wf_details
 
             def initialize(args = { })
               super(args)
@@ -219,10 +219,10 @@
               end
               @activity_id = activity_id
             end
           end
 
-          class IsmTransition < Pathable
+          class IsmTransition < OpenEHR::RM::Common::Archetyped::Pathable
             attr_reader :current_state, :transition
             attr_accessor :careflow_step
 
             def initialize(args = { })
               super(args)