lib/openehr/rm/ehr.rb in openehr-1.2.8 vs lib/openehr/rm/ehr.rb in openehr-1.2.9

@@ -1,12 +1,10 @@
 # rm::ehr
 # ehr module
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109004889781_854011_47Report.html
 # refs #44
-include OpenEHR::RM::Common::ChangeControl
-include OpenEHR::RM::Common::Archetyped
-include OpenEHR::RM::Security
+require_relative 'common/change_control'
 
 module OpenEHR
   module RM
     module EHR
       class EHR
@@ -91,15 +89,15 @@
           end
           @directory = directory
         end
       end
 
-      class VersionedEHRAccess < VersionedObject
+      class VersionedEHRAccess < OpenEHR::RM::Common::ChangeControl::VersionedObject
 
       end
 
-      class EHRAccess < Locatable
+      class EHRAccess < OpenEHR::RM::Common::Archetyped::Locatable
         attr_accessor :settings
         attr_reader :scheme
 
         def initialize(args = { })
           super(args)
@@ -113,15 +111,15 @@
           end
           @scheme = scheme
         end
       end
 
-      class VersionedEHRStatus < VersionedObject
+      class VersionedEHRStatus < OpenEHR::RM::Common::ChangeControl::VersionedObject
 
       end
 
-      class EHRStatus < Locatable
+      class EHRStatus < OpenEHR::RM::Common::Archetyped::Locatable
         attr_reader :subject
         attr_accessor :is_modifiable, :is_queryable, :other_details
 
         def initialize(args = { })
           super(args)
@@ -150,10 +148,10 @@
           end
           @parent = parent
         end
       end
 
-      class VersionedComposition < VersionedObject
+      class VersionedComposition < OpenEHR::RM::Common::ChangeControl::VersionedObject
         def is_persistent?
           return @all_versions.first.data.is_persistent?
         end
       end
     end # of EHR