X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/292c806ab22df351ca8b0cc198498f9b3779e647..fdeed55df38cdfc1d202f425ef6be3e2af2c1f96:/src/packages.lisp?ds=sidebyside

diff --git a/src/packages.lisp b/src/packages.lisp
dissimilarity index 92%
index 1b9f849..483f5ea 100644
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -1,43 +1,109 @@
-(defpackage :meta-model
-  (:use :common-lisp :clsql)
-  (:export
-   :meta-model-class
-   :meta-model.base-type
-   :meta-model.instance
-   :meta-model.metadata
-   :def-meta-model
-   :def-base-class
-   :%def-base-class
-   :def-view-class/table
-   :def-view-class/meta
-   :view-class-metadata
-   :create-table-from-model
-   :list-slots
-   :list-slot-types
-   :slot-type
-   :display-slot
-   :list-joins
-   :list-join-attributes
-   :list-keys
-   :list-view-classes
-   :display-slot
-   :primary-key-p
-   :list-foreign-keys
-   :foreign-key-p
-   :explode-foreign-key
-   :find-join-class
-   :find-join-key
-   :find-default-value
-   :explode-foreign-key
-   :list-has-many
-   :list-many-to-many
-   :sync-instance))
-
-
-(defpackage :mewa 
-  (:use :ucw :common-lisp)
-  (:export :mewa :mewa-object-presentation :mewa-one-line-presentation :find-attribute :set-default-attributes :make-presentation :call-presentation :label :set-attribute :find-class-attributes :default-attributes))
-
-
-(defpackage :lisp-on-lines
-  (:use :mewa :meta-model :common-lisp :it.bese.ucw))
\ No newline at end of file
+(defpackage :lisp-on-lines
+  (: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 
+   ;;;; 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
+   :slot-view
+   :present-slot-view
+   :make-view
+   ;;;; Ajax
+   :auto-complete
+   :call-auto-complete
+
+   ;;;; Mewa Exports
+   :mewa ;the superclass of all mewa-presentations
+   :make-presentation
+   :call-presentation
+
+   ;;attributes
+   :attributes
+   :define-attributes
+   :with-default-attributes
+   :set-default-attributes
+   :set-attribute
+   :find-attribute
+   :perform-set-attributes
+   ;;
+   :perform-set-attribute-properties
+   :define-attributes
+
+   ;; presentation objects
+   :mewa-object-presentation
+   :mewa-one-line-presentation
+   :mewa-list-presentation
+   :mewa-search-presentation
+   :mewa-presentation-search
+
+   :editablep
+   :global-properties
+   ;; SLOT presentations
+  
+   :mewa-relation-slot-presentation
+   :mewa-string-slot-presentation
+   :has-many-slot-presentation 
+   :has-a
+   :has-many
+   :has-very-many
+   :many-to-many
+   
+   ;; CRUD
+   :instance-is-stored-p
+
+   ;;;; Meta Model Exports))
+   :define-meta-model
+   :def-view-class-from-table
+   :def-view-class/meta
+   :list-slot-types
+   ))
\ No newline at end of file