Changes in ruby/trunk/models/rm/support/identification.rb [26:4]

File:

• ruby/trunk/models/rm/support/identification.rb (modified) (2 diffs)

ruby/trunk/models/rm/support/identification.rb

@@ -2 +2 @@
   module RM
     module Support
-      module Identification
-
-        class OBJECT_ID
+      module Definition
+        class Object_ID
           attr_accessor :value
-
           def initiallize(value)
-            raise "empty value" unless value
+            if value == nil
+              raise Exception.new("empty value")
+            end
             @value = value
           end
         end # of ObjectID
-
-        class ARCHETYPE_ID < OBJECT_ID
-        end
-
-        class TERMINOLOGY_ID < OBJECT_ID
+        class Terminology_ID < Object_ID
           attr_reader :name
-
-          def initialize(name , version_id)
-            @name , @version_id = name , version_id
-#             if arg1 == nil
-#               super(arg0)
-#             else
-#               super(toValue(arg0, arg1))
-#               @name = arg0
-#               @version = arg1      
-#             end
+          def initialize(arg0, arg1=nil)
+            if arg1 == nil
+              super(arg0)
+            else
+              super(toValue(arg0, arg1))
+              @name = arg0
+              @version = arg1      
+            end
           end
-
           def setValue(value)
             loadValue(value)
             super.value = value
           end
-
           def version_id
             @version
           end
-
           private
-
           def loadValue(value)
             if /\(.*\)$/ =~ value
-#              @name, @version = value.split(\())
+              @name, @version = value.split(\())
               @version.chop!
             else
@@ -50 +40 @@
             end
           end
-
           def toValue(name, version)
             if name == ""