[re]-merged in Brians stuff

[org.ibex.js.git] / src / org / ibex / js / Directory.java

diff --git a/src/org/ibex/js/Directory.java b/src/org/ibex/js/Directory.java
index 17adab7..98469d5 100644 (file)
--- a/src/org/ibex/js/Directory.java
+++ b/src/org/ibex/js/Directory.java
@@ -43,6 +43,7 @@ public class Directory extends JS {
      *  Create the directory object.  Existing directories will be
      *  preserved; if a file is present it will be obliterated.
      */ 
+
     public Directory(File f) throws IOException {
         this.f = f;
         if (!f.exists()) new Directory(new File(f.getParent()));
@@ -59,38 +60,34 @@ public class Directory extends JS {
         f.delete();
     }
 
-    public void put(Object key0, Object val) throws JSExn {
+    public void put(JS key0, JS val) throws JSExn {
         try {
             if (key0 == null) return;
             String key = toString(key0);
             File f2 = new File(f.getAbsolutePath() + File.separatorChar + FileNameEncoder.encode(key));
             destroy(f2);
             if (val == null) return;
-            if (val instanceof JS) {
+            if (val instanceof JSPrimitive) {
+                OutputStream out = new FileOutputStream(f2);
+                Writer w = new OutputStreamWriter(out);
+                w.write(toString(val));
+                w.flush();
+                out.close();
+            } else {
                 Directory d2 = new Directory(f2);
-                Enumeration e = ((JS)val).keys();
+                JS.Enumeration e = val.keys();
                 while(e.hasMoreElements()) {
-                    String k = (String)e.nextElement();
-                    Object v = ((JS)val).get(k);
+                    JS k = e.nextElement();
+                    JS v = val.get(k);
                     d2.put(k, v);
                 }
-            } else {
-                OutputStream out = new FileOutputStream(f2);
-                try {
-                    Writer w = new OutputStreamWriter(out);
-                    w.write(toString(val));
-                    w.flush();
-                } finally {
-                    out.close();
-                }
             }
         } catch (IOException ioe) {
             throw new JSExn.IO(ioe);
         }
     }
 
-    public Object get(Object key0) throws JSExn {
-        FileInputStream fis = null;
+    public JS get(JS key0) throws JSExn {
         try {
             if (key0 == null) return null;
             String key = toString(key0);
@@ -99,30 +96,23 @@ public class Directory extends JS {
             if (f2.isDirectory()) return new Directory(f2);
             char[] chars = new char[((int)f2.length()) * 2];
             int numchars = 0;
-            fis = new FileInputStream(f2);
-            Reader r = new InputStreamReader(fis);
+            Reader r = new InputStreamReader(new FileInputStream(f2));
             while(true) {
                 int numread = r.read(chars, numchars, chars.length - numchars);
-                if (numread == -1) return new String(chars, 0, numchars);
+                if (numread == -1) return JS.S(new String(chars, 0, numchars));
                 numchars += numread;
             }
         } catch (IOException ioe) {
             throw new JSExn.IO(ioe);
-        } finally {
-            try {
-                if (fis != null) fis.close();
-            } catch (IOException ioe) {
-                throw new JSExn.IO(ioe);
-            }
         }
     }
 
     public Enumeration keys() {
         final String[] elements = f.list();
-        return new Enumeration() {
+        return new Enumeration(null) {
                 int i = 0;
-                public boolean hasMoreElements() { return i < elements.length; }
-                public Object nextElement() { return FileNameEncoder.decode(elements[i++]); }
+                public boolean _hasMoreElements() { return i < elements.length; }
+                public JS _nextElement() { return JS.S(FileNameEncoder.decode(elements[i++])); }
             };
     }
 }