r9536:

[umlisp.git] / classes.lisp

diff --git a/classes.lisp b/classes.lisp
index e62c1ee190c2760c7a647aaf4f2b6bb189b65064..8cb5e5d65f637900d8b2489a57d7482e3928e688 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)
@@ -103,7 +102,7 @@
    (xc :value-type string  :initarg :xc :reader xc))
   (:metaclass hyperobject-class)
   (:user-name "Context")
-  (:default-print-slots sab code rnk cxn cxl hcd rela xc cui2 cxs))
+  (:default-print-slots sab code cxn cxl hcd rela xc cui2 cxs))
 
 (defclass ustr (umlsclass)
   ((sui :value-type fixnum :initarg :sui :reader sui :print-formatter fmt-sui
@@ -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)
@@ -127,7 +126,7 @@
   ((aui :value-type fixnum :initarg :aui :reader aui :print-formatter fmt-aui)
    (cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
        :hyperlink find-ucon-cui)
-   (sui :value-type fixnum :initarg :cui :reader sui :print-formatter fmt-sui
+   (sui :value-type fixnum :initarg :sui :reader sui :print-formatter fmt-sui
        :hyperlink find-ucon-sui)
    (saui :value-type string :initarg :saui :reader saui)
    (sdui :value-type string :initarg :sdui :reader sdui)
@@ -138,7 +137,7 @@
    (srl :value-type fixnum :initarg :srl :reader srl))
   (:metaclass hyperobject-class)
   (:user-name "Source")
-  (:default-print-slots aui sab code saui adui scui tty srl))
+  (:default-print-slots aui sab code saui sdui scui tty srl))
 
 (defclass ulo (umlsclass)
   ((isn :value-type string :initarg :isn :reader isn)
@@ -182,18 +181,16 @@
    (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))
+  (:default-print-slots rel rela sab sl cui2 pfstr2))
        
 (defclass ucoc (umlsclass)
   ((cui1 :value-type fixnum :initarg :cui1 :reader cui1 :print-formatter fmt-cui)
    (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))