r9534:

[umlisp.git] / classes.lisp

diff --git a/classes.lisp b/classes.lisp
index b00eb53a3ae332effde734455d9834f708b02534..d51fc4ba16dab8137483504d32c65776436b6791 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -92,7 +92,6 @@
 (defclass ucxt (umlsclass)
   ((sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
    (code :value-type string :initarg :code :reader code)
-   (rnk :value-type fixnum :initarg :rnk :reader rnk)
    (cxn :value-type fixnum :initarg :cxn :reader cxn)
    (cxl :value-type string :initarg :cxl :reader cxl)
    (cxs :value-type cdata :initarg :cxs :reader cxs)
@@ -116,7 +115,7 @@
    (str :value-type cdata :initarg :str :reader str)
    (lrl :value-type fixnum :initarg :lrl :reader lrl)
    (stt :value-type string :initarg :stt :reader stt)
-   (s#so :reader s#atom :subobject (find-uso-cuisui cui sui))
+   (s#so :reader s#so :subobject (find-uso-cuisui cui sui))
    (s#sat :reader s#sat :subobject (find-usat-ui cui lui sui))
    (s#cxt :reader s#cxt :subobject (find-ucxt-cuisui cui sui)))
   (:metaclass hyperobject-class)
@@ -182,8 +181,7 @@
    (pfstr2 :value-type cdata :initarg :pfstr2 :reader pfstr2)
    (rela :value-type string :initarg :rela :reader rela)
    (sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
-   (sl :value-type string  :initarg :sl :reader sl)
-   (mg :value-type string  :initarg :mg :reader mg))
+   (sl :value-type string  :initarg :sl :reader sl))
   (:metaclass hyperobject-class)
   (:user-name "Relationship")
   (:default-print-slots rel rela sab sl mg cui2 pfstr2))
@@ -193,7 +191,6 @@
    (cui2 :value-type fixnum :initarg :cui2 :reader cui2 :print-formatter fmt-cui
         :hyperlink find-ucon-cui)
    (pfstr2 :value-type cdata :initarg :pfstr2 :reader pfstr2)
-   (soc :value-type string :initarg :soc :reader soc)
    (cot :value-type string :initarg :cot :reader cot)
    (cof :value-type fixnum :initarg :cof :reader cof)
    (coa :value-type cdata :initarg :coa :reader coa))