[richfaces-svn-commits] JBoss Rich Faces SVN: r13432 - in trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld: util and 1 other directory.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Apr 8 09:18:52 EDT 2009
Author: amarkhel
Date: 2009-04-08 09:18:52 -0400 (Wed, 08 Apr 2009)
New Revision: 13432
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java
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/manager/ImageManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java
Log:
Refactor
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-04-08 13:17:26 UTC (rev 13431)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-04-08 13:18:52 UTC (rev 13432)
@@ -21,14 +21,12 @@
package org.richfaces.realworld.manager;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.List;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.contexts.Contexts;
@@ -54,12 +52,8 @@
@In private User user;
- @In FileManager fileManager;
-
@In FacesMessages facesMessages;
- @In @Out Model model;
-
@Restrict("#{s:hasRole('admin')}")
public void addAlbum(Album album){
if(album.getShelf() == null){
@@ -69,11 +63,8 @@
}
validationSuccess = true;
albumAction.addAlbum(album);
- fileManager.addDirectory(user.getLogin(), album.getId().toString());
- model.resetModel(NavigationEnum.ALBUM_PREVIEW, album.getShelf().getOwner(), album.getShelf(), album, null, album.getImages());
- model.setImages(new ArrayList<Image>());
Contexts.getConversationContext().set(Constants.ALBUM_VARIABLE, null);
- Events.instance().raiseEvent(Constants.ALBUM_ADDED_EVENT);
+ Events.instance().raiseEvent(Constants.ALBUM_ADDED_EVENT, album);
Events.instance().raiseEvent(Constants.CLEAR_TREE_EVENT);
}
@@ -96,17 +87,14 @@
@Restrict("#{s:hasRole('admin')}")
public void editAlbum(Album album){
albumAction.editAlbum(album);
- model.resetModel(NavigationEnum.ALBUM_PREVIEW, model.getSelectedUser(), model.getSelectedShelf(), album, null, album.getImages());
- Events.instance().raiseEvent(Constants.ALBUM_EDITED_EVENT);
+ Events.instance().raiseEvent(Constants.ALBUM_EDITED_EVENT, album);
}
@Restrict("#{s:hasRole('admin')}")
public void deleteAlbum(Album album){
String albumName = album.getId().toString();
albumAction.deleteAlbum(album);
- fileManager.deleteDirectory(user.getLogin(), albumName);
- model.resetModel(NavigationEnum.ALL_ALBUMS, model.getSelectedUser(), model.getSelectedShelf(), null, null, null);
- Events.instance().raiseEvent(Constants.ALBUM_DELETED_EVENT);
+ Events.instance().raiseEvent(Constants.ALBUM_DELETED_EVENT, album, user.getLogin(), albumName);
Events.instance().raiseEvent(Constants.CLEAR_TREE_EVENT);
}
@@ -124,4 +112,4 @@
public void setValidationSuccess(boolean validationSuccess) {
this.validationSuccess = validationSuccess;
}
-}
+}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-04-08 13:17:26 UTC (rev 13431)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-04-08 13:18:52 UTC (rev 13432)
@@ -31,18 +31,15 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.End;
import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Logger;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.web.RequestParameter;
-import org.jboss.seam.core.Conversation;
+import org.jboss.seam.core.Events;
import org.jboss.seam.faces.FacesMessages;
-import org.jboss.seam.log.Log;
import org.jboss.seam.security.Credentials;
import org.jboss.seam.security.Identity;
import org.jboss.seam.util.Hex;
-import org.jboss.seam.web.Session;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IUserAction;
@@ -52,13 +49,9 @@
public class Authenticator implements Serializable{
private static final long serialVersionUID = -4585673256547342140L;
-
- @In ShelfManager shelfManager;
@RequestParameter protected Long startConversation;
- @Logger Log log;
-
@In Identity identity;
@Out(required=false) User user;
@@ -67,14 +60,8 @@
@In FacesMessages facesMessages;
- @In @Out Conversation conversation;
-
@In IUserAction userAction;
-
- @In FileManager fileManager;
- @In @Out Model model;
-
private boolean loginFailed = false;
private String digestAlgorithm;
@@ -137,10 +124,7 @@
}
public String goToRegister(){
- identity.logout();
identity.unAuthenticate();
- credentials.clear();
- credentials.invalidate();
return Constants.REGISTER_OUTCOME;
}
@@ -171,14 +155,14 @@
{
if (wantLoginAnonymous()) {
identity.addRole(Constants.GUEST_ROLE);
- model.setMainArea(NavigationEnum.ANONYM);
+ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ANONYM);
return true;
}
try {
user = userAction.login(credentials.getUsername(), hash(credentials.getPassword()));
if (user != null) {
identity.addRole(Constants.ADMIN_ROLE);
- model.resetModel(NavigationEnum.ALL_SHELFS, user, null, null, null, null);
+ Events.instance().raiseEvent(Constants.AUTHENTICATED_EVENT);
setLoginFailed(false);
return true;
}
@@ -190,9 +174,6 @@
public String logout(){
identity.logout();
- identity.unAuthenticate();
- credentials.clear();
- Session.instance().invalidate();
return Constants.LOGOUT_OUTCOME;
}
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-08 13:17:26 UTC (rev 13431)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-04-08 13:18:52 UTC (rev 13432)
@@ -25,9 +25,11 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Observer;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.security.Restrict;
+import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Events;
import org.richfaces.event.DataScrollerEvent;
import org.richfaces.realworld.domain.Album;
@@ -41,19 +43,11 @@
@Scope(ScopeType.EVENT)
public class Controller implements Serializable{
- private static final String ALBUM_CREATE_ERROR = "You must create at least one shelf before creating album!";
-
private static final long serialVersionUID = 5656562187249324512L;
@In @Out Model model;
-
- @In UserManager userManager;
-
- @In ShelfManager shelfManager;
-
- @In AlbumManager albumManager;
- @In private User user;
+ @In User user;
public void selectShelfs(){
model.resetModel(NavigationEnum.ALL_SHELFS, user, null, null, null, null);
@@ -115,12 +109,12 @@
@Restrict("#{s:hasRole('admin')}")
public void editUser(){
- userManager.editUser();
+ pushEvent(Constants.EDIT_USER_EVENT);
model.resetModel(NavigationEnum.ALL_SHELFS, user, model.getSelectedShelf(), model.getSelectedAlbum(), model.getSelectedImage(), model.getImages());
}
public void cancelEditUser(){
- userManager.cancelEditUser();
+ pushEvent(Constants.CANCEL_EDIT_USER_EVENT);
model.resetModel(NavigationEnum.ALL_SHELFS, user, model.getSelectedShelf(), model.getSelectedAlbum(), model.getSelectedImage(), model.getImages());
}
@@ -128,26 +122,10 @@
model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, image.getAlbum().getShelf().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), image, image.getAlbum().getImages() );
}
- /*@Observer("resetModel")
- public void resetModel(){
- if(user.getId() != null){
- model.resetModel(NavigationEnum.ALL_SHELFS, user, null, null, null);
- }else{
- model.resetModel(NavigationEnum.ANONYM, user, null, null, null);
- }
- }*/
-
public void showShelf(Shelf shelf){
model.resetModel(NavigationEnum.SHELF_PREVIEW, shelf.getOwner(), shelf, null, null, null);
}
- public boolean isUserImage(Image image){
- if(image == null || image.getAlbum() == null || image.getAlbum().getOwner() == null){
- return false;
- }
- return image.getAlbum().getOwner().getLogin().equals(user.getLogin());
- }
-
@Restrict("#{s:hasRole('admin')}")
public void startEditAlbum(Album album){
if(!album.getOwner().getLogin().equals(user.getLogin())){
@@ -161,9 +139,49 @@
model.resetModel(NavigationEnum.ALBUM_PREVIEW, album.getShelf().getOwner(), album.getShelf(), album, null, album.getImages());
}
+ @Observer(Constants.ALBUM_ADDED_EVENT)
+ public void onAlbumAdded(Album album){
+ model.resetModel(NavigationEnum.ALBUM_PREVIEW, album.getShelf().getOwner(), album.getShelf(), album, null, album.getImages());
+ }
+
+ @Observer(Constants.ALBUM_EDITED_EVENT)
+ public void onAlbumEdited(Album album){
+ model.resetModel(NavigationEnum.ALBUM_PREVIEW, model.getSelectedUser(), model.getSelectedShelf(), album, null, album.getImages());
+ }
+
+ @Observer(Constants.ALBUM_DELETED_EVENT)
+ public void onAlbumDeleted(Album album, String... parameters ){
+ model.resetModel(NavigationEnum.ALL_ALBUMS, model.getSelectedUser(), model.getSelectedShelf(), null, null, null);
+ }
+
+ @Observer(Constants.SHELF_DELETED_EVENT)
+ public void onShelfDeleted(Shelf shelf, String... parameters){
+ model.resetModel(NavigationEnum.ALL_SHELFS, model.getSelectedUser(), null, null, null, null);
+ }
+
+ @Observer(Constants.SHELF_ADDED_EVENT)
+ public void onShelfAdded(Shelf shelf){
+ model.resetModel(NavigationEnum.SHELF_PREVIEW, shelf.getOwner(), shelf, null, null, null);
+ }
+
+ @Observer(Constants.SHELF_EDITED_EVENT)
+ public void onShelfEdited(Shelf shelf){
+ model.resetModel(NavigationEnum.SHELF_PREVIEW, shelf.getOwner(), shelf, null, null, null);
+ }
+
+ @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());
+ }
+
+ @Observer(Constants.AUTHENTICATED_EVENT)
+ public void onAuthenticate(){
+ model.resetModel(NavigationEnum.ALL_SHELFS, user, null, null, null, null);
+ }
+
public void showFileUpload(){
if(!(user.getShelfs().size() > 0)){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, ALBUM_CREATE_ERROR);
+ pushEvent(Constants.ADD_ERROR_EVENT, Constants.ALBUM_CREATE_ERROR);
return;
}
model.resetModel(NavigationEnum.FILE_UPLOAD, model.getSelectedUser(), model.getSelectedShelf(), model.getSelectedAlbum(), model.getSelectedImage(), model.getImages());
@@ -174,33 +192,26 @@
}
public void showSharedAlbums(User user){
+ UserManager userManager = (UserManager)Contexts.getEventContext().get("userManager");
model.resetModel(NavigationEnum.USER_SHARED_ALBUMS, user, null, null, null, userManager.getSharedImages(model.getSelectedUser()));
}
public void showSharedImages(User user){
+ UserManager userManager = (UserManager)Contexts.getEventContext().get("userManager");
model.resetModel(NavigationEnum.USER_SHARED_IMAGES, user, null, null, null, userManager.getSharedImages(model.getSelectedUser()));
}
- public boolean isUserShelf(Shelf shelf){
- return shelf.getOwner()!=null && shelf.getOwner().getLogin().equals(user.getLogin());
- }
-
- public boolean isUserAlbum(Album album){
- if(album == null || album.getOwner() == null){
- return false;
- }
- return album.getOwner().getLogin().equals(user.getLogin());
- }
-
public void showUser(User user){
model.resetModel(NavigationEnum.USER_PREFS, user, null, null, null, null);
}
public void showUnvisitedImages(Shelf shelf){
+ ShelfManager shelfManager = (ShelfManager)Contexts.getEventContext().get("shelfManager");
model.resetModel(NavigationEnum.SHELF_UNVISITED, shelf.getOwner(), shelf, null, null, shelfManager.getUnvisitedImages(shelf));
}
public void showUnvisitedImages(Album album){
+ AlbumManager albumManager = (AlbumManager)Contexts.getEventContext().get("albumManager");
model.resetModel(NavigationEnum.ALBUM_UNVISITED, album.getShelf().getOwner(), album.getShelf(), album, null, albumManager.getUnvisitedImages(album));
}
@@ -209,6 +220,24 @@
model.setSelectedTag(metatag);
}
+ public boolean isUserImage(Image image){
+ if(image == null || image.getAlbum() == null || image.getAlbum().getOwner() == null){
+ return false;
+ }
+ return image.getAlbum().getOwner().getLogin().equals(user.getLogin());
+ }
+
+ public boolean isUserShelf(Shelf shelf){
+ return shelf.getOwner()!=null && shelf.getOwner().getLogin().equals(user.getLogin());
+ }
+
+ public boolean isUserAlbum(Album album){
+ if(album == null || album.getOwner() == null){
+ return false;
+ }
+ return album.getOwner().getLogin().equals(user.getLogin());
+ }
+
private boolean canViewShelf(Shelf shelf) {
return shelf.getOwner().getLogin().equals(user.getLogin());
}
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-08 13:17:26 UTC (rev 13431)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-04-08 13:18:52 UTC (rev 13432)
@@ -41,8 +41,12 @@
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Observer;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.security.Restrict;
+import org.richfaces.realworld.domain.Album;
+import org.richfaces.realworld.domain.Image;
+import org.richfaces.realworld.domain.Shelf;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.service.Constants;
@@ -101,11 +105,17 @@
}
@Restrict("#{s:hasRole('admin')}")
- public void deleteDirectory(String... directories) {
- final File file = getFileByPath(joinFiles(directories).toString());
+ @Observer(Constants.ALBUM_DELETED_EVENT)
+ public void deleteDirectory(Album album, String... directories) {
+ deleteDirectory(directories);
+ }
+
+ @Observer(Constants.USER_DELETED_EVENT)
+ public void deleteDirectory(String... directories){
+ final File file = getFileByPath(joinFiles(directories).toString());
deleteDirectory(file);
}
-
+
private void deleteDirectory(File file) {
if (file.exists()) {
for (String f : file.list()) {
@@ -184,7 +194,8 @@
}
@Restrict("#{s:hasRole('admin')}")
- public void deleteImage(String fileName) {
+ @Observer(Constants.IMAGE_DELETED_EVENT)
+ public void deleteImage(Image image, String fileName) {
deleteImage(getFileByPath(fileName));
deleteImage(getFileByPath(transformPath(fileName, Constants._MEDIUM)));
deleteImage(getFileByPath(transformPath(fileName, Constants._SMALL80)));
@@ -374,7 +385,8 @@
}
@Restrict("#{s:hasRole('admin')}")
- public void deleteDirectories(Iterable<String> directoriesToDelete) {
+ @Observer(Constants.SHELF_DELETED_EVENT)
+ public void deleteDirectories(Shelf shelf, Iterable<String> directoriesToDelete) {
for (String directory : directoriesToDelete) {
deleteDirectory(directory);
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-04-08 13:17:26 UTC (rev 13431)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-04-08 13:18:52 UTC (rev 13432)
@@ -31,7 +31,6 @@
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.core.Events;
@@ -50,20 +49,14 @@
private static final String IMAGE_DIRECT_LINK = "/includes/directImage.seam?imageId=";
@In IImageAction imageAction;
-
- @In FileManager fileManager;
- @In @Out Model model;
-
@In User user;
@Restrict("#{s:hasRole('admin')}")
public void deleteImage(Image image) {
String imagePath = image.getPath();
- model.resetModel(NavigationEnum.ALBUM_PREVIEW, image.getAlbum().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), null, image.getAlbum().getImages());
imageAction.deleteImage(image);
- fileManager.deleteImage(imagePath);
- Events.instance().raiseEvent(Constants.IMAGE_DELETED_EVENT);
+ Events.instance().raiseEvent(Constants.IMAGE_DELETED_EVENT, image , imagePath);
}
@Restrict("#{s:hasRole('admin')}")
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-04-08 13:17:26 UTC (rev 13431)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-04-08 13:18:52 UTC (rev 13432)
@@ -29,7 +29,6 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Observer;
-import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.contexts.Contexts;
@@ -52,12 +51,8 @@
private List<Shelf> shelfs;
- @In FileManager fileManager;
-
@In IShelfAction shelfAction;
- @In @Out Model model;
-
@In User user;
@Restrict("#{s:hasRole('admin')}")
@@ -71,7 +66,7 @@
validationSuccess = true;
shelf.setPreDefined(false);
shelfAction.addShelf(shelf);
- model.resetModel(NavigationEnum.SHELF_PREVIEW, shelf.getOwner(), shelf, null, null, null);
+ Events.instance().raiseEvent(Constants.SHELF_ADDED_EVENT, shelf);
Events.instance().raiseEvent(Constants.CLEAR_TREE_EVENT);
}
@@ -83,7 +78,7 @@
public void editShelf(Shelf shelf) {
shelf.setPreDefined(false);
shelfAction.editShelf(shelf);
- model.resetModel(NavigationEnum.SHELF_PREVIEW, model.getSelectedUser(), shelf, null, null, null);
+ Events.instance().raiseEvent(Constants.SHELF_EDITED_EVENT, shelf);
}
@Restrict("#{s:hasRole('admin')}")
@@ -94,16 +89,10 @@
directoriesToDelete.add(user.getLogin() + Constants.SLASH + a.getId());
}
shelfAction.deleteShelf(shelf);
- deleteDirectories(directoriesToDelete);
- model.resetModel(NavigationEnum.ALL_SHELFS, model.getSelectedUser(), null, null, null, null);
- Events.instance().raiseEvent(Constants.SHELF_DELETED_EVENT);
+ Events.instance().raiseEvent(Constants.SHELF_DELETED_EVENT, shelf, directoriesToDelete);
Events.instance().raiseEvent(Constants.CLEAR_TREE_EVENT);
}
- private void deleteDirectories(List<String> directoriesToDelete) {
- fileManager.deleteDirectories(directoriesToDelete);
- }
-
public List<Shelf> getShelfs() {
if (shelfs == null) {
shelfs = shelfAction.getShelfs(user);
@@ -130,4 +119,4 @@
public void setValidationSuccess(boolean validationSuccess) {
this.validationSuccess = validationSuccess;
}
-}
+}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java 2009-04-08 13:17:26 UTC (rev 13431)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java 2009-04-08 13:18:52 UTC (rev 13432)
@@ -26,7 +26,6 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Observer;
-import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.core.Events;
import org.richfaces.realworld.domain.Image;
@@ -44,7 +43,7 @@
private boolean active;
- @In @Out Model model;
+ @In Model model;
private int interval = Constants.INITIAL_DELAY;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java 2009-04-08 13:17:26 UTC (rev 13431)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java 2009-04-08 13:18:52 UTC (rev 13432)
@@ -5,7 +5,6 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.richfaces.component.UITree;
@@ -13,7 +12,7 @@
@Scope(ScopeType.EVENT)
public class TreeManager implements Serializable{
- @In @Out Model model;
+ @In Model model;
private static final long serialVersionUID = 5656562187249324512L;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-04-08 13:17:26 UTC (rev 13431)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-04-08 13:18:52 UTC (rev 13432)
@@ -34,6 +34,7 @@
import org.jboss.seam.core.Events;
import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Image;
+import org.richfaces.realworld.domain.Shelf;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IUserAction;
@@ -83,6 +84,7 @@
return userAction.getSharedImages(user);
}
+ @Observer(Constants.EDIT_USER_EVENT)
public void editUser(){
if (avatarData != null) {
if(!fileManager.saveAvatar(avatarData.getPath(), user)){
@@ -96,6 +98,7 @@
user = userAction.updateUser();
}
+ @Observer(Constants.CANCEL_EDIT_USER_EVENT)
public void cancelEditUser() {
avatarData = null;
}
@@ -106,22 +109,22 @@
}
@Observer(Constants.IMAGE_DELETED_EVENT)
- public void onImageDeleted(){
+ public void onImageDeleted(Image image){
user.updateStatistics();
}
@Observer(Constants.ALBUM_DELETED_EVENT)
- public void onAlbumDeleted(){
+ public void onAlbumDeleted(Album album, String... parameters){
user.updateStatistics();
}
@Observer(Constants.ALBUM_ADDED_EVENT)
- public void onAlbumAdded(){
+ public void onAlbumAdded(Album album){
user.updateStatistics();
}
@Observer(Constants.SHELF_DELETED_EVENT)
- public void onShelfDeleted(){
+ public void onShelfDeleted(Shelf shelf){
user.updateStatistics();
}
}
\ 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-08 13:17:26 UTC (rev 13431)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java 2009-04-08 13:18:52 UTC (rev 13432)
@@ -10,8 +10,9 @@
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Transactional;
+import org.jboss.seam.core.Events;
import org.richfaces.realworld.domain.User;
-import org.richfaces.realworld.manager.FileManager;
+import org.richfaces.realworld.service.Constants;
@Scope(ScopeType.SESSION)
@Name("sessionListener")
@@ -22,15 +23,13 @@
@In(value="entityManager") EntityManager em;
- @In FileManager fileManager;
-
@Destroy @Transactional @Observer("org.jboss.seam.sessionExpired")
public void onDestroy(){
if(user.getId() != null && user.getId() > 3){
user = em.merge(user);
em.remove(user);
em.flush();
- fileManager.deleteDirectory(user.getLogin());
+ Events.instance().raiseEvent(Constants.USER_DELETED_EVENT, user.getLogin());
}
}
}
More information about the richfaces-svn-commits
mailing list