X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=classes.lisp;h=e62c1ee190c2760c7a647aaf4f2b6bb189b65064;hb=62ce365967f05ec6a2945a20cd5c45efb7b809e5;hp=7c3b9a86f19bad14e7596d649aa8ae5a6b9362b6;hpb=aeade16272b79115d3f307906c7a3e9597137e97;p=umlisp.git

diff --git a/classes.lisp b/classes.lisp
index 7c3b9a8..e62c1ee 100644
--- a/classes.lisp
+++ b/classes.lisp
@@ -89,15 +89,6 @@
 		rmeta slc scc srl tfr cfr cxty ttyl atnl lat cenc
 		curver sabin))
 
-(defclass uso (umlsclass)
-  ((sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
-   (code :value-type string :initarg :code :reader code)
-   (tty :value-type string :initarg :tty :reader tty :hyperlink find-btty-tty)
-   (srl :value-type fixnum :initarg :srl :reader srl))
-  (:metaclass hyperobject-class)
-  (:user-name "Source")
-  (:default-print-slots sab code tty srl))
-
 (defclass ucxt (umlsclass)
   ((sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
    (code :value-type string :initarg :code :reader code)
@@ -125,13 +116,30 @@
    (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#so :subobject (find-uso-cuisui cui sui))
+   (s#so :reader s#atom :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)
   (:user-name "String")
   (:default-print-slots sui stt lrl str))
 
+(defclass uso (umlsclass)
+  ((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
+	:hyperlink find-ucon-sui)
+   (saui :value-type string :initarg :saui :reader saui)
+   (sdui :value-type string :initarg :sdui :reader sdui)
+   (scui :value-type string :initarg :scui :reader scui)
+   (tty :value-type string :initarg :tty :reader tty :hyperlink find-btty-tty)
+   (sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
+   (code :value-type string :initarg :code :reader code)
+   (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))
+
 (defclass ulo (umlsclass)
   ((isn :value-type string :initarg :isn :reader isn)
    (fr :value-type fixnum :initarg :fr :reader fr)
@@ -194,14 +202,6 @@
   (:default-print-slots soc cot cof coa cui2 pfstr2))
 
 	
-(defclass uatx (umlsclass)
-  ((sab :value-type string :initarg :sab :reader sab)
-   (rel :value-type string :initarg :rel :reader rel)
-   (atx :value-type cdata :initarg :atx :reader atx))
-  (:metaclass hyperobject-class)
-  (:user-name "Associated Expression")
-  (:default-print-slots sab rel atx))
-
 (defclass ucon (umlsclass)
   ((cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
 	:hyperlink find-ucon-cui)
@@ -209,7 +209,6 @@
    (pfstr :value-type cdata :initarg :pfstr :reader pfstr)
    (s#def :reader s#def :subobject (find-udef-cui cui))
    (s#sty :reader s#sty :subobject (find-usty-cui cui))
-   (s#atx :reader s#atx :subobject (find-uatx-cui cui))
    (s#lo :reader s#lo :subobject (find-ulo-cui cui))
    (s#term :reader s#term :subobject (find-uterm-cui cui))
    (s#sat :reader s#sat :subobject (find-usat-ui cui))