--- a/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java	Fri Jun 26 18:39:45 2009 -0700
+++ b/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java	Sat Jun 27 21:46:53 2009 +0100
@@ -97,9 +97,13 @@
     long ino()  { return st_ino; }
     long dev()  { return st_dev; }
     long rdev() { return st_rdev; }
+    int nlink() { return st_nlink; }
     int uid()   { return st_uid; }
     int gid()   { return st_gid; }
-    long ctime() { return st_ctime; }
+
+    FileTime ctime() {
+        return FileTime.from(st_ctime, TimeUnit.SECONDS);
+    }
 
     boolean isDevice() {
         int type = st_mode & UnixConstants.S_IFMT;
@@ -109,23 +113,18 @@
     }
 
     @Override
-    public long lastModifiedTime() {
-        return st_mtime;
+    public FileTime lastModifiedTime() {
+        return FileTime.from(st_mtime, TimeUnit.SECONDS);
     }
 
     @Override
-    public long lastAccessTime() {
-        return st_atime;
+    public FileTime lastAccessTime() {
+        return FileTime.from(st_atime, TimeUnit.SECONDS);
     }
 
     @Override
-    public long creationTime() {
-        return -1L;
-    }
-
-    @Override
-    public TimeUnit resolution() {
-        return TimeUnit.MILLISECONDS;
+    public FileTime creationTime() {
+        return null;
     }
 
     @Override
@@ -157,11 +156,6 @@
     }
 
     @Override
-    public int linkCount() {
-        return st_nlink;
-    }
-
-    @Override
     public UnixFileKey fileKey() {
         if (key == null) {
             synchronized (this) {
@@ -260,22 +254,18 @@
         }
 
         @Override
-        public long lastModifiedTime() {
+        public FileTime lastModifiedTime() {
             return attrs.lastModifiedTime();
         }
         @Override
-        public long lastAccessTime() {
+        public FileTime lastAccessTime() {
             return attrs.lastAccessTime();
         }
         @Override
-        public long creationTime() {
+        public FileTime creationTime() {
             return attrs.creationTime();
         }
         @Override
-        public TimeUnit resolution() {
-            return attrs.resolution();
-        }
-        @Override
         public boolean isRegularFile() {
             return attrs.isRegularFile();
         }
@@ -296,10 +286,6 @@
             return attrs.size();
         }
         @Override
-        public int linkCount() {
-            return attrs.linkCount();
-        }
-        @Override
         public Object fileKey() {
             return attrs.fileKey();
         }