Major patch touching a lot, representing the new lol. is mostly drop-in backwards...

[clinton/lisp-on-lines.git] / src / packages.lisp

diff --git a/src/packages.lisp b/src/packages.lisp
index 1db3466..66cb2ed 100644 (file)
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -1,11 +1,58 @@
 (defpackage :lisp-on-lines
-  (:use :mewa :meta-model :common-lisp :it.bese.ucw :js :clsql)
-  (:nicknames :lol)
+  (:use :arnesi
+       :iterate
+       :meta-model
+       :common-lisp
+       :it.bese.ucw
+       :clsql
+       :contextl)
+  (:nicknames :lol :mewa)
+  
+  (:shadowing-import-from
+   :iterate
+   :with)
+
+  (: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
@@ -21,8 +68,11 @@
    :make-presentation
    :call-presentation
 
+   :find-occurence
+
    ;;attributes
    :attributes
+   :attribute-value
    :define-attributes
    :with-default-attributes
    :set-default-attributes
@@ -34,18 +84,24 @@
    :define-attributes
 
    ;; presentation objects
-   :present
-   :instance
    :mewa-object-presentation
    :mewa-one-line-presentation
    :mewa-list-presentation
+   :mewa-search-presentation
+   :mewa-presentation-search
 
+   :editablep
+   :global-properties
    ;; SLOT presentations
-   :defslot-presentation
-   :slot-name
+  
    :mewa-relation-slot-presentation
-   :has-many-slot-presentation
-   :present-slot
+   :mewa-string-slot-presentation
+   :has-many-slot-presentation 
+   :has-a
+   :has-many
+   :has-very-many
+   :many-to-many
+   
    ;; CRUD
    :instance-is-stored-p