remove inner class

puniverse · Jan 23, 2015 · 6efbf73 · 6efbf73
1 parent df8e2d5
commit 6efbf73
Showing 1 changed file with 11 additions and 24 deletions.
diff --git a/capsule/src/main/java/Capsule.java b/capsule/src/main/java/Capsule.java
@@ -3235,33 +3235,20 @@ private static Path createDirsWithSamePermissionsAsParent(Path dir) throws IOExc
             parent = parent.getParent();
 
         final List<FileAttribute> attrs = new ArrayList<>();
-        if (parent != null) {
-            final PosixFileAttributeView posix = Files.getFileAttributeView(parent, PosixFileAttributeView.class);
-            if (posix != null)
-                attrs.add(PosixFilePermissions.asFileAttribute(posix.readAttributes().permissions()));
-            final AclFileAttributeView aclv = Files.getFileAttributeView(parent, AclFileAttributeView.class);
-            if (aclv != null)
-                attrs.add(asFileAttribute(aclv.getAcl()));
-        }
-
-        Files.createDirectories(dir, attrs.toArray(new FileAttribute[attrs.size()]));
-        return dir;
-    }
 
-    private static FileAttribute<List<AclEntry>> asFileAttribute(List<AclEntry> acl0) {
-        final List<AclEntry> acl = unmodifiableList(new ArrayList<>(acl0));
-        return new FileAttribute<List<AclEntry>>() {
+        final PosixFileAttributeView posix = Files.getFileAttributeView(parent, PosixFileAttributeView.class);
+        if (posix != null)
+            attrs.add(PosixFilePermissions.asFileAttribute(posix.readAttributes().permissions()));
+        final AclFileAttributeView aclv = Files.getFileAttributeView(parent, AclFileAttributeView.class);
+        List<AclEntry> acl = null;
+        if (aclv != null)
+            acl = unmodifiableList(new ArrayList<>(aclv.getAcl()));
 
-            @Override
-            public String name() {
-                return "acl:acl";
-            }
+        Files.createDirectories(dir, attrs.toArray(new FileAttribute[attrs.size()]));
 
-            @Override
-            public List<AclEntry> value() {
-                return acl;
-            }
-        };
+        if (acl != null)
+            Files.getFileAttributeView(dir, AclFileAttributeView.class).setAcl(acl);
+        return dir;
     }
 
     /**