Author: amarkhel
Date: 2009-04-14 07:57:36 -0400 (Tue, 14 Apr 2009)
New Revision: 13559
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml
Log:
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java
===================================================================
---
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-04-14
11:57:28 UTC (rev 13558)
+++
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-04-14
11:57:36 UTC (rev 13559)
@@ -185,7 +185,7 @@
@Observer(Constants.IMAGE_DELETED_EVENT)
public void onImageDeleted(Image image, String path){
- model.resetModel(NavigationEnum.ALBUM_PREVIEW, image.getAlbum().getOwner(),
image.getAlbum().getShelf(), image.getAlbum(), null, image.getAlbum().getImages());
+ model.resetModel(NavigationEnum.ALBUM_PREVIEW, model.getSelectedUser(),
model.getSelectedShelf(), model.getSelectedAlbum(), null,
model.getSelectedAlbum().getImages());
}
@Observer(Constants.AUTHENTICATED_EVENT)
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java
===================================================================
---
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-04-14
11:57:28 UTC (rev 13558)
+++
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-04-14
11:57:36 UTC (rev 13559)
@@ -107,6 +107,18 @@
deleteDirectory(user.getPath());
}
+ @Observer(Constants.SHELF_ADDED_EVENT)
+ public void onShelfAdded(Shelf shelf){
+ File directory = getFileByPath(shelf.getPath());
+ FileUtils.addDirectory(directory);
+ }
+
+ @Observer(Constants.ALBUM_ADDED_EVENT)
+ public void onShelfAdded(Album album){
+ File directory = getFileByPath(album.getPath());
+ FileUtils.addDirectory(directory);
+ }
+
@Restrict("#{s:hasRole('admin')}")
public boolean saveAvatar(String path, User user) {
return writeFile(user.getPath() +
@@ -166,6 +178,9 @@
}
public String transformPath(String target, String substitute) {
+ if(target.length()<2 || target.lastIndexOf(Constants.DOT) == -1){
+ return "";
+ }
final String begin = target.substring(0, target.lastIndexOf(Constants.DOT));
final String end = target.substring(target.lastIndexOf(Constants.DOT));
return begin + substitute + end;
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java
===================================================================
---
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java 2009-04-14
11:57:28 UTC (rev 13558)
+++
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java 2009-04-14
11:57:36 UTC (rev 13559)
@@ -206,4 +206,11 @@
return ret;
}
+
+ public static void addDirectory(File directory) {
+ if (directory.exists()) {
+ deleteDirectory(directory, false);
+ }
+ directory.mkdirs();
+ }
}
\ No newline at end of file
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java
===================================================================
---
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java 2009-04-14
11:57:28 UTC (rev 13558)
+++
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java 2009-04-14
11:57:36 UTC (rev 13559)
@@ -25,11 +25,11 @@
@Destroy @Transactional @Observer("org.jboss.seam.sessionExpired")
public void onDestroy(){
- if(user.getId() != null && !user.isPreDefined()){
+ /*if(user.getId() != null && !user.isPreDefined()){
user = em.merge(user);
em.remove(user);
em.flush();
Events.instance().raiseEvent(Constants.USER_DELETED_EVENT, user);
- }
+ }*/
}
}
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
---
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml 2009-04-14
11:57:28 UTC (rev 13558)
+++
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml 2009-04-14
11:57:36 UTC (rev 13559)
@@ -8,7 +8,7 @@
<locale-config>
<default-locale>en</default-locale>
<supported-locale>en</supported-locale>
- <supported-locale>ru</supported-locale>
+ <!-- <supported-locale>ru</supported-locale>-->
</locale-config>
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
</application>
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml
===================================================================
(Binary files differ)