Misc Cleanups.

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

diff --git a/src/ucw/packages.lisp b/src/ucw/packages.lisp
index 172bff9..0a35539 100644 (file)
--- a/src/ucw/packages.lisp
+++ b/src/ucw/packages.lisp
@@ -2,30 +2,22 @@
 (defpackage lisp-on-lines-ucw
   (:documentation "An LoL Layer over ucw.basic")
   (:nicknames #:lol-ucw)
-  (:use #:lisp-on-lines #:ucw :common-lisp :arnesi :yaclml :puri)
-  (:shadow 
-   #:standard-window-component
-   #:make-action
-   #:standard-action
-   #:uri-parse-error
-   #:standard-application)
-
-  (:shadowing-import-from :ucw
-   #:parent)
+  (:use #:lisp-on-lines #:ucw-core :common-lisp :arnesi :yaclml :js :contextl)
+
+  (:shadowing-import-from :js
+   #:new)  
+  (:shadowing-import-from :ucw-core
+   #:parent )
+  (:import-from :ucw-standard 
+       #:call #:answer #:defaction #:*source-component*)
   
-  (:import-from :ucw
-   #:register-action-in-frame
-   #:+action-parameter-name+
-   #:context.current-frame
-   #:uri.query
-   #:*current-component*
-   #:find-action
-   #:service)
+
                
   (:export 
-   ;;; Symbols marked ";*" are not from UCW 
-   ;;; but either shadowed or created for lol. 
 
+   ;;; First, LOL-UCW exports. The rest are from UCW.
+   #:lol-component
+   #:*source-component*
    #:defcomponent
 
    #:uri.query
@@ -47,10 +39,11 @@
    #:*context*
    #:context.current-frame
    #:context.window-component
-
+   #:*current-component*
 
    ;; Actions
    #:call
+   #:answer
    #:make-action
    #:find-action
    #:defaction
@@ -75,6 +68,7 @@
    
    #:standard-window-component ;*
    #:window-body
+   #:info-message
 
    ))