changeset 112:cfb304d22f28

merge
author Frank Benoit <benoit@tionex.de>
date Sun, 06 Jul 2008 23:36:31 +0200
parents cfd5fa2ce475 (current diff) 5fe95b1ccf68 (diff)
children 7194dba256b8
files
diffstat 1 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/jface/FileTreeViewer.d	Sun Jul 06 18:53:29 2008 +0200
+++ b/jface/FileTreeViewer.d	Sun Jul 06 23:36:31 2008 +0200
@@ -35,7 +35,12 @@
 //import dwt.dwthelper.utils;
 //------------------------------------
 
+version(TANGOSVN){
+import tango.io.FileSystem;
+}
+else{
 import tango.io.FileRoots;
+}
 import tango.io.FilePath;
 import tango.util.log.Trace;
 
@@ -128,6 +133,16 @@
     public override Object[] getElements( Object arg0 ){
         Object[] res;
 
+version(TANGOSVN){
+        foreach( root; FileSystem.roots()){
+            // ignore floppy drives, they bring up strange error messages
+            if( root == `A:\`|| root == `B:\` ){
+                continue;
+            }
+            res ~= new FilePath( root );
+        }
+}
+else{
         foreach( root; FileRoots.list()){
             // ignore floppy drives, they bring up strange error messages
             if( root == `A:\`|| root == `B:\` ){
@@ -135,7 +150,7 @@
             }
             res ~= new FilePath( root );
         }
-
+}
         return res;
     }