Update code for model class renamings

diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor
index 560cea4d5e725e807261fe7f3816cf15900dfdc8..9adb33a164dcb5d3e9f926f22149ff572b33408a 100755 (executable)
--- a/basis/ui/gadgets/editors/editors.factor
+++ b/basis/ui/gadgets/editors/editors.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2009 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays documents documents.elements kernel math
 ! Copyright (C) 2006, 2009 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays documents documents.elements kernel math

-math.ranges models models.filter namespaces locals fry make opengl
+math.ranges models models.arrow namespaces locals fry make opengl

 opengl.gl sequences strings math.vectors math.functions sorting colors
 colors.constants combinators assocs math.order fry calendar alarms
 continuations ui.clipboards ui.commands ui.gadgets ui.gadgets.borders
 opengl.gl sequences strings math.vectors math.functions sorting colors
 colors.constants combinators assocs math.order fry calendar alarms
 continuations ui.clipboards ui.commands ui.gadgets ui.gadgets.borders


@@ -565,7 +565,7 @@ TUPLE: source-editor < multiline-editor ;
 ! A useful model
 : <element-model> ( editor element -- model )
     [ [ caret>> ] [ model>> ] bi ] dip
 ! A useful model
 : <element-model> ( editor element -- model )
     [ [ caret>> ] [ model>> ] bi ] dip

-    '[ _ _ elt-string ] <filter> ;
+    '[ _ _ elt-string ] <arrow> ;

 
 ! Fields wrap an editor
 TUPLE: field < border editor min-cols max-cols ;
 
 ! Fields wrap an editor
 TUPLE: field < border editor min-cols max-cols ;

diff --git a/basis/ui/gadgets/scrollers/scrollers-tests.factor b/basis/ui/gadgets/scrollers/scrollers-tests.factor
index 9a8460c90eb05b993b97ff3865e4695075d52873..4e61c9b1ed8e20a83c02799b80312c149b586d17 100644 (file)
--- a/basis/ui/gadgets/scrollers/scrollers-tests.factor
+++ b/basis/ui/gadgets/scrollers/scrollers-tests.factor
@@ -1,9 +1,9 @@
 USING: ui.gadgets ui.gadgets.scrollers namespaces tools.test
 USING: ui.gadgets ui.gadgets.scrollers namespaces tools.test

