From 80ca36e6ab49b3f7061463ad08c0094ca7ca12f4 Mon Sep 17 00:00:00 2001 From: Asumu Takikawa Date: Mon, 9 Jul 2012 17:12:42 -0400 Subject: [PATCH] racket/draw: clean up object name hacks The only observable impact of this change is that `the-color-database` will now print as `(object:color-database% ...)` instead of `(object:color-database<%> ...)`. The former makes more sense anyway, given that you can't have an instance of an interface. If we really want the latter though, we can add `object-rename` for this purpose. --- collects/racket/draw/private/color.rkt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/collects/racket/draw/private/color.rkt b/collects/racket/draw/private/color.rkt index 53206a421a..3c327bb18e 100644 --- a/collects/racket/draw/private/color.rkt +++ b/collects/racket/draw/private/color.rkt @@ -8,7 +8,7 @@ color-green color-blue color-alpha - (rename-out [color-database-intf color-database<%>]) + color-database<%> the-color-database color->immutable-color) @@ -98,13 +98,10 @@ (define color-objects (make-hash)) -(define color-database-intf - (let ([color-database<%> (interface () - find-color - get-names)]) - color-database<%>)) +(define color-database<%> + (interface () find-color get-names)) -(defclass* color-database<%> object% (color-database-intf) +(defclass* color-database% object% (color-database<%>) (super-new) (def/public (find-color [string? name]) (let ([name (string-downcase name)]) @@ -120,7 +117,7 @@ (def/public (get-names) (sort (hash-map colors (lambda (k v) k)) string)) +(define the-color-database (new color-database%)) (define colors #hash(("aliceblue" . #(240 248 255))