Changes in ruby/trunk/models/am/archetype/ontology.rb [23:4]

File:

• ruby/trunk/models/am/archetype/ontology.rb (modified) (1 diff)

ruby/trunk/models/am/archetype/ontology.rb

@@ -3 +3 @@
     module Archetype
       module Ontology
-        class ARCHETYPE_ONTOLOGY
+        class Archetype_Ontology
           attr_accessor :constraint_codes, :specialisation_depth
           attr_accessor :term_attribute_names, :term_codes
           attr_accessor :terminologies_available
-
           def constraint_binding(a_terminology, a_code)
           end
-
           def constraint_definition(a_lang, a_code)
           end
-
           def has_language?(a_lang)
           end
-
           def has_terminology?(a_terminology)
           end
-
           def term_binding(a_terminology, a_code)
           end
-
           def term_definition(a_lang, a_code)
           end
         end
-
-        class ARCHETYPE_TERM
+        class Archetype_Term
           attr_accessor :code, :items
-
-          def initialize(args = { })
-                         
-            @code = if args[:code]
-                      args[:code]
-                    else
-                      raise ArgumentError, "Code is empty"
-                    end
-            @items = if args[:items]
-                       args[:items]
-                     else
-                       raise ArgumentError, "Items is empty"
-                     end
+          def initialize(code, items)
+            if code == nil
+              raise ArgumentError, "Code is empty"
+            end
+            if items.keys == nil
+              raise ArgumentError, "Items is empty"
+            end
+            @code = code
+            @items = items
           end
-
           def keys
-            @items.keys
+            items.keys
           end
         end