[richfaces-svn-commits] JBoss Rich Faces SVN: r13539 - in trunk/test-applications/realworld2/web/src/main: java/org/richfaces/realworld/search and 3 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Apr 13 12:46:37 EDT 2009
Author: amarkhel
Date: 2009-04-13 12:46:37 -0400 (Mon, 13 Apr 2009)
New Revision: 13539
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/FileManager.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/UserManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageScroller.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search.xhtml
Log:
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-13 16:46:21 UTC (rev 13538)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-04-13 16:46:37 UTC (rev 13539)
@@ -21,7 +21,6 @@
package org.richfaces.realworld.manager;
import java.io.Serializable;
-import java.util.List;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.AutoCreate;
@@ -33,7 +32,6 @@
import org.jboss.seam.core.Events;
import org.jboss.seam.faces.FacesMessages;
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;
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-13 16:46:21 UTC (rev 13538)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-04-13 16:46:37 UTC (rev 13539)
@@ -113,6 +113,7 @@
return null;
}
user.setPasswordHash(hash(user.getPassword()));
+ user.setPreDefined(false);
try{
userAction.register(user);
}
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-13 16:46:21 UTC (rev 13538)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-04-13 16:46:37 UTC (rev 13539)
@@ -201,16 +201,20 @@
@Observer(Constants.IMAGE_DRAGGED_EVENT)
public void renameImageFile(Image image, String pathOld){
- File file = getFileByPath(pathOld);
- File file2 = getFileByPath(image.getFullPath());
- if(file2.exists()){
- if(file2.isDirectory()){
- FileUtils.deleteDirectory(file2, false);
- }else{
- FileUtils.deleteFile(file2);
+ File file = null;
+ File file2 = null;
+ for(ImageDimension dimension : ImageDimension.values()){
+ file = getFileByPath(transformPath(pathOld, dimension.getFilePostfix()));
+ file2 = getFileByPath(transformPath(image.getFullPath(), dimension.getFilePostfix()));
+ if(file2.exists()){
+ if(file2.isDirectory()){
+ FileUtils.deleteDirectory(file2, false);
+ }else{
+ FileUtils.deleteFile(file2);
+ }
}
+ file.renameTo(file2);
}
- file.renameTo(file2);
}
private void deleteDirectory(String directory){
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-13 16:46:21 UTC (rev 13538)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-04-13 16:46:37 UTC (rev 13539)
@@ -32,7 +32,6 @@
import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Events;
-import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.domain.Shelf;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.service.Constants;
@@ -62,7 +61,6 @@
@Restrict("#{s:hasRole('admin')}")
public void addShelf(Shelf shelf) {
validationSuccess = true;
- shelf.setPreDefined(false);
try{
shelfAction.addShelf(shelf);
}catch(Exception e){
@@ -79,7 +77,6 @@
@Restrict("#{s:hasRole('admin')}")
public void editShelf(Shelf shelf) {
- shelf.setPreDefined(false);
try{
shelfAction.editShelf(shelf);
}catch(Exception e){
@@ -113,7 +110,7 @@
public void clearShelfs() {
shelfs = null;
}
-
+
public boolean isValidationSuccess() {
return validationSuccess;
}
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-13 16:46:21 UTC (rev 13538)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-04-13 16:46:37 UTC (rev 13539)
@@ -22,7 +22,6 @@
import java.io.File;
import java.io.Serializable;
-import java.util.List;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.AutoCreate;
@@ -32,8 +31,6 @@
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.core.Events;
-import org.richfaces.realworld.domain.Album;
-import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IUserAction;
@@ -63,6 +60,7 @@
avatarData.delete();
avatarData = null;
user.setHasAvatar(true);
+ user.setPreDefined(false);
}try{
user = userAction.updateUser();
}catch(Exception e){
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-04-13 16:46:21 UTC (rev 13538)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-04-13 16:46:37 UTC (rev 13539)
@@ -116,7 +116,6 @@
this.selectedOption = selectedOption;
}
- @Out
public List<ISearchOption> getOptions() {
return options;
}
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-13 16:46:21 UTC (rev 13538)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java 2009-04-13 16:46:37 UTC (rev 13539)
@@ -25,7 +25,7 @@
@Destroy @Transactional @Observer("org.jboss.seam.sessionExpired")
public void onDestroy(){
- if(user.getId() != null && user.getId() > 3){
+ if(user.getId() != null && !user.isPreDefined()){
user = em.merge(user);
em.remove(user);
em.flush();
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageScroller.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageScroller.xhtml 2009-04-13 16:46:21 UTC (rev 13538)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageScroller.xhtml 2009-04-13 16:46:37 UTC (rev 13539)
@@ -4,7 +4,6 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
-
<h:panelGroup layout="block" id="imagesTable"
style="margin: 30px 0px 40px 30px; float: left; position: relative; left: -2px;">
<a4j:repeat value="#{model.selectedAlbum.images}" rows="5" var="img"
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search.xhtml
===================================================================
(Binary files differ)
More information about the richfaces-svn-commits
mailing list