X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/569ad9e659b96d5bce12410bbc0a24710306cd3e..cbf858b77436d8f8162b3bcf3cd46b0a52101b81:/src/packages.lisp

diff --git a/src/packages.lisp b/src/packages.lisp
dissimilarity index 98%
index 596af25..c67c325 100644
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -1,107 +1,79 @@
-(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
-   :explode-has-many
-   :expr-ends-with
-   :expr-starts-with
-   :expr-contains
-   :expr-=
-   :expr-<
-   :expr->
-   :expr-and
-   :expr-or
-   :expr-not
-   :select-instances))
-
-
-(defpackage :mewa 
-  (:use :ucw :common-lisp)
-  (:export 
-   :mewa 
-   :mewa-object-presentation 
-   :mewa-one-line-presentation
-   :mewa-list-presentation
-   :mewa-presentation-search
-   :find-attribute 
-   :set-default-attributes 
-   :make-presentation 
-   :call-presentation 
-   :label
-   :attributes
-   :set-attribute
-   :perform-set-attributes
-   :perform-set-attribute-properties
-   :find-class-attributes 
-   :default-attributes 
-   :ok
-   :edit-instance
-   :save-instance
-   :cancel-save-instance
-   :ensure-instance-sync
-   :instance-is-stored-p
-   :global-properties
-   :search-expr
-   :search-query))
-
-(defpackage :lisp-on-lines
-  (:use :mewa :meta-model :common-lisp :it.bese.ucw)
-  (:nicknames :lol)
-  (:export 
-   ;;;; Mewa Exports
-   :mewa ;the superclass of all mewa-presentations
-   :make-presentation
-
-   ;;attributes
-   :attributes
-   :set-default-attributes
-   :set-attribute
-   :find-attribute
-   :perform-set-attributes
-   ;;
-   :perform-set-attribute-properties
-
-   ;; presentation objects
-   :mewa-object-presentation
-   :mewa-one-line-presentation
-   :mewa-list-presentation
-
-   ;; CRUD
-   :instance-is-stored-p
-
-   ;;;; Meta Model Exports))
-   :def-view-class/table
-   :def-view-class/meta
-   :list-slot-types
-   ))
\ No newline at end of file
+(defpackage #:lisp-on-lines
+  (:use 
+   #:contextl
+   #:closer-common-lisp
+
+   #:alexandria)
+  (:nicknames #:lol)
+  (:export
+
+   
+;; Descriptions
+   #:*description*
+   #:description
+   #:defdescription
+   #:find-description   
+   #:current-description
+   #:description-of
+   #:define-description
+   #:defining-description
+   #:described-object
+   #:with-described-object
+   #:funcall-with-described-object
+   #:described-class
+   #:described-standard-class
+   #:with-active-descriptions
+   #:with-inactive-descriptions
+
+
+   ;; Displays
+   #:define-display
+   #:display
+   #:display-using-description
+   #:display-attribute-label
+   #:*display*
+   #:*object*
+   
+   ;; Attributes
+   #:find-attribute
+   #:attribute
+   #:attributes
+   #:attribute-object
+   #:attribute-label
+   #:attribute-delimiter
+   #:attribute-setter
+   #:attribute-slot-name
+   #:label
+   #:attribute-active-p
+   #:attribute-function
+   #:attribute-value
+   #:display-attribute-value
+   #:active-attributes
+   #:attribute-delimiter
+   #:standard-attribute
+   #:funcall-with-attribute-context
+   #:with-attribute-context
+
+   ;; Standard Library
+   
+   ;; editing
+   #:editable
+   #:attribute-editor
+   #:string-attribute-editor
+   #:number-attribute-editor
+   #:password-attribute-editor
+   #:password
+
+   ;; :validation
+   #:validation
+   #:validate
+   #:validp
+
+   ;; CLOS
+   #:slot-definition-attribute
+
+   ;; html
+   #:display-html-attribute-editor
+   #:make-attribute-value-writer))
+
+