X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/4644082451f92f7a060e47be6b9967acf8412c7f..HEAD:/src/ucw/standard-components.lisp

diff --git a/src/ucw/standard-components.lisp b/src/ucw/standard-components.lisp
index 9aea34d..62c6fc6 100644
--- a/src/ucw/standard-components.lisp
+++ b/src/ucw/standard-components.lisp
@@ -1,28 +1,50 @@
 (in-package :lisp-on-lines-ucw)
 
-(defclass lisp-on-lines-action (ucw-standard::standard-action) 
-  ((layer-context :accessor action-layer-context
-		  :initform nil
-		  :initarg :layer-context))
-  (:metaclass closer-mop:funcallable-standard-class))
+(defclass lisp-on-lines-application (contextl-application)
+  ()
+  (:default-initargs :action-class 'lisp-on-lines-action))
 
+(defclass lisp-on-lines-action (action-with-isolation-support contextl-action ) 
+  ()
+  (:metaclass closer-mop:funcallable-standard-class))
 
-(setf ucw-standard::*default-action-class* 'lisp-on-lines-action)
+(defclass lisp-on-lines-component (contextl-component) 
+  () 
+  (:metaclass standard-component-class))
 
+(defclass lisp-on-lines-component-class (standard-component-class) 
+  ())
 
-(defmethod ucw-core:call-action :around ((action lisp-on-lines-action) application session frame)
-  (let ((next-method (lambda ()
-		       (layered-call-action 
-			action application session frame 
-			(lambda () 
-			  (call-next-method))))))
-    (let ((layer-context (action-layer-context action)))
-      (if layer-context 
-	  (contextl:funcall-with-layer-context layer-context next-method)
-	  (funcall next-method)))
-    ))
 
-(defmethod ucw-core:handle-action :around ((action lisp-on-lines-action) application session frame)
+(defmethod initialize-instance :around ((class lisp-on-lines-component-class) 
+					&rest initargs &key (direct-superclasses '()))
+  (declare (dynamic-extent initargs))
+  (if (loop for direct-superclass in direct-superclasses
+	 thereis (ignore-errors (subtypep direct-superclass 'lisp-on-lines-component)))
+      (call-next-method)
+      (apply #'call-next-method
+	     class
+	     :direct-superclasses
+	     (append direct-superclasses
+		     (list (find-class 'lisp-on-lines-component)))
+	     initargs)))
+
+
+(defmethod reinitialize-instance :around ((class lisp-on-lines-component-class) 
+					  &rest initargs &key (direct-superclasses '() direct-superclasses-p))
+  (declare (dynamic-extent initargs))
+  (if (or (not direct-superclasses-p)
+	  (loop for direct-superclass in direct-superclasses
+	     thereis (ignore-errors (subtypep direct-superclass 'lisp-on-lines-component))))
+      (call-next-method)
+      (apply #'call-next-method
+	     class
+	     :direct-superclasses
+	     (append direct-superclasses
+		     (list (find-class 'lisp-on-lines-component)))
+	     initargs)))
+
+(defmethod ucw-core:handle-action :wrap-around ((action lisp-on-lines-action) application session frame)
      (let ((lol::*invalid-objects* (make-hash-table)))
        (handler-bind ((lol::validation-condition 
 		       (lambda (c)
@@ -35,23 +57,17 @@
 				       (gethash object lol::*invalid-objects*)))))))
        (call-next-method))))
 
+(defclass described-component-class (described-class standard-component-class)
+  ())
+
+
 
-(contextl:define-layered-function layered-call-action (action application session frame next-method)
-  (:method (action application session frame next-method)
-    (funcall next-method)))
 
 
-(contextl:define-layered-method layered-call-action 
-   :in-layer #.(lol::defining-description 'lol::validate)
-   :around ((action lisp-on-lines-action) application session frame next-method)
-   (call-next-method)
 
-   )
 
 
 
-(defclass described-component-class (described-class standard-component-class )
-  ())