ui: Trim using lists.

diff --git a/basis/ui/commands/commands.factor b/basis/ui/commands/commands.factor
index e2f00f0ecc8fa3aa21984e80af539e2dd43cbc00..3063d8736b632e4661f0e25e3e4dbf2074524e28 100644 (file)
--- a/basis/ui/commands/commands.factor
+++ b/basis/ui/commands/commands.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs fry help.markup kernel make quotations
+USING: accessors assocs help.markup kernel make quotations
 sequences splitting tr ui.gestures unicode words ;
 IN: ui.commands
 

diff --git a/basis/ui/gadgets/gadgets.factor b/basis/ui/gadgets/gadgets.factor
index e06ab08c914c7a936f85e75f389f3b0d8ca8c885..d584253eefda1b2f38620a0ed793def77d3cd23f 100644 (file)
--- a/basis/ui/gadgets/gadgets.factor
+++ b/basis/ui/gadgets/gadgets.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2005, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays binary-search combinators concurrency.flags
-deques fry kernel locals make math math.order math.rectangles
-math.vectors models namespaces sequences threads vectors ;
+USING: accessors arrays binary-search combinators
+concurrency.flags deques kernel make math math.order
+math.rectangles math.vectors models namespaces sequences threads
+vectors vocabs.loader ;
 IN: ui.gadgets
 
 ! Values for orientation slot

diff --git a/basis/ui/gadgets/grid-lines/grid-lines.factor b/basis/ui/gadgets/grid-lines/grid-lines.factor
index db759a42014649bf7d7c447d2d4d19c0eae41f87..f4cf55e52ebffa9995605265f50dd69f74dead4c 100644 (file)
--- a/basis/ui/gadgets/grid-lines/grid-lines.factor
+++ b/basis/ui/gadgets/grid-lines/grid-lines.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs fry kernel locals math math.vectors
-opengl sequences ui.gadgets ui.gadgets.grids.private ui.pens ;
+USING: accessors assocs kernel math math.vectors opengl
+sequences ui.gadgets ui.gadgets.grids.private ui.pens ;
 IN: ui.gadgets.grid-lines
 
 TUPLE: grid-lines color ;

diff --git a/basis/ui/gadgets/grids/grids.factor b/basis/ui/gadgets/grids/grids.factor
index 58ae904a1eea1af48e23c0dfcecb63210f59e18f..455937eccdbbee1eb7f9a8b27e53ba04bc8a0214 100644 (file)
--- a/basis/ui/gadgets/grids/grids.factor
+++ b/basis/ui/gadgets/grids/grids.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays fry kernel make math math.order
+USING: accessors arrays kernel make math math.order
 math.rectangles math.vectors sequences strings.tables
 ui.baseline-alignment ui.gadgets ;
 IN: ui.gadgets.grids

diff --git a/basis/ui/gadgets/menus/menus.factor b/basis/ui/gadgets/menus/menus.factor
index dc8675f0c6812fc877059bf4315dcdafbb92fa7a..cba52ebd2c60fea242e9cfb604f0c0c701c3ac7e 100644 (file)
--- a/basis/ui/gadgets/menus/menus.factor
+++ b/basis/ui/gadgets/menus/menus.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors combinators kernel locals math math.rectangles
-math.vectors memoize models namespaces opengl sequences sorting
+USING: accessors combinators kernel math math.rectangles
+math.vectors models namespaces opengl sequences sorting
 ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.buttons
 ui.gadgets.glass ui.gadgets.packs ui.gadgets.worlds
 ui.gadgets.wrappers ui.gestures ui.operations ui.pens

diff --git a/basis/ui/gadgets/packs/packs.factor b/basis/ui/gadgets/packs/packs.factor
index cc5281c9db1df075aeb65741f496e94075133c60..ecd6b6d7783919770f51629dc9e0138ebeb59439 100644 (file)
--- a/basis/ui/gadgets/packs/packs.factor
+++ b/basis/ui/gadgets/packs/packs.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays combinators fry kernel math math.order
+USING: accessors arrays combinators kernel math math.order
 math.vectors sequences ui.baseline-alignment
 ui.baseline-alignment.private ui.gadgets ;
 IN: ui.gadgets.packs

diff --git a/basis/ui/gadgets/panes/panes.factor b/basis/ui/gadgets/panes/panes.factor
index 139d516efc0d85f63a1796e395398143c15950ca..e2cf8b43144b6092ae3c614d890d63f55d5b41ba 100644 (file)
--- a/basis/ui/gadgets/panes/panes.factor
+++ b/basis/ui/gadgets/panes/panes.factor
@@ -1,16 +1,15 @@
 ! Copyright (C) 2005, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs classes combinators destructors
-documents.private fonts fry io io.styles kernel locals math
-math.rectangles math.vectors models namespaces sequences sets
-sorting splitting strings ui.baseline-alignment ui.clipboards
-ui.gadgets ui.gadgets.borders ui.gadgets.grid-lines
-ui.gadgets.grids ui.gadgets.icons ui.gadgets.incremental
-ui.gadgets.labels ui.gadgets.menus ui.gadgets.packs
-ui.gadgets.paragraphs ui.gadgets.presentations
-ui.gadgets.private ui.gadgets.scrollers ui.gadgets.tracks
-ui.gestures ui.images ui.pens.solid ui.render ui.theme
-ui.traverse unicode ;
+documents.private fonts io io.styles kernel math math.rectangles
+math.vectors models namespaces sequences sets sorting splitting
+strings ui.baseline-alignment ui.clipboards ui.gadgets
+ui.gadgets.borders ui.gadgets.grid-lines ui.gadgets.grids
+ui.gadgets.icons ui.gadgets.incremental ui.gadgets.labels
+ui.gadgets.menus ui.gadgets.packs ui.gadgets.paragraphs
+ui.gadgets.presentations ui.gadgets.private ui.gadgets.scrollers
+ui.gadgets.tracks ui.gestures ui.images ui.pens.solid ui.render
+ui.theme ui.traverse unicode ;
 FROM: io.styles => foreground background ;
 FROM: ui.gadgets.wrappers => <wrapper> ;
 IN: ui.gadgets.panes

diff --git a/basis/ui/render/render.factor b/basis/ui/render/render.factor
index 14ccde0e7260f8e7c56f2c8c760f633f8cec1d56..4bd4a5e087665f917c85800f6d009ef569a47dba 100644 (file)
--- a/basis/ui/render/render.factor
+++ b/basis/ui/render/render.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors colors colors.constants combinators kernel
-math.rectangles math.vectors namespaces opengl opengl.capabilities
-opengl.gl opengl.textures sequences sets ui.gadgets ui.pens ;
+USING: accessors colors combinators kernel math.rectangles
+math.vectors namespaces opengl opengl.capabilities opengl.gl
+opengl.textures sequences sets ui.gadgets ui.pens ;
 IN: ui.render
 
 SYMBOL: clip

diff --git a/basis/ui/tools/tools.factor b/basis/ui/tools/tools.factor
index 2b526eb73b1ebf9c5a24e92dc6cb7033fb4253d7..8f096d0c3d4cb1a43faf16c0acec440964aa100c 100644 (file)
--- a/basis/ui/tools/tools.factor
+++ b/basis/ui/tools/tools.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: memory namespaces system ui ui.backend ui.commands
-ui.gestures ui.tools.browser ui.tools.common
-ui.tools.error-list ui.tools.listener vocabs.refresh ;
+ui.gestures ui.tools.browser ui.tools.common ui.tools.error-list
+ui.tools.listener vocabs.refresh ;
 IN: ui.tools
 
 \ refresh-all H{ { +nullary+ t } { +listener+ t } } define-command

diff --git a/basis/ui/tools/walker/walker.factor b/basis/ui/tools/walker/walker.factor
index 6de88d52ec6314270dd1601cd4ffd6cfbbeabc47..822e2cd4c4b81faa5faedf82ac04f590bd2391e7 100644 (file)
--- a/basis/ui/tools/walker/walker.factor
+++ b/basis/ui/tools/walker/walker.factor
@@ -1,12 +1,10 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs colors colors.constants combinators
-concurrency.messaging formatting fry inspector kernel make
-models models.arrow namespaces sequences threads tools.walker ui
-ui.commands ui.gadgets ui.gadgets.buttons ui.gadgets.labels
-ui.gadgets.status-bar ui.theme ui.gadgets.toolbar
-ui.gadgets.tracks ui.gestures ui.pens.solid ui.tools.browser
-ui.tools.common ui.tools.listener ui.tools.traceback ;
+USING: accessors assocs combinators concurrency.messaging kernel
+models namespaces sequences threads tools.walker ui ui.commands
+ui.gadgets ui.gadgets.labels ui.gadgets.status-bar
+ui.gadgets.toolbar ui.gadgets.tracks ui.gestures ui.pens.solid
+ui.theme ui.tools.browser ui.tools.common ui.tools.traceback ;
 IN: ui.tools.walker
 
 TUPLE: walker-gadget < tool

diff --git a/basis/ui/ui.factor b/basis/ui/ui.factor
index 347def51fe0e4af97cf9571445cebe96d41f27db..222e79a6079ce8917609d4e3204c0b6ad8c3b457 100644 (file)
--- a/basis/ui/ui.factor
+++ b/basis/ui/ui.factor
@@ -3,10 +3,10 @@
 USING: accessors arrays assocs boxes classes.tuple
 classes.tuple.parser combinators combinators.short-circuit
 concurrency.flags concurrency.promises continuations deques
-destructors dlists fry init kernel lexer make math
-math.functions namespaces parser sequences sets strings threads
-ui.backend ui.gadgets ui.gadgets.private ui.gadgets.worlds
-ui.gestures ui.render vectors vocabs.parser words ;
+destructors dlists init kernel lexer make math math.functions
+namespaces parser sequences sets strings threads ui.backend
+ui.gadgets ui.gadgets.private ui.gadgets.worlds ui.gestures
+ui.render vectors vocabs.parser words ;
 IN: ui
 
 <PRIVATE