From 5f23cf9f2efbf7c8263931df8bb98d7148b790aa Mon Sep 17 00:00:00 2001
From: Erik Brakkee <erik@brakkee.org>
Date: Wed, 25 Sep 2013 23:31:17 +0200
Subject: [PATCH] Creating folders is now working. Fixed problem with
 CachedObject in the utilities library.

---
 pom.xml                                       |  2 +-
 .../model/authorization/AuthorizedAlbum.java  | 38 +++++-----
 .../model/filesystem/FileSystemAlbum.java     | 70 +++++++++++--------
 .../org/wamblee/photos/wicket/AlbumPanel.html |  1 +
 .../org/wamblee/photos/wicket/AlbumPanel.java |  2 +
 5 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/pom.xml b/pom.xml
index dc1ba4a..6546fc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <properties>
         <wicket.version>1.4.9</wicket.version>
         <jetty.version>6.1.4</jetty.version>
-        <utils.version>0.6</utils.version>
+        <utils.version>0.8-SNAPSHOT</utils.version>
     </properties>
 
     <!--
diff --git a/src/main/java/org/wamblee/photos/model/authorization/AuthorizedAlbum.java b/src/main/java/org/wamblee/photos/model/authorization/AuthorizedAlbum.java
index f76fd09..b59aafe 100644
--- a/src/main/java/org/wamblee/photos/model/authorization/AuthorizedAlbum.java
+++ b/src/main/java/org/wamblee/photos/model/authorization/AuthorizedAlbum.java
@@ -66,8 +66,7 @@ public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
             @PhotoCache Cache<String, ArrayList<PhotoEntry>> aCache, HttpSession aSession) {
         super(aAlbum);
         _authorizer = aService;
-        _authorizedEntries = new CachedObject<String, ArrayList<PhotoEntry>>(aCache,
-                "session:" + aSession.getId() + "/" + aAlbum.getPath(),
+        _authorizedEntries = new CachedObject<>(aCache, "session:" + aSession.getId() + "/" + aAlbum.getPath(),
                 new CachedObject.Computation<String, ArrayList<PhotoEntry>>() {
                     public ArrayList<PhotoEntry> getObject(String aObjectKey) {
                         return AuthorizedAlbum.this.compute();
@@ -83,7 +82,7 @@ public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
      */
     private synchronized ArrayList<PhotoEntry> compute() {
         LOGGER.info("Refreshing cache " + getPath());
-        ArrayList<PhotoEntry> result = new ArrayList<PhotoEntry>();
+        ArrayList<PhotoEntry> result = new ArrayList<>();
         for (int i = 0; i < decorated().size(); i++) {
             PhotoEntry entry = decorated().getEntry(i);
             if (_authorizer.isAllowed(entry, new ReadOperation())) {
@@ -182,13 +181,11 @@ public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
      *      java.io.InputStream)
      */
     public void addImage(String aId, InputStream aImage) throws IOException {
-        _authorizer.check(this, new WriteOperation());
-        int oldsize = _authorizedEntries.get().size();
-        _authorizedEntries.invalidate();
-        decorated().addImage(aId, aImage);
-        int newsize = _authorizedEntries.get().size();
-        if (newsize != oldsize + 1) {
-            throw new RuntimeException("cache was not refreshed property");
+        try {
+            _authorizer.check(this, new WriteOperation());
+            decorated().addImage(aId, aImage);
+        } finally {
+            _authorizedEntries.invalidate();
         }
     }
 
@@ -198,9 +195,12 @@ public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
      * @see org.wamblee.photos.model.Album#addAlbum(java.lang.String)
      */
     public void addAlbum(String aId) throws IOException {
-        _authorizer.check(this, new WriteOperation());
-        _authorizedEntries.invalidate();
-        decorated().addAlbum(aId);
+        try {
+            _authorizer.check(this, new WriteOperation());
+            decorated().addAlbum(aId);
+        } finally {
+            _authorizedEntries.invalidate();
+        }
     }
 
     /*
@@ -209,10 +209,14 @@ public class AuthorizedAlbum extends AuthorizedPhotoEntry implements Album {
      * @see org.wamblee.photos.model.Album#removeEntry(java.lang.String)
      */
     public void removeEntry(String aId) throws IOException {
-        // Check whether deletion is allowed.
-        PhotoEntry entry = _authorizer.check(decorated().getEntry("/" + aId), new DeleteOperation());
-        _authorizedEntries.invalidate();
-        decorated().removeEntry(aId);
+        try {
+            // Check whether deletion is allowed.
+            PhotoEntry entry = _authorizer.check(decorated().getEntry("/" + aId), new DeleteOperation());
+            _authorizedEntries.invalidate();
+            decorated().removeEntry(aId);
+        } finally {
+            _authorizedEntries.invalidate();
+        }
     }
 
     public Photo findPhotoBefore(String aId) {
diff --git a/src/main/java/org/wamblee/photos/model/filesystem/FileSystemAlbum.java b/src/main/java/org/wamblee/photos/model/filesystem/FileSystemAlbum.java
index fcf4695..011381b 100644
--- a/src/main/java/org/wamblee/photos/model/filesystem/FileSystemAlbum.java
+++ b/src/main/java/org/wamblee/photos/model/filesystem/FileSystemAlbum.java
@@ -496,28 +496,32 @@ public class FileSystemAlbum implements Album {
      * @see org.wamblee.photos.database.Album#addAlbum(java.lang.String)
      */
     public void addAlbum(String aId) throws IOException {
-        PhotoEntry entry = find(aId);
-        if (entry != null) {
-            throw new IOException("Entry already exists in album " + getId() +
-                    " : " + aId);
-        }
-        // Entry not yet found. Try to create it.
-        File albumDir = new File(_dir, aId);
-        if (!albumDir.mkdir()) {
-            throw new IOException("Could not create album: " + aId);
-        }
-        File photosDir = new File(albumDir, PHOTOS_DIR);
-        if (!photosDir.mkdir()) {
-            throw new IOException("Could  not create photo storage dir: " + photosDir.getPath());
-        }
-        File thumbnailsDir = new File(albumDir, THUMBNAILS_DIR);
-        if (!thumbnailsDir.mkdir()) {
-            throw new IOException("Coul dnot create thumbnails storage dir: " + thumbnailsDir.getPath());
+        try {
+            PhotoEntry entry = find(aId);
+            if (entry != null) {
+                throw new IOException("Entry already exists in album " + getId() +
+                        " : " + aId);
+            }
+            // Entry not yet found. Try to create it.
+            File albumDir = new File(_dir, aId);
+            if (!albumDir.mkdir()) {
+                throw new IOException("Could not create album: " + aId);
+            }
+            File photosDir = new File(albumDir, PHOTOS_DIR);
+            if (!photosDir.mkdir()) {
+                throw new IOException("Could  not create photo storage dir: " + photosDir.getPath());
+            }
+            File thumbnailsDir = new File(albumDir, THUMBNAILS_DIR);
+            if (!thumbnailsDir.mkdir()) {
+                throw new IOException("Coul dnot create thumbnails storage dir: " + thumbnailsDir.getPath());
+            }
+            String newPath = _path + "/" + aId;
+            newPath = newPath.replaceAll("//", "/");
+            FileSystemAlbum album = new FileSystemAlbum(albumDir, newPath, _entries.getCache());
+            addEntry(album);
+        } finally {
+            _entries.invalidate();
         }
-        String newPath = _path + "/" + aId;
-        newPath = newPath.replaceAll("//", "/");
-        FileSystemAlbum album = new FileSystemAlbum(albumDir, newPath, _entries.getCache());
-        addEntry(album);
     }
 
     /*
@@ -526,16 +530,20 @@ public class FileSystemAlbum implements Album {
      * @see org.wamblee.photos.database.Album#removeAlbum(java.lang.String)
      */
     public void removeEntry(String aId) throws IOException {
-        PhotoEntry entry = find(aId);
-        if (entry == null) {
-            throw new IOException("Entry " + aId + " not found.");
-        }
-        if (entry instanceof FileSystemAlbum) {
-            // album.
-            removeAlbum((FileSystemAlbum) entry);
-        } else {
-            // regular photo
-            removePhoto(entry);
+        try {
+            PhotoEntry entry = find(aId);
+            if (entry == null) {
+                throw new IOException("Entry " + aId + " not found.");
+            }
+            if (entry instanceof FileSystemAlbum) {
+                // album.
+                removeAlbum((FileSystemAlbum) entry);
+            } else {
+                // regular photo
+                removePhoto(entry);
+            }
+        } finally {
+            _entries.invalidate();
         }
     }
 
diff --git a/src/main/java/org/wamblee/photos/wicket/AlbumPanel.html b/src/main/java/org/wamblee/photos/wicket/AlbumPanel.html
index 0786ab4..c6e0d9f 100644
--- a/src/main/java/org/wamblee/photos/wicket/AlbumPanel.html
+++ b/src/main/java/org/wamblee/photos/wicket/AlbumPanel.html
@@ -50,6 +50,7 @@
     </div>
     <div id="upload">
         <span wicket:id="uploadPanel"/>
+        <span wicket:id="createFolderPanel"/>
     </div>
 </wicket:panel>
 
diff --git a/src/main/java/org/wamblee/photos/wicket/AlbumPanel.java b/src/main/java/org/wamblee/photos/wicket/AlbumPanel.java
index 71ea87c..a84c870 100644
--- a/src/main/java/org/wamblee/photos/wicket/AlbumPanel.java
+++ b/src/main/java/org/wamblee/photos/wicket/AlbumPanel.java
@@ -247,8 +247,10 @@ public class AlbumPanel extends Panel {
         // upload panel
         if (path.equals("/")) {
             add(new WebMarkupContainer("uploadPanel"));
+            add(new WebMarkupContainer("createFolderPanel"));
         } else {
             add(new UploadPanel("uploadPanel", path));
+            add(new CreateFolderPanel("createFolderPanel", path));
         }
     }
 
-- 
2.31.1