Author: amarkhel Date: 2008-11-25 05:31:53 -0500 (Tue, 25 Nov 2008) New Revision: 11350 Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java Log: Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java =================================================================== --- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java 2008-11-25 09:39:51 UTC (rev 11349) +++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java 2008-11-25 10:31:53 UTC (rev 11350) @@ -29,4 +29,6 @@ @Destroy public abstract void destroy(); + public abstract void addImage(Image image); + } \ No newline at end of file Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java =================================================================== --- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2008-11-25 09:39:51 UTC (rev 11349) +++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2008-11-25 10:31:53 UTC (rev 11350) @@ -72,4 +72,9 @@ } em.flush(); } + + public void addImage(Image image) { + em.persist(image); + em.flush(); + } } Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java 2008-11-25 09:39:51 UTC (rev 11349) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java 2008-11-25 10:31:53 UTC (rev 11350) @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; +import java.util.Date; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; @@ -34,7 +35,10 @@ import org.jboss.seam.faces.FacesMessages; import org.richfaces.event.UploadEvent; import org.richfaces.model.UploadItem; +import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.domain.User; +import org.richfaces.realworld.tree.TreeActionManager; +import org.richfaces.realworld.tree.TreeSelectionManager; /** * @author $Autor$ @@ -45,6 +49,15 @@ @Synchronized(timeout=2000) public class FileUploadBean { + @In @Out + private User user; + + @In + TreeSelectionManager treeSelectionManager; + + @In + TreeActionManager treeActionManager; + @In(create=true) private FileManager fileManager; @@ -90,20 +103,44 @@ public void storeSelectedData() { for(FileItem file:files){ if(file.isSelected()){ - //TODO //Save file to disk - //Update tree + String fileName = user.getLogin() + fileManager.getFileSeparator() + treeSelectionManager.getSelectedAlbumItem().getAlbum().getName() + fileManager.getFileSeparator() + file.getName(); + try { + fileManager.addImage(fileName , file.getData()); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } //Update domain model + Image image = new Image(); + image.setCreated(new Date()); + image.setPath(file.getName()); + image.setName("TODO"); + image.setDescription("TODO"); + image.setAlbum(treeSelectionManager.getSelectedAlbumItem().getAlbum()); + treeActionManager.addImage(image); } } } public void storeAll() { for(FileItem file:files){ - //TODO - //Save file to disk - //Update tree - //Update domain model + //Save file to disk + String fileName = user.getLogin() + fileManager.getFileSeparator() + treeSelectionManager.getSelectedAlbumItem().getAlbum().getName() + fileManager.getFileSeparator() + file.getName(); + try { + fileManager.addImage(fileName , file.getData()); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + //Update domain model + Image image = new Image(); + image.setCreated(new Date()); + image.setPath(file.getName()); + image.setName("TODO"); + image.setDescription("TODO"); + image.setAlbum(treeSelectionManager.getSelectedAlbumItem().getAlbum()); + treeActionManager.addImage(image); } } Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java 2008-11-25 09:39:51 UTC (rev 11349) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java 2008-11-25 10:31:53 UTC (rev 11350) @@ -107,4 +107,13 @@ imageItem.setImage(image); } } + + public void addImage(Image image) { + imageAction.addImage(image); + TreeAlbumItem albumItem = treeRoot.getAlbumByName(image.getAlbumName()); + TreeImageItem imageItem = new TreeImageItem(image.getId(),albumItem,image); + albumItem.addChild(image.getId(), imageItem); + treeSelectionManager.setSelectedImage(imageItem); + treeSelectionManager.setSelectedAlbumItem(albumItem); + } }