Changeset 4436

Timestamp:

10/17/03 17:31:38 (18 years ago)

Author:

piso

Message:

Moved getFile() to Utilities.java.

File:

• trunk/j/src/org/armedbear/lisp/probe_file.java (modified) (4 diffs)

trunk/j/src/org/armedbear/lisp/probe_file.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: probe_file.java,v 1.6 2003-09-25 13:17:54 piso Exp $
+ * $Id: probe_file.java,v 1.7 2003-10-17 17:31:38 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -29 +29 @@
     // ### probe-file
     // probe-file pathspec => truename
-    private static final Primitive1 PROBE_FILE = new Primitive1("probe-file") {
+    private static final Primitive1 PROBE_FILE = new Primitive1("probe-file")
+    {
         public LispObject execute(LispObject arg) throws ConditionThrowable
         {
-            File file = getFile(arg);
+            File file = Utilities.getFile(arg);
             if (!file.exists())
                 return NIL;
@@ -51 +52 @@
         public LispObject execute(LispObject arg) throws ConditionThrowable
         {
-            File file = getFile(arg);
+            File file = Utilities.getFile(arg);
             if (!file.isDirectory())
                 return NIL;
@@ -70 +71 @@
         public LispObject execute(LispObject arg) throws ConditionThrowable
         {
-            File file = getFile(arg);
+            File file = Utilities.getFile(arg);
             return file.isDirectory() ? T : NIL;
         }
     };
-
-    private static File getFile(LispObject pathspec) throws ConditionThrowable
-    {
-        String namestring;
-        if (pathspec instanceof LispString)
-            namestring = ((LispString)pathspec).getValue();
-        else if (pathspec instanceof Pathname)
-            namestring = ((Pathname)pathspec).getNamestring();
-        else
-            throw new ConditionThrowable(new TypeError(pathspec,
-                                                       "pathname designator"));
-        if (isNamestringAbsolute(namestring))
-            return new File(namestring);
-        return new File(
-            LispString.getValue(_DEFAULT_PATHNAME_DEFAULTS_.symbolValue()),
-            namestring);
-    }
-
-    private static boolean isNamestringAbsolute(String namestring)
-    {
-        if (System.getProperty("os.name").startsWith("Windows")) {
-            if (namestring.length() >= 3) {
-                if (namestring.charAt(1) == ':')
-                    if (namestring.charAt(2) == '\\')
-                        return true;
-            }
-        } else if (namestring.length() > 0) {
-            if (namestring.charAt(0) == '/')
-                return true;
-        }
-        return false;
-    }
 }