--- a/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java Thu Jan 13 22:21:58 2011 -0800
+++ b/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java Fri Jan 28 09:28:43 2011 +0000
@@ -45,15 +45,6 @@
}
@Override
- public final Object getAttribute(String attribute) throws IOException {
- if (attribute.equals(OWNER_NAME))
- return getOwner();
- if (attribute.equals(ACL_NAME))
- return getAcl();
- return null;
- }
-
- @Override
@SuppressWarnings("unchecked")
public final void setAttribute(String attribute, Object value)
throws IOException
@@ -71,7 +62,7 @@
}
@Override
- public final Map<String,?> readAttributes(String[] attributes)
+ public final Map<String,Object> readAttributes(String[] attributes)
throws IOException
{
boolean acl = false;
@@ -91,7 +82,7 @@
continue;
}
}
- Map<String,Object> result = new HashMap<String,Object>(2);
+ Map<String,Object> result = new HashMap<>(2);
if (acl)
result.put(ACL_NAME, getAcl());
if (owner)