--- a/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java Fri Jun 26 18:39:45 2009 -0700
+++ b/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java Sat Jun 27 21:46:53 2009 +0100
@@ -26,8 +26,7 @@
package sun.nio.fs;
import java.nio.file.attribute.*;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
+import java.util.Map;
import java.io.IOException;
import sun.misc.Unsafe;
@@ -104,10 +103,10 @@
}
@Override
- public Map<String,?> readAttributes(String first, String[] rest)
+ public Map<String,?> readAttributes(String[] attributes)
throws IOException
{
- AttributesBuilder builder = AttributesBuilder.create(first, rest);
+ AttributesBuilder builder = AttributesBuilder.create(attributes);
DosFileAttributes attrs = readAttributes();
addBasicAttributesToBuilder(attrs, builder);
if (builder.match(READONLY_NAME))
@@ -132,22 +131,18 @@
return new DosFileAttributes() {
@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();
}
@@ -168,10 +163,6 @@
return attrs.size();
}
@Override
- public int linkCount() {
- return attrs.linkCount();
- }
- @Override
public Object fileKey() {
return attrs.fileKey();
}