-kernel models models.compose models.range ui.gadgets.viewports
-ui.gadgets.labels ui.gadgets.grids
-ui.gadgets.sliders math math.vectors arrays sequences
-tools.test.ui math.rectangles accessors ui.gadgets.buttons
-ui.gadgets.packs ui.gadgets.scrollers.private ;
+kernel models models.product models.range ui.gadgets.viewports
+ui.gadgets.labels ui.gadgets.grids ui.gadgets.sliders math
+math.vectors arrays sequences tools.test.ui math.rectangles
+accessors ui.gadgets.buttons ui.gadgets.packs
+ui.gadgets.scrollers.private ;

 IN: ui.gadgets.scrollers.tests
 
 [ ] [
 IN: ui.gadgets.scrollers.tests
 
 [ ] [


@@ -21,7 +21,7 @@ IN: ui.gadgets.scrollers.tests
 
 [ ] [
     <gadget> dup "g" set
 
 [ ] [
     <gadget> dup "g" set

-    10 1 0 100 <range> 20 1 0 100 <range> 2array <compose>
+    10 1 0 100 <range> 20 1 0 100 <range> 2array <product>

     <viewport> "v" set
 ] unit-test
 
     <viewport> "v" set
 ] unit-test
 

diff --git a/basis/ui/gadgets/scrollers/scrollers.factor b/basis/ui/gadgets/scrollers/scrollers.factor
index aed3d32fc5426437e59d665fd7b7b581e2f067b0..64e035c81bb505858741b5d73b4c5414f75a5008 100644 (file)
--- a/basis/ui/gadgets/scrollers/scrollers.factor
+++ b/basis/ui/gadgets/scrollers/scrollers.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays ui.gadgets ui.gadgets.viewports
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays ui.gadgets ui.gadgets.viewports

-ui.gadgets.frames ui.gadgets.grids
-ui.gadgets.sliders ui.gestures kernel math namespaces sequences
-models models.range models.compose combinators math.vectors
-classes.tuple math.rectangles combinators.short-circuit ;
+ui.gadgets.frames ui.gadgets.grids ui.gadgets.sliders
+ui.gestures kernel math namespaces sequences models models.range
+models.product combinators math.vectors classes.tuple
+math.rectangles combinators.short-circuit ;

 IN: ui.gadgets.scrollers
 
 TUPLE: scroller < frame column-header viewport x y follows ;
 IN: ui.gadgets.scrollers
 
 TUPLE: scroller < frame column-header viewport x y follows ;


@@ -42,7 +42,7 @@ scroller H{
 } set-gestures
 
 : <scroller-model> ( -- model )
 } set-gestures
 
 : <scroller-model> ( -- model )

-    0 0 0 0 <range> 0 0 0 0 <range> 2array <compose> ;
+    0 0 0 0 <range> 0 0 0 0 <range> 2array <product> ;

 
 M: viewport pref-dim* gadget-child pref-viewport-dim ;
 
 
 M: viewport pref-dim* gadget-child pref-viewport-dim ;
 

diff --git a/basis/ui/gadgets/status-bar/status-bar.factor b/basis/ui/gadgets/status-bar/status-bar.factor
index 104b0f6aae093bdfe51828a9d1d040e993052860..a1c2dca23d04e3b91844f1a6f68efe09ad7323de 100644 (file)
--- a/basis/ui/gadgets/status-bar/status-bar.factor
+++ b/basis/ui/gadgets/status-bar/status-bar.factor
@@ -1,12 +1,12 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors models models.delay models.filter
+USING: accessors models models.delay models.arrow

 sequences ui.gadgets.labels ui.gadgets.tracks
 ui.gadgets.worlds ui.gadgets ui kernel calendar summary ;
 IN: ui.gadgets.status-bar
 
 : <status-bar> ( model -- gadget )
 sequences ui.gadgets.labels ui.gadgets.tracks
 ui.gadgets.worlds ui.gadgets ui kernel calendar summary ;
 IN: ui.gadgets.status-bar
 
 : <status-bar> ( model -- gadget )

-    1/10 seconds <delay> [ "" like ] <filter> <label-control>
+    1/10 seconds <delay> [ "" like ] <arrow> <label-control>

     reverse-video-theme
     t >>root? ;
 
     reverse-video-theme
     t >>root? ;
 

diff --git a/basis/ui/tools/browser/popups/popups.factor b/basis/ui/tools/browser/popups/popups.factor
index c015bf919906ee4edd32a7d86aa09a19ffce71a2..05d77793059c26e1d0d233d4ec7830749d609ec8 100644 (file)
--- a/basis/ui/tools/browser/popups/popups.factor
+++ b/basis/ui/tools/browser/popups/popups.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs definitions fry help.topics kernel
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs definitions fry help.topics kernel

-colors.constants math.rectangles models.filter namespaces sequences
+colors.constants math.rectangles models.arrow namespaces sequences

 sorting definitions.icons ui.gadgets ui.gadgets.glass
 ui.gadgets.labeled ui.gadgets.scrollers ui.gadgets.tables
 ui.gadgets.search-tables ui.gadgets.wrappers ui.gestures ui.operations
 sorting definitions.icons ui.gadgets ui.gadgets.glass
 ui.gadgets.labeled ui.gadgets.scrollers ui.gadgets.tables
 ui.gadgets.search-tables ui.gadgets.wrappers ui.gestures ui.operations


@@ -24,10 +24,10 @@ TUPLE: links-popup < wrapper ;
     swap second subseq? ;
 
 : <links-table> ( model quot -- table )
     swap second subseq? ;
 
 : <links-table> ( model quot -- table )

-    '[ @ sorted-links ] <filter>
+    '[ @ sorted-links ] <arrow>

     link-renderer [ second ] <search-table>
         [ invoke-primary-operation ] >>action
     link-renderer [ second ] <search-table>
         [ invoke-primary-operation ] >>action

-        [ drop ] >>hook ! hide-glass ] >>hook
+        [ hide-glass ] >>hook

         t >>selection-required?
         10 >>min-rows
         10 >>max-rows
         t >>selection-required?
         10 >>min-rows
         10 >>max-rows

diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor
index a7810153a8899755b4e9093ffb27706f22602d55..17ffc9ee18e834f5e1dd66fb6b014e5cceff0878 100644 (file)
--- a/basis/ui/tools/inspector/inspector.factor
+++ b/basis/ui/tools/inspector/inspector.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors inspector namespaces kernel models fry
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors inspector namespaces kernel models fry

-colors.constants models.filter prettyprint sequences mirrors assocs
+colors.constants models.arrow prettyprint sequences mirrors assocs

 classes io io.styles arrays hashtables math.order sorting refs fonts
 ui.tools.browser ui.commands ui.operations ui.gadgets ui.gadgets.panes
 ui.gadgets.scrollers ui.gadgets.slots ui.gadgets.tracks ui.gestures
 classes io io.styles arrays hashtables math.order sorting refs fonts
 ui.tools.browser ui.commands ui.operations ui.gadgets ui.gadgets.panes
 ui.gadgets.scrollers ui.gadgets.slots ui.gadgets.tracks ui.gestures


@@ -60,7 +60,7 @@ M: hashtable make-slot-descriptions
     call-next-method [ [ key-string>> ] compare ] sort ;
 
 : <inspector-table> ( model -- table )
     call-next-method [ [ key-string>> ] compare ] sort ;
 
 : <inspector-table> ( model -- table )

-    [ make-slot-descriptions ] <filter> inspector-renderer <table>
+    [ make-slot-descriptions ] <arrow> inspector-renderer <table>

         [ invoke-primary-operation ] >>action
         monospace-font >>font
         COLOR: dark-gray >>column-line-color
         [ invoke-primary-operation ] >>action
         monospace-font >>font
         COLOR: dark-gray >>column-line-color

diff --git a/basis/ui/tools/listener/completion/completion.factor b/basis/ui/tools/listener/completion/completion.factor
index a9cd616a92141d96b01e7e7940422eee08408647..0f357cb0afb0c94c32aa299a62a1ffe1dbec5706 100644 (file)
--- a/basis/ui/tools/listener/completion/completion.factor
+++ b/basis/ui/tools/listener/completion/completion.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs calendar colors colors.constants
 documents documents.elements fry kernel words sets splitting math
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs calendar colors colors.constants
 documents documents.elements fry kernel words sets splitting math

-math.vectors models.delay models.filter combinators.short-circuit
+math.vectors models.delay models.arrow combinators.short-circuit

 parser present sequences tools.completion tools.vocabs.browser generic
 generic.standard.engines.tuple fonts definitions.icons ui.images
 ui.commands ui.operations ui.gadgets ui.gadgets.editors
 parser present sequences tools.completion tools.vocabs.browser generic
 generic.standard.engines.tuple fonts definitions.icons ui.images
 ui.commands ui.operations ui.gadgets ui.gadgets.editors


@@ -102,7 +102,7 @@ TUPLE: completion-popup < track interactor table completion-mode ;
 
 : <completion-model> ( editor element quot -- model )
     [ <element-model> 1/3 seconds <delay> ] dip
 
 : <completion-model> ( editor element quot -- model )
     [ <element-model> 1/3 seconds <delay> ] dip

-    '[ @ keys 1000 short head ] <filter> ;
+    '[ @ keys 1000 short head ] <arrow> ;

 
 M: completion-popup focusable-child* table>> ;
 
 
 M: completion-popup focusable-child* table>> ;
 

diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor
index f5974686b6a971f968d39b0d72daee05e91965b5..ca41fa5408e02f22b9b22119856fd846f8f5cb6b 100644 (file)
--- a/basis/ui/tools/listener/listener.factor
+++ b/basis/ui/tools/listener/listener.factor
@@ -4,7 +4,7 @@ USING: accessors arrays assocs calendar combinators locals
 colors.constants combinators.short-circuit compiler.units
 concurrency.flags concurrency.mailboxes continuations destructors
 documents documents.elements fry hashtables help help.markup io
 colors.constants combinators.short-circuit compiler.units
 concurrency.flags concurrency.mailboxes continuations destructors
 documents documents.elements fry hashtables help help.markup io

-io.styles kernel lexer listener math models models.delay models.filter
+io.styles kernel lexer listener math models models.delay models.arrow

 namespaces parser prettyprint quotations sequences strings threads
 tools.vocabs vocabs vocabs.loader vocabs.parser words ui ui.commands
 ui.pens.solid ui.gadgets ui.gadgets.glass ui.gadgets.buttons ui.gadgets.editors
 namespaces parser prettyprint quotations sequences strings threads
 tools.vocabs vocabs vocabs.loader vocabs.parser words ui ui.commands
 ui.pens.solid ui.gadgets ui.gadgets.glass ui.gadgets.buttons ui.gadgets.editors


@@ -63,7 +63,7 @@ M: char-completion (word-at-caret)
 : <word-model> ( interactor -- model )
     [ token-model>> 1/3 seconds <delay> ]
     [ '[ _ word-at-caret ] ] bi
 : <word-model> ( interactor -- model )
     [ token-model>> 1/3 seconds <delay> ]
     [ '[ _ word-at-caret ] ] bi

-    <filter> ;
+    <arrow> ;

 
 : <interactor> ( -- gadget )
     interactor new-editor
 
 : <interactor> ( -- gadget )
     interactor new-editor

diff --git a/basis/ui/tools/profiler/profiler.factor b/basis/ui/tools/profiler/profiler.factor
index 6e86cde0a5711b6a51af76b453e9954ddcdfe7a2..0ab1519cd78eec1e523fcff60e6cd5b192d10ece 100644 (file)
--- a/basis/ui/tools/profiler/profiler.factor
+++ b/basis/ui/tools/profiler/profiler.factor
@@ -10,8 +10,8 @@ ui.gadgets.buttons ui.gadgets.packs ui.gadgets.labels
 ui.gadgets.tabbed ui.gadgets.status-bar ui.gadgets.borders
 ui.tools.browser ui.tools.common ui.baseline-alignment
 ui.operations ui.images ;
 ui.gadgets.tabbed ui.gadgets.status-bar ui.gadgets.borders
 ui.tools.browser ui.tools.common ui.baseline-alignment
 ui.operations ui.images ;

-FROM: models.filter => <filter> ;
-FROM: models.compose => <compose> ;
+FROM: models.arrow => <arrow> ;
+FROM: models.product => <product> ;

 IN: ui.tools.profiler
 
 TUPLE: profiler-gadget < tool
 IN: ui.tools.profiler
 
 TUPLE: profiler-gadget < tool


@@ -72,7 +72,7 @@ M: method-renderer row-value drop first ;
 M: method-renderer column-titles drop { "" "Method" "Count" } ;
 
 : <profiler-model> ( values profiler -- model )
 M: method-renderer column-titles drop { "" "Method" "Count" } ;
 
 : <profiler-model> ( values profiler -- model )

-    [ [ filter-counts ] <filter> ] [ sort>> ] bi* <sort> ;
+    [ [ filter-counts ] <arrow> ] [ sort>> ] bi* <sort> ;

 
 : <words-model> ( profiler -- model )
     [
 
 : <words-model> ( profiler -- model )
     [


@@ -91,7 +91,7 @@ M: method-renderer column-titles drop { "" "Method" "Count" } ;
         [ invoke-primary-operation ] >>action ;
 
 : <profiler-filter-model> ( counts profiler -- model' )
         [ invoke-primary-operation ] >>action ;
 
 : <profiler-filter-model> ( counts profiler -- model' )

-    [ <model> ] dip <profiler-model> [ f prefix ] <filter> ;
+    [ <model> ] dip <profiler-model> [ f prefix ] <arrow> ;

 
 : <vocabs-model> ( profiler -- model )
     [ vocab-counters [ [ vocab ] dip ] assoc-map ] dip
 
 : <vocabs-model> ( profiler -- model )
     [ vocab-counters [ [ vocab ] dip ] assoc-map ] dip


@@ -112,8 +112,8 @@ M: method-renderer column-titles drop { "" "Method" "Count" } ;
 : <methods-model> ( profiler -- model )
     [
         [ method-counters <model> ] dip
 : <methods-model> ( profiler -- model )
     [
         [ method-counters <model> ] dip

-        [ generic>> ] [ class>> ] bi 3array <compose>
-        [ first3 '[ _ _ method-matches? ] filter ] <filter>
+        [ generic>> ] [ class>> ] bi 3array <product>
+        [ first3 '[ _ _ method-matches? ] filter ] <arrow>

     ] keep <profiler-model> ;
 
 : sort-by-name ( obj1 obj2 -- <=> )
     ] keep <profiler-model> ;
 
 : sort-by-name ( obj1 obj2 -- <=> )

diff --git a/basis/ui/tools/traceback/traceback.factor b/basis/ui/tools/traceback/traceback.factor
index f8f5dd382cd047fa6141f463939ba76d423c0a29..affad4d3e39420e16c2acdb5c62e567eba1fd3b6 100644 (file)
--- a/basis/ui/tools/traceback/traceback.factor
+++ b/basis/ui/tools/traceback/traceback.factor
@@ -5,7 +5,7 @@ fry prettyprint ui ui.commands ui.gadgets ui.gadgets.labeled assocs
 ui.gadgets.tracks ui.gadgets.buttons ui.gadgets.panes
 ui.gadgets.status-bar ui.gadgets.scrollers ui.gadgets.borders
 ui.gadgets.tables ui.gestures sequences inspector
 ui.gadgets.tracks ui.gadgets.buttons ui.gadgets.panes
 ui.gadgets.status-bar ui.gadgets.scrollers ui.gadgets.borders
 ui.gadgets.tables ui.gestures sequences inspector

-models.filter fonts ;
+models.arrow fonts ;

 QUALIFIED-WITH: ui.tools.inspector i
 IN: ui.tools.traceback
 
 QUALIFIED-WITH: ui.tools.inspector i
 IN: ui.tools.traceback
 


@@ -21,7 +21,7 @@ M: stack-entry-renderer row-columns drop string>> 1array ;
 M: stack-entry-renderer row-value drop object>> ;
 
 : <stack-table> ( model -- table )
 M: stack-entry-renderer row-value drop object>> ;
 
 : <stack-table> ( model -- table )

-    [ [ <stack-entry> ] map ] <filter> stack-entry-renderer <table>
+    [ [ <stack-entry> ] map ] <arrow> stack-entry-renderer <table>

         10 >>min-rows
         10 >>max-rows
         40 >>min-cols
         10 >>min-rows
         10 >>max-rows
         40 >>min-cols


@@ -31,7 +31,7 @@ M: stack-entry-renderer row-value drop object>> ;
         t >>single-click? ;
 
 : <stack-display> ( model quot title -- gadget )
         t >>single-click? ;
 
 : <stack-display> ( model quot title -- gadget )

-    [ '[ dup _ when ] <filter> <stack-table> <scroller> ] dip
+    [ '[ dup _ when ] <arrow> <stack-table> <scroller> ] dip

     <labeled-gadget> ;
 
 : <callstack-display> ( model -- gadget )
     <labeled-gadget> ;
 
 : <callstack-display> ( model -- gadget )


@@ -67,7 +67,7 @@ TUPLE: traceback-gadget < track ;
     add-toolbar ;
 
 : variables ( traceback -- )
     add-toolbar ;
 
 : variables ( traceback -- )

-    model>> [ dup [ name>> vars-in-scope ] when ] <filter> i:inspect-model ;
+    model>> [ dup [ name>> vars-in-scope ] when ] <arrow> i:inspect-model ;

 
 : traceback-window ( continuation -- )
     <model> <traceback-gadget> "Traceback" open-status-window ;
 
 : traceback-window ( continuation -- )
     <model> <traceback-gadget> "Traceback" open-status-window ;

diff --git a/basis/ui/tools/walker/walker.factor b/basis/ui/tools/walker/walker.factor
index 63426f86bfb79e46ec6c6654e4e5cb3de60ca130..1f427d9405b8defa1fd33640c52a9fef4b528056 100644 (file)
--- a/basis/ui/tools/walker/walker.factor
+++ b/basis/ui/tools/walker/walker.factor
@@ -3,7 +3,7 @@
 USING: accessors kernel concurrency.messaging inspector
 ui.tools.listener ui.tools.traceback ui.gadgets.buttons
 ui.gadgets.status-bar ui.gadgets.tracks ui.commands ui.gadgets
 USING: accessors kernel concurrency.messaging inspector
 ui.tools.listener ui.tools.traceback ui.gadgets.buttons
 ui.gadgets.status-bar ui.gadgets.tracks ui.commands ui.gadgets

-models models.filter ui.tools.browser ui.tools.common ui.gestures
+models models.arrow ui.tools.browser ui.tools.common ui.gestures

 ui.gadgets.labels ui threads namespaces make tools.walker assocs
 combinators fry ;
 IN: ui.tools.walker
 ui.gadgets.labels ui threads namespaces make tools.walker assocs
 combinators fry ;
 IN: ui.tools.walker


@@ -53,7 +53,7 @@ M: walker-gadget focusable-child*
     ] "" make ;
 
 : <thread-status> ( model thread -- gadget )
     ] "" make ;
 
 : <thread-status> ( model thread -- gadget )

-    '[ _ walker-state-string ] <filter> <label-control> ;
+    '[ _ walker-state-string ] <arrow> <label-control> ;

 
 : <walker-gadget> ( status continuation thread -- gadget )
     vertical walker-gadget new-track
 
 : <walker-gadget> ( status continuation thread -- gadget )
     vertical walker-gadget new-track

diff --git a/extra/color-picker/color-picker.factor b/extra/color-picker/color-picker.factor
index 0f3055b3b5fb1a52c7bed6806661d1d53357b539..69c21b10f7a0ce3046e4b976ad9dd823546b96f6 100755 (executable)
--- a/extra/color-picker/color-picker.factor
+++ b/extra/color-picker/color-picker.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel math math.functions math.parser models
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel math math.functions math.parser models

-models.filter models.range models.compose sequences ui
+models.arrow models.range models.product sequences ui

 ui.gadgets ui.gadgets.frames ui.gadgets.labels ui.gadgets.packs
 ui.gadgets.sliders ui.render math.rectangles accessors
 ui.gadgets.grids colors ;
 ui.gadgets ui.gadgets.frames ui.gadgets.labels ui.gadgets.packs
 ui.gadgets.sliders ui.render math.rectangles accessors
 ui.gadgets.grids colors ;


@@ -20,7 +20,7 @@ M: color-preview model-changed
     swap value>> >>interior relayout-1 ;
 
 : <color-model> ( model -- model )
     swap value>> >>interior relayout-1 ;
 
 : <color-model> ( model -- model )

-    [ first3 [ 256 /f ] tri@ 1 <rgba> <solid> ] <filter> ;
+    [ first3 [ 256 /f ] tri@ 1 <rgba> <solid> ] <arrow> ;

 
 : <color-slider> ( model -- gadget )
     horizontal <slider> 1 >>line ;
 
 : <color-slider> ( model -- gadget )
     horizontal <slider> 1 >>line ;


@@ -28,7 +28,7 @@ M: color-preview model-changed
 : <color-sliders> ( -- gadget model )
     3 [ 0 0 0 255 <range> ] replicate
     [ <filled-pile> { 5 5 } >>gap [ <color-slider> add-gadget ] reduce ]
 : <color-sliders> ( -- gadget model )
     3 [ 0 0 0 255 <range> ] replicate
     [ <filled-pile> { 5 5 } >>gap [ <color-slider> add-gadget ] reduce ]

-    [ [ range-model ] map <compose> ]
+    [ [ range-model ] map <product> ]

     bi ;
 
 : <color-picker> ( -- gadget )
     bi ;
 
 : <color-picker> ( -- gadget )


@@ -40,7 +40,7 @@ M: color-preview model-changed
             [ <color-model> <color-preview> @center grid-add ]
             [
                 [ [ truncate number>string ] map " " join ]
             [ <color-model> <color-preview> @center grid-add ]
             [
                 [ [ truncate number>string ] map " " join ]

-                <filter> <label-control>
+                <arrow> <label-control>

                 @bottom grid-add
             ] bi
         ] bi* ;
                 @bottom grid-add
             ] bi
         ] bi* ;

diff --git a/extra/lcd/lcd.factor b/extra/lcd/lcd.factor
index 9f86d23eea3b6f166fe6c6667924aeadb02dbc3b..b7a3235ea8148cd76c8af3191683f0ca970a129b 100755 (executable)
--- a/extra/lcd/lcd.factor
+++ b/extra/lcd/lcd.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors sequences kernel math io calendar grouping
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors sequences kernel math io calendar grouping

-calendar.format calendar.model arrays models models.filter
+calendar.format calendar.model arrays models models.arrow

 namespaces ui.gadgets ui.gadgets.labels ui.gadgets.theme ui ;
 IN: lcd
 
 namespaces ui.gadgets ui.gadgets.labels ui.gadgets.theme ui ;
 IN: lcd
 


@@ -24,7 +24,7 @@ IN: lcd
     3array [ pad-00 ] map ":" join ;
 
 : <time-display> ( timestamp -- gadget )
     3array [ pad-00 ] map ":" join ;
 
 : <time-display> ( timestamp -- gadget )

-    [ hh:mm:ss lcd ] <filter> <label-control>
+    [ hh:mm:ss lcd ] <arrow> <label-control>

     "99:99:99" lcd >>string
     monospace-font >>font ;
 
     "99:99:99" lcd >>string
     monospace-font >>font ;
 

diff --git a/extra/ui/gadgets/tabs/tabs.factor b/extra/ui/gadgets/tabs/tabs.factor
index 0113e01ba73884e55f13fa851470f8ac96565f49..62765ec45c20fff783cc92ec24154303c4a80d26 100755 (executable)
--- a/extra/ui/gadgets/tabs/tabs.factor
+++ b/extra/ui/gadgets/tabs/tabs.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.\r
 \r
 USING: accessors kernel fry math math.vectors sequences arrays vectors assocs\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 \r
 USING: accessors kernel fry math math.vectors sequences arrays vectors assocs\r

-       hashtables models models.range models.compose combinators\r
+       hashtables models models.range models.product combinators\r

        ui ui.gadgets ui.gadgets.buttons ui.gadgets.frames ui.gadgets.packs\r
        ui.gadgets.grids ui.gadgets.viewports ui.gadgets.books locals ;\r
 \r
        ui ui.gadgets ui.gadgets.buttons ui.gadgets.frames ui.gadgets.packs\r
        ui.gadgets.grids ui.gadgets.viewports ui.gadgets.books locals ;\r
 \r