r3564: *** empty log message ***

[umlisp.git] / classes.lisp

diff --git a/classes.lisp b/classes.lisp
index 94a3ffed17432fef6928091dc4e9fc70521bfaaf..7f88827e22e2f2d999ded65423eb53efa07c3bc1 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: classes.lisp,v 1.18 2002/11/29 23:14:38 kevin Exp $
+;;;; $Id: classes.lisp,v 1.21 2002/12/05 19:12:05 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -129,7 +129,8 @@
 (defclass ustr (umlsclass)
   ((sui :type fixnum :initarg :sui :reader sui :print-formatter fmt-sui
        :hyperlink find-ustr-sui)
-   (cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui)
+   (cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
+       :hyperlink find-ucon-cui)
    (lui :type fixnum :initarg :lui :reader lui :print-formatter fmt-lui
        :hyperlink find-uterm-lui)
    (cuisui :type integer :initarg :cuisui :reader cuisui )
@@ -158,8 +159,10 @@
   (:print-slots isn fr un sna soui sui))
 
 (defclass uterm (umlsclass)
-  ((lui :type fixnum :initarg :lui :reader lui :hyperlink find-uterm-lui)
-   (cui :type fixnum :initarg :cui :reader cui)
+  ((lui :type fixnum :initarg :lui :reader lui :print-formatter fmt-lui
+       :hyperlink find-uterm-lui)
+   (cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
+       :hyperlink find-ucon-cui)
    (lat :type string :initarg :lat :reader lat)
    (ts :type string  :initarg :ts :reader ts)
    (lrl :type fixnum :initarg :lrl :reader lrl)
@@ -459,9 +462,6 @@
 
 ;;; Formatting routines
 
-(defun fmt-comma-integer (i)
-  (format nil "~:d" i))
-
 (defgeneric fmt-cui (c))
 (defmethod fmt-cui ((c ucon))
   (format nil "C~7,'0d" (cui c)))
@@ -532,10 +532,7 @@
     (values nil nil))))
 
 
-(defgeneric print-umlsclass (obj &key os format label file-wrapper english-only subobjects refvars)
-  )
-
-(defmethod print-umlsclass ((obj umlsclass) &key (os *standard-output*) (format :text)
+(defun print-umlsclass (obj &key (os *standard-output*) (format :text)
                              (label nil) (file-wrapper t) (english-only nil) (subobjects nil)
                              (refvars nil))
   (view obj :os os :format format :label label :subobjects subobjects