[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 11df4a84e99af14de4d1570cc5b8dca95c4275af
Author: John Goerzen <jgoerzen at complete.org>
Date:   Thu Nov 23 01:28:50 2006 +0100

    Rename StatusBar to ProgressMeter

diff --git a/MissingH/StatusBar.hs b/MissingH/ProgressMeter.hs
similarity index 91%
rename from MissingH/StatusBar.hs
rename to MissingH/ProgressMeter.hs
index 0b69d95..aa9c3e9 100644
--- a/MissingH/StatusBar.hs
+++ b/MissingH/ProgressMeter.hs
@@ -30,7 +30,7 @@ as a layer atop "MissingH.ProgressTracker".
 
 Written by John Goerzen, jgoerzen\@complete.org -}
 
-module MissingH.StatusBar (
+module MissingH.ProgressMeter (
                           )
 
 where
@@ -39,13 +39,13 @@ import Control.Concurrent.MVar
 import MissingH.Str
 import MissingH.Time
 
-data StatusBar = 
-    StatusBar {masterP :: ProgressTracker,
+data ProgressMeterR = 
+    ProgressMeterR {masterP :: ProgressTracker,
                components :: [ProgressTracker],
                width :: Int,
                renderer :: Integer -> String}
 
-type Status = MVar StatusBar
+type ProgressMeter = MVar ProgressMeterR
 
 {- | Set up a new status bar. -}
 newStatus :: ProgressTracker    -- ^ The top-level 'ProgressTracker'
@@ -53,12 +53,12 @@ newStatus :: ProgressTracker    -- ^ The top-level 'ProgressTracker'
           -> (Integer -> String)-- ^ A function to render sizes
           -> IO Status
 newStatus tracker w rfunc = 
-    newMVar $ StatusBar {masterP = tracker, components = [],
+    newMVar $ ProgressMeterR {masterP = tracker, components = [],
                          width = w, renderer = rfunc}
 
 {- | Render the current status. -}
-renderStatus :: Status -> IO String
-renderStatus r = withMVar r $ \status ->
+renderMeter :: Status -> IO String
+renderMeter r = withMVar r $ \status ->
     do overallpct <- renderpct (masterP status)
        components <- mapM rendercomponent (renderer status) (components status)
        let componentstr = case join " " components of
diff --git a/MissingH/ProgressTracker.hs b/MissingH/ProgressTracker.hs
index 8f60e73..74d373a 100644
--- a/MissingH/ProgressTracker.hs
+++ b/MissingH/ProgressTracker.hs
@@ -29,7 +29,7 @@ Tools for tracking the status of a long operation.
 
 Written by John Goerzen, jgoerzen\@complete.org 
 
-See also "MissingH.StatusBar" -}
+See also "MissingH.ProgressMeter" -}
 
 module MissingH.ProgressTracker (
                                  -- * Introduction

-- 
haskell-testpack