[richfaces-svn-commits] JBoss Rich Faces SVN: r13488 - in trunk/test-applications/realworld2/web/src/main: java/org/richfaces/realworld/manager and 2 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Fri Apr 10 07:02:18 EDT 2009
Author: amarkhel
Date: 2009-04-10 07:02:17 -0400 (Fri, 10 Apr 2009)
New Revision: 13488
Added:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_medium.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_small120.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_small160.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_small200.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_small80.jpg
Removed:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tags/
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage.jpg
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/manager/Model.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/ui/ImageLoader.java
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-10 11:02:05 UTC (rev 13487)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-04-10 11:02:17 UTC (rev 13488)
@@ -79,6 +79,11 @@
pushEvent(Constants.ADD_ERROR_EVENT, Constants.HAVENT_ACCESS);
return;
}
+ FileManager fileManager = (FileManager)Contexts.getApplicationContext().get(Constants.FILE_MANAGER_COMPONENT);
+ if(!fileManager.isDirectoryPresent(album.getPath())){
+ pushEvent(Constants.ADD_ERROR_EVENT, Constants.ALBUM_RECENTLY_DELETED_ERROR);
+ return;
+ }
model.resetModel(NavigationEnum.ALBUM_PREVIEW, album.getOwner(), album.getShelf(), album, null, album.getImages());
}
@@ -87,6 +92,11 @@
pushEvent(Constants.ADD_ERROR_EVENT, Constants.HAVENT_ACCESS);
return;
}
+ FileManager fileManager = (FileManager)Contexts.getApplicationContext().get(Constants.FILE_MANAGER_COMPONENT);
+ if(!fileManager.isFilePresent(image.getFullPath())){
+ pushEvent(Constants.ADD_ERROR_EVENT, Constants.IMAGE_RECENTLY_DELETED_ERROR);
+ return;
+ }
model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, image.getAlbum().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), image, image.getAlbum().getImages());
image.getAlbum().visitImage(image, true);
}
@@ -94,6 +104,11 @@
public void scroll(DataScrollerEvent e){
Integer index = e.getPage();
Image image = model.getSelectedAlbum().getImages().get(index - 1);
+ FileManager fileManager = (FileManager)Contexts.getApplicationContext().get(Constants.FILE_MANAGER_COMPONENT);
+ if(!fileManager.isFilePresent(image.getFullPath())){
+ pushEvent(Constants.ADD_ERROR_EVENT, Constants.IMAGE_RECENTLY_DELETED_ERROR);
+ return;
+ }
model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, image.getAlbum().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), image, image.getAlbum().getImages());
image.getAlbum().visitImage(image, true);
}
@@ -123,6 +138,11 @@
}
public void showShelf(Shelf shelf){
+ FileManager fileManager = (FileManager)Contexts.getApplicationContext().get(Constants.FILE_MANAGER_COMPONENT);
+ if(!fileManager.isDirectoryPresent(shelf.getPath())){
+ pushEvent(Constants.ADD_ERROR_EVENT, Constants.SHELF_RECENTLY_DELETED_ERROR);
+ return;
+ }
model.resetModel(NavigationEnum.SHELF_PREVIEW, shelf.getOwner(), shelf, null, null, null);
}
@@ -184,7 +204,12 @@
pushEvent(Constants.ADD_ERROR_EVENT, Constants.FILE_UPLOAD_SHOW_ERROR);
return;
}
- model.resetModel(NavigationEnum.FILE_UPLOAD, model.getSelectedUser(), model.getSelectedShelf(), model.getSelectedAlbum(), model.getSelectedImage(), model.getImages());
+ Album a = model.getSelectedAlbum();
+ if(model.getSelectedAlbum() == null){
+ if(model.getSelectedUser() != null && model.getSelectedUser().getShelfs().size() > 0 && model.getSelectedUser().getShelfs().get(0).getAlbums().size() > 0)
+ a = model.getSelectedUser().getShelfs().get(0).getAlbums().get(0);
+ }
+ model.resetModel(NavigationEnum.FILE_UPLOAD, a.getOwner(), a.getShelf(), a, model.getSelectedImage(), model.getImages());
}
public void showFileUpload(Album album){
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-10 11:02:05 UTC (rev 13487)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-04-10 11:02:17 UTC (rev 13488)
@@ -175,6 +175,16 @@
return new File(path);
}
+ public boolean isDirectoryPresent(String path){
+ final File file = getFileByPath(path);
+ return file.exists() && file.isDirectory();
+ }
+
+ public boolean isFilePresent(String path){
+ final File file = getFileByPath(path);
+ return file.exists();
+ }
+
private void deleteDirectory(String directory){
final File file = getFileByPath(directory);
FileUtils.deleteDirectory(file, false);
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java 2009-04-10 11:02:05 UTC (rev 13487)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java 2009-04-10 11:02:17 UTC (rev 13488)
@@ -52,12 +52,6 @@
Events.instance().raiseEvent(Constants.CLEAR_FILE_UPLOAD_EVENT);
}
this.mainArea = mainArea;
- if(this.mainArea != null && this.mainArea.equals(NavigationEnum.FILE_UPLOAD)){
- if(getSelectedAlbum() == null){
- if(selectedUser != null && selectedUser.getShelfs().size() > 0 && selectedUser.getShelfs().get(0).getAlbums().size() > 0)
- setSelectedAlbum(selectedUser.getShelfs().get(0).getAlbums().get(0));
- }
- }
}
public NavigationEnum getMainArea() {
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-10 11:02:05 UTC (rev 13487)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java 2009-04-10 11:02:17 UTC (rev 13488)
@@ -27,6 +27,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Observer;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Events;
import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.service.Constants;
@@ -73,6 +74,12 @@
}
this.selectedImage = model.getImages().get(this.slideshowIndex);
this.selectedImage.getAlbum().visitImage(selectedImage, true);
+ FileManager fileManager = (FileManager)Contexts.getApplicationContext().get(Constants.FILE_MANAGER_COMPONENT);
+ if(!fileManager.isFilePresent(this.selectedImage.getFullPath())){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.IMAGE_RECENTLY_DELETED_ERROR);
+ active = false;
+ return;
+ }
}
public void startSlideshow(Image selectedImage){
@@ -85,6 +92,12 @@
this.slideshowIndex = model.getImages().indexOf(selectedImage);
this.selectedImage = selectedImage;
this.selectedImage.getAlbum().visitImage(selectedImage, true);
+ FileManager fileManager = (FileManager)Contexts.getApplicationContext().get(Constants.FILE_MANAGER_COMPONENT);
+ if(!fileManager.isFilePresent(this.selectedImage.getFullPath())){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.IMAGE_RECENTLY_DELETED_ERROR);
+ active = false;
+ return;
+ }
}
@Observer(Constants.STOP_SLIDESHOW_EVENT)
@@ -120,5 +133,11 @@
slideshowIndex++;
selectedImage = model.getImages().get(slideshowIndex);
this.selectedImage.getAlbum().visitImage(selectedImage, true);
+ FileManager fileManager = (FileManager)Contexts.getApplicationContext().get(Constants.FILE_MANAGER_COMPONENT);
+ if(!fileManager.isFilePresent(this.selectedImage.getFullPath())){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.IMAGE_RECENTLY_DELETED_ERROR);
+ active = false;
+ return;
+ }
}
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java 2009-04-10 11:02:05 UTC (rev 13487)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java 2009-04-10 11:02:17 UTC (rev 13488)
@@ -59,7 +59,7 @@
paintImageToBrowser(out, imageResource);
}
- public void paintImageToBrowser(OutputStream out, File imageResource) throws IOException {
+ private void paintImageToBrowser(OutputStream out, File imageResource) throws IOException {
if (imageResource != null && imageResource.exists()) {
@@ -75,6 +75,16 @@
in.close();
}
+ }else{
+ String prefix = excludeFilePrefix(imageResource.getPath());
+ paintImage(out, fileManager.transformPath(Constants.DEFAULT_PICTURE, prefix));
+ return;
}
}
+
+ private String excludeFilePrefix(String path) {
+ final int begin = path.lastIndexOf("_");
+ final int end = path.lastIndexOf(Constants.DOT);
+ return path.substring(begin, end);
+ }
}
\ No newline at end of file
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage.jpg
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_small120.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_small120.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_small160.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_small160.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_small200.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_small200.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_small80.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/default/noimage_small80.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
More information about the richfaces-svn-commits
mailing list