X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/598f1fa8d4a53d8b531ee283b69bba52f3a4bd13..599c2ea6caf671406348215e3242dc7feef13a50:/src/packages.lisp

diff --git a/src/packages.lisp b/src/packages.lisp
index ebff621..483f5ea 100644
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -4,16 +4,54 @@
 	:meta-model
 	:common-lisp
 	:it.bese.ucw
-	:clsql)
+	:clsql
+	:contextl)
+  (:nicknames :lol :mewa)
+  
   (:shadowing-import-from
    :iterate
    :with)
-  (:nicknames :lol :mewa)
+
+  (:shadowing-import-from
+   :clsql
+   :time-difference
+   :make-time
+   :time-ymd
+   :date
+   :get-time
+   :time-element
+   :time+
+   :date-element)
+
+  (:shadow
+   :present
+   :present-slot
+   :presentation
+   :instance
+   :slot-presentation
+   :integer-slot-presentation
+   :string-slot-presentation
+   :object-presentation
+   :one-line-presentation
+   :presentation-slot-value
+   :get-foreign-instances)
+  
   (:export 
-   ;;;; LoL 
+   ;;;; CLSQL meta-model/default attributes definers
+   ;;;; TODO: should be moved to meta-model,
+   ;;;; with lol specific function implemented like the
+   ;;;; CLOS meta-model
    :define-view-for-table
    :define-views-for-database
 
+
+   ;;;; The LoL 3 displays
+   :defdisplay
+   :defattribute
+   :display
+   :display-using-description
+   :call-display
+
    ;;;;a wrapper for calling make-presentation
    :call-view
    :present-view
@@ -42,8 +80,6 @@
    :define-attributes
 
    ;; presentation objects
-   :present
-   :instance
    :mewa-object-presentation
    :mewa-one-line-presentation
    :mewa-list-presentation
@@ -53,13 +89,10 @@
    :editablep
    :global-properties
    ;; SLOT presentations
-   :defslot-presentation
-   :slot-name
+  
    :mewa-relation-slot-presentation
    :mewa-string-slot-presentation
-   :has-many-slot-presentation
-   :present-slot
-
+   :has-many-slot-presentation 
    :has-a
    :has-many
    :has-very-many