classes: use check-instance in a few places, to remove duplication.

[factor.git] / basis / ui / gadgets / labels / labels.factor

diff --git a/basis/ui/gadgets/labels/labels.factor b/basis/ui/gadgets/labels/labels.factor
index 7ef8d6203963c777353938208b79b4486d5cb3f0..2b76e16cd1a3b163e03f33028408821f5748e61e 100644 (file)
--- a/basis/ui/gadgets/labels/labels.factor
+++ b/basis/ui/gadgets/labels/labels.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays colors.constants combinators fonts fry
-kernel make math.functions models namespaces sequences splitting
-strings ui.baseline-alignment ui.gadgets ui.gadgets.tracks
-ui.pens.solid ui.render ui.text ui.theme.images ;
+USING: accessors arrays classes colors.constants combinators
+fonts fry kernel make math.functions models namespaces sequences
+splitting strings ui.baseline-alignment ui.gadgets
+ui.gadgets.tracks ui.pens.solid ui.render ui.text
+ui.theme.images ;
 IN: ui.gadgets.labels
 
 ! A label gadget draws a string.
@@ -23,15 +24,11 @@ PRIVATE>
 : ?string-lines ( string -- string/array )
     CHAR: \n over member-eq? [ string-lines ] when ;
 
-ERROR: not-a-string object ;
-
 M: label string<< ( string label -- )
     [
-        {
-            { [ dup string-array? ] [ ] }
-            { [ dup string? ] [ ?string-lines ] }
-            [ not-a-string ]
-        } cond
+        dup string-array? [
+            string check-instance ?string-lines
+        ] unless
     ] dip [ text<< ] [ relayout ] bi ; inline
 
 : label-theme ( gadget -- gadget )