Mercurial > projects > mde
diff mde/mergetag/Reader.d @ 67:108d123238c0
Changes to work with tango r3700 (post 0.99.6).
Changes to logging.
Replaced many uses of PathView with FilePath.
author | Diggory Hardy <diggory.hardy@gmail.com> |
---|---|
date | Thu, 03 Jul 2008 12:40:31 +0100 |
parents | e0839643ff52 |
children | ea58f277f487 |
line wrap: on
line diff
--- a/mde/mergetag/Reader.d Sun Jun 29 15:40:37 2008 +0100 +++ b/mde/mergetag/Reader.d Thu Jul 03 12:40:31 2008 +0100 @@ -28,10 +28,11 @@ import tango.core.Exception; // tango imports +import tango.io.FilePath; import tango.io.UnicodeFile; import Util = tango.text.Util; import ConvInt = tango.text.convert.Integer; -import tango.util.collection.model.View : View; +//import tango.util.collection.model.View : View; import tango.util.collection.HashSet : HashSet; import tango.util.log.Log : Log, Logger; @@ -53,7 +54,7 @@ * ) * */ -IReader makeReader (PathView path, DataSet ds = null, bool rdHeader = false) { +IReader makeReader (FilePath path, DataSet ds = null, bool rdHeader = false) { if (path.ext == "mtb") return new MTBReader (path, ds, rdHeader); else if (path.ext == "mtt") return new MTTReader (path, ds, rdHeader); else throw new MTFileIOException ("Invalid mergetag extension"); @@ -63,7 +64,7 @@ * * Tries adding both ".mtt" and ".mtb" extensions, returning whichever exists (the most recently * modified if both exist), or returns null if neither exist. */ -PathView findFile (char[] path) { +FilePath findFile (char[] path) { if (path is null) return null; FilePath tPath = new FilePath (path ~ ".mtt"); @@ -213,7 +214,7 @@ this (new FilePath (path), ds, rdHeader); } /** ditto */ - public this (PathView path, DataSet ds = null, bool rdHeader = false) { + public this (FilePath path, DataSet ds = null, bool rdHeader = false) { // Create a dataset or use an existing one if (ds !is null) _dataset = ds; else _dataset = new DataSet();