-
(in-package :mewa)
(defparameter *default-type* :ucw)
;;; maps meta-model slot-types to slot-presentation
(defparameter *slot-type-map*
- '(boolean ucw::mewa-boolean
- string ucw::mewa-string
- number ucw::mewa-currency
- integer ucw::mewa-integer
- currency ucw::mewa-currency
- ))
+ '(boolean mewa-boolean
+ string mewa-string
+ number mewa-currency
+ integer mewa-integer
+ currency mewa-currency
+ clsql:generalized-boolean mewa-boolean))
;;; an alist of model-class-name . attributes
;;; should really be a hash-table.
(cons (car definition)
(plist-union (cdr definition)
(cddr (find-attribute model name))))
- definition)))
+ definition)))
(defmethod perform-set-attributes ((model t) definitions)
(dolist (def definitions)
(defmethod perform-set-attribute-properties ((model t) definitions)
(dolist (def definitions)
(funcall #'set-attribute-properties model (car def) (cdr def))))
+
+(defmethod perform-define-attributes ((model t) attributes)
+ (loop for attribute in attributes
+ do (destructuring-bind (name type &rest args)
+ attribute
+ (cond ((eq type t)
+ ;;use the existing (default) type
+ (set-attribute-properties model name args))
+ ((not (null type))
+ ;;set the type as well
+ (set-attribute model name (cons type args)))))))
+
+(defmacro define-attributes (models &body attribute-definitions)
+ `(progn
+ ,@(loop for model in models
+ collect `(perform-define-attributes (quote ,model) (quote ,attribute-definitions)))
+ (mapcar #'find-class-attributes (quote ,models ))))
(defmethod default-attributes ((model t))
(cons (car s)
(gen-pslot
(if (meta-model:foreign-key-p model (car s))
- 'ucw::foreign-key
+ 'foreign-key
(cadr s))
(string (car s)) (car s))))
(meta-model:list-slot-types model))
(mapcar #'(lambda (s)
- (cons s (append (gen-pslot 'ucw::has-many (string s) s)
+ (cons s (append (gen-pslot 'has-many (string s) s)
`(:presentation
(make-presentation
,model
;;;presentations
-
-
(defcomponent mewa ()
- ((ucw::instance :accessor instance :initarg :instance)
+ ((instance :accessor instance :initarg :instance)
(attributes
:initarg :attributes
:accessor attributes
(modifications :accessor modifications :initform nil)))
-
-
-
-
(defmethod attributes :around ((self mewa))
(let ((a (call-next-method)))
(or a (funcall (attributes-getter self) self))))
(defmethod find-slot-presentation-for-attribute ((self mewa) attribute)
(let ((class-name
- (or (gethash (second attribute) ucw::*slot-type-mapping*)
- (error "Can't find slot type for ~A" (second attribute)))))
+ (or (gethash (if (consp (second attribute))
+ (car (second attribute))
+ (second attribute))
+ *presentation-slot-type-mapping*)
+ (error "Can't find slot type for ~A in ~A" attribute *presentation-slot-type-mapping* ))))
- (cons (first attribute) (apply #'make-instance
- class-name
- (append (cddr attribute) (list :parent self :size 30))))))
+ (cons (first attribute) (apply #'make-instance
+ class-name
+ (append (cddr attribute) (list :parent self :size 30))))))
(defmethod find-slot-presentations ((self mewa))
(mapcar #'(lambda (a) (find-slot-presentation-for-attribute self a))
(setf (attribute-slot-map self) (find-slot-presentations self))
(setf (slots self) (mapcar #'(lambda (x)(cdr x)) (attribute-slot-map self )))))
-
(defmethod make-presentation ((object t) &key (type :viewer) (initargs nil))
(let* ((p (make-instance 'mewa-object-presentation))
- (a (progn (setf (slot-value p 'instance) object)
+ (a (progn (setf (slot-value p 'ucw::instance) object)
(initialize-slots p)
(assoc type (find-all-attributes p))))
-
- (i (apply #'make-instance (second a) (plist-union initargs (cddr a)))))
- (setf (slot-value i 'instance) object)
- i))
-
-(defmethod make-presentation ((object t) &key (type :viewer) (initargs nil))
- (let* ((p (make-instance 'mewa-object-presentation))
- (a (progn (setf (slot-value p 'instance) object)
- (initialize-slots p)
- (assoc type (find-all-attributes p))))
-
(i (apply #'make-instance (or (second a)
- ;; if we didnt find the type,
- ;; use the symbol as a class.
- (if (eql (symbol-package type)
- (find-package 'keyword))
- (symbol-name type)
- type))
- (plist-union initargs (cddr a)))))
+ ;; if we didnt find the type,
+ ;; use the symbol as a class.
+ (if (eql (symbol-package type)
+ (find-package 'keyword))
+ (symbol-name type)
+ type))
+ (plist-union initargs (cddr a)))))
(setf (slot-value i 'instance) object)
(initialize-slots i)
(setf (slot-value i 'initializedp) t)
(setf (component.place x) place)))
(slots mewa))))
-(defmethod call-component :before ((from standard-component) (to mewa))
+(arnesi:defmethod/cc call-component :before ((from standard-component) (to mewa))
(unless (slot-value to 'initializedp)
(initialize-slots to))
(setf (slot-value to 'initializedp) t)
- (setf (slots to) (mapcar #'(lambda (x) (prog2
- (setf (component.place x) (component.place from))
- x))
- (slots to))))
+ (initialize-slots-place (component.place from) to)
+ to)
+
+
(defmacro call-presentation (object &rest args)
`(present-object ,object :presentation (make-presentation ,object ,@args)))
(defaction ok ((self mewa) &optional arg)
"Returns the component if it has not been modified. if it has been, prompt user to save or cancel"
- (declare (ignore arg))
- (ensure-instance-sync self)
- (answer self))
+ ;(declare (ignore arg))
+ (meta-model::sync-instance (instance self))
+ (answer (instance self)))
(defmethod (setf presentation-slot-value) :around (value (slot slot-presentation) instance)
(let* ((old (prog1
HCoop / clinton / lisp-on-lines.git / blobdiff