[richfaces-svn-commits] JBoss Rich Faces SVN: r11642 - in trunk/test-applications/realworld: ejb/src/main/java/org/richfaces/realworld/service and 7 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Dec 8 10:47:25 EST 2008
Author: amarkhel
Date: 2008-12-08 10:47:24 -0500 (Mon, 08 Dec 2008)
New Revision: 11642
Added:
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/SelectedImageIndex.java
Modified:
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Album.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Comment.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/FriendshipRequest.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Message.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/User.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/AvatarUpload.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/search/SearchBean.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java
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/TreeRootItem.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ModalPanelHelper.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationHelper.java
trunk/test-applications/realworld/web/src/main/webapp/fileUpload.xhtml
trunk/test-applications/realworld/web/src/main/webapp/imagePreview.xhtml
trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml
trunk/test-applications/realworld/web/src/main/webapp/layout/menuShared.xhtml
trunk/test-applications/realworld/web/src/main/webapp/navigation.xhtml
trunk/test-applications/realworld/web/src/main/webapp/search.xhtml
trunk/test-applications/realworld/web/src/main/webapp/userPrefs.xhtml
Log:
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Album.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -30,6 +30,7 @@
import org.hibernate.validator.NotNull;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Role;
import org.jboss.seam.annotations.Scope;
/**
@@ -40,8 +41,8 @@
*/
@Entity
@Name("album")
- at Scope(ScopeType.PAGE)
@Table(name = "albums")
+ at Role(name="selectedAlbum", scope = ScopeType.CONVERSATION)
public class Album implements Serializable {
private static final long serialVersionUID = -7042878411608396483L;
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Comment.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Comment.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Comment.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -24,7 +24,6 @@
@Entity
@Name("comment")
- at Scope(ScopeType.PAGE)
@Table(name = "comments")
public class Comment implements Serializable{
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/FriendshipRequest.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/FriendshipRequest.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/FriendshipRequest.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -1,5 +1,7 @@
package org.richfaces.realworld.domain;
+import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -17,7 +19,7 @@
@Entity
@Name("friendshipRequest")
@Table(name = "friendship_requests")
-public class FriendshipRequest {
+public class FriendshipRequest implements Serializable{
@Id
@GeneratedValue
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -31,6 +31,7 @@
import org.hibernate.validator.NotNull;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Role;
import org.jboss.seam.annotations.Scope;
/**
@@ -41,8 +42,8 @@
*/
@Entity
@Name("image")
- at Scope(ScopeType.PAGE)
@Table(name = "Images")
+ at Role(name="selectedImage", scope = ScopeType.CONVERSATION)
public class Image implements Serializable {
private static final long serialVersionUID = -7042878411608396483L;
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Message.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Message.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Message.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -24,7 +24,6 @@
@Entity
@Name("message")
@Table(name = "messages")
- at Scope(ScopeType.PAGE)
public class Message implements Serializable{
@Id
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/User.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/User.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/User.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -31,6 +31,7 @@
import org.hibernate.validator.Pattern;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Role;
import org.jboss.seam.annotations.Scope;
/*@NamedQueries({
@@ -41,8 +42,9 @@
})*/
@Entity
+ at Scope(ScopeType.SESSION)
@Name("user")
- at Scope(ScopeType.SESSION)
+ at Role(name="selectedUser", scope = ScopeType.CONVERSATION)
@Table(name = "Users")
public class User implements Serializable {
@@ -319,4 +321,26 @@
return null;
}
+ public Album getAlbumByName(String albumName){
+ for(Album a : this.getChildAlbums()){
+ if(a.getName().equals(albumName)){
+ return a;
+ }
+ }
+ return null;
+ }
+
+ public void removeFromSharedAlbums(Album album) {
+ sharedAlbums.remove(album);
+ }
+
+ public void addSharedAlbum(Album album) {
+ if (album == null) {
+ throw new IllegalArgumentException("Null album!");
+ }
+ if(sharedAlbums.contains(album)){
+ return;
+ }
+ sharedAlbums.add(album);
+ }
}
\ No newline at end of file
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -13,7 +13,6 @@
import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.User;
- at Stateful
@Name("albumAction")
public class AlbumAction implements IAlbumAction {
//@PersistenceContext(unitName = "entityManager", type=PersistenceContextType.EXTENDED)
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -8,12 +8,13 @@
import javax.ejb.Remove;
import org.jboss.seam.annotations.Destroy;
+import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.FriendshipRequest;
import org.richfaces.realworld.domain.User;
@Local
public interface IUserAction {
- public boolean login(String username, String password);
+ public User login(String username, String password);
@Remove
public void remove();
@@ -30,4 +31,6 @@
public void removeFromFriends(User owner, User removed);
public boolean friendExist(User user, User friend);
public void addFriend(User user, User friend, FriendshipRequest request);
+ public void removeFromSharedAlbums(User user, Album album);
+ public void addSharedAlbum(Album album);
}
\ No newline at end of file
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -35,12 +35,11 @@
@In(create = true, required = true) @Out
private User user;
- public boolean login(String username, String password) {
- user = (User)em.createQuery("from User u where u.login = :username and u.password = :password")
+ public User login(String username, String password) {
+ return user = (User)em.createQuery("from User u where u.login = :username and u.password = :password")
.setParameter("username", username)
.setParameter("password", password)
.getSingleResult();
- return user != null;
}
@Remove
@@ -106,4 +105,14 @@
user.addFriend(friend);
friend.addFriend(user);
}
+
+ public void removeFromSharedAlbums(User user, Album album) {
+ user.removeFromSharedAlbums(album);
+ em.flush();
+ }
+
+ public void addSharedAlbum(Album album) {
+ user.addSharedAlbum(album);
+
+ }
}
\ No newline at end of file
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/AvatarUpload.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/AvatarUpload.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/AvatarUpload.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -20,7 +20,7 @@
import org.richfaces.realworld.domain.User;
@Name("avatarUpload")
- at Scope(ScopeType.PAGE)
+ at Scope(ScopeType.CONVERSATION)
public class AvatarUpload implements Serializable{
@In(create=true)
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-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -36,6 +36,7 @@
import org.jboss.seam.faces.FacesMessages;
import org.richfaces.event.UploadEvent;
import org.richfaces.model.UploadItem;
+import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.tree.TreeActionManager;
@@ -46,17 +47,20 @@
*
*/
@Name("fileUploadBean")
- at Scope(ScopeType.SESSION)
+ at Scope(ScopeType.CONVERSATION)
@Synchronized(timeout=2000)
public class FileUploadBean implements Serializable{
@In @Out
private User user;
- @In
- TreeSelectionManager treeSelectionManager;
-
@In(create=true)
+ private Image selectedImage;
+
+ @In(create=true)
+ private Album selectedAlbum;
+
+ @In(create=true)
TreeActionManager treeActionManager;
@In(create=true)
@@ -90,8 +94,8 @@
image.setDescription("Sample Description");
image.setName("Sample Name");
image.setPath(item.getFileName());
- image.setAlbumName(treeSelectionManager.getSelectedAlbum().getName());
- image.setAlbum(treeSelectionManager.getSelectedAlbum());
+ image.setAlbumName(selectedAlbum.getName());
+ image.setAlbum(selectedAlbum);
file.setImage(image);
files.add(file);
}
@@ -112,7 +116,7 @@
for(FileItem file:files){
if(file.isSelected()){
//Save file to disk
- String fileName = user.getLogin() + fileManager.getFileSeparator() + treeSelectionManager.getSelectedAlbum().getName() + fileManager.getFileSeparator() + file.getImage().getPath();
+ String fileName = user.getLogin() + fileManager.getFileSeparator() + selectedAlbum.getName() + fileManager.getFileSeparator() + file.getImage().getPath();
try {
fileManager.addImage(fileName , file.getData());
} catch (IOException e) {
@@ -127,7 +131,7 @@
public void storeAll() {
for(FileItem file:files){
//Save file to disk
- String fileName = user.getLogin() + fileManager.getFileSeparator() + treeSelectionManager.getSelectedAlbum().getName() + fileManager.getFileSeparator() + file.getImage().getPath();
+ String fileName = user.getLogin() + fileManager.getFileSeparator() + selectedAlbum.getName() + fileManager.getFileSeparator() + file.getImage().getPath();
try {
fileManager.addImage(fileName , file.getData());
} catch (IOException e) {
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchBean.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchBean.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchBean.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -26,6 +26,7 @@
import org.richfaces.realworld.service.ISearchService;
@Name("searchBean")
+ at Scope(ScopeType.CONVERSATION)
public class SearchBean implements Serializable {
/**
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -6,26 +6,41 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Begin;
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.faces.FacesMessages;
import org.jboss.seam.log.Log;
import org.jboss.seam.security.Identity;
import org.jboss.seam.web.Session;
+import org.richfaces.realworld.domain.Album;
+import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.fileupload.AvatarUpload;
import org.richfaces.realworld.fileupload.FileManager;
import org.richfaces.realworld.service.IUserAction;
@Name("authenticator")
+ at Scope(ScopeType.CONVERSATION)
public class Authenticator
{
@Logger Log log;
@In Identity identity;
+ @Out
+ private Image selectedImage;
+
+ @Out(required=false)
+ private User selectedUser;
+
+ @Out
+ private Album selectedAlbum;
+
@In FacesMessages facesMessages;
@In(create = true)
@@ -45,11 +60,19 @@
{
log.info("authenticating #0", identity.getUsername());
try{
- if(userAction.login(identity.getUsername(), identity.getPassword())){
+ User user = userAction.login(identity.getUsername(), identity.getPassword());
+ if(user != null){
identity.addRole("admin");
if(!fileManager.isDirectoryPresent(identity.getUsername())){
fileManager.addDirectory(identity.getUsername());
}
+ if(user.getChildAlbums().size() > 0){
+ selectedAlbum = user.getChildAlbums().get(0);
+ if(selectedAlbum.getImages().size() > 0){
+ selectedImage = selectedAlbum.getImages().get(0);
+ }
+ selectedUser = user;
+ }
return true;
}
}catch(Exception nre){
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-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -8,6 +8,7 @@
import javax.faces.model.SelectItem;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
@@ -23,15 +24,20 @@
import org.richfaces.realworld.service.IImageAction;
import org.richfaces.realworld.service.IMessageAction;
import org.richfaces.realworld.service.IUserAction;
+import org.richfaces.realworld.util.NavigationEnum;
import org.richfaces.realworld.util.RatingHelper;
+import org.richfaces.realworld.util.SelectedImageIndex;
@Name("treeActionManager")
- at Scope(ScopeType.PAGE)
+ at Scope(ScopeType.CONVERSATION)
public class TreeActionManager implements Serializable{
@In
private User user;
+ @Out(required=false)
+ private User selectedUser;
+
@In(create=true, required=true)
private IAlbumAction albumAction;
@@ -50,22 +56,40 @@
@In(create=true, required=true) @Out
private Album album;
+ @In(create=true) @Out
+ private SelectedImageIndex selectedImageIndex;
+
@In(create=true)
FileManager fileManager;
+ @In(create=true) @Out
+ private Image selectedImage;
+
+ @In(create=true) @Out
+ private Album selectedAlbum;
+
+ @In(create=true) TreeSelectionManager treeSelectionManager;
+
@In(create=true) TreeRootItem treeRoot;
- @In(create=true, required=true)
- TreeSelectionManager treeSelectionManager;
+ private String selectedAlbumName;
+ public String getSelectedAlbumName() {
+ return selectedAlbumName;
+ }
+
+ public void setSelectedAlbumName(String selectedAlbumName) {
+ this.selectedAlbumName = selectedAlbumName;
+ }
+
public void addAlbum(){
albumAction.addAlbum(album);
treeRoot.getAvailableAlbums().add(new SelectItem(album.getName()));
TreeAlbumItem albumItem = new TreeAlbumItem(album.getId(), treeRoot, album);
treeRoot.addAlbumToTree(albumItem);
fileManager.addDirectory(user.getLogin() + fileManager.getFileSeparator() + album.getName());
- treeSelectionManager.setSelectedImage(null);
- treeSelectionManager.setSelectedAlbum(albumItem.getAlbum());
+ selectedImage = null;
+ selectedAlbum = albumItem.getAlbum();
}
@@ -100,8 +124,8 @@
treeRoot.getAvailableAlbums().remove(item);
treeRoot.removeChild(album.getId());
fileManager.deleteDirectory(user.getLogin() + fileManager.getFileSeparator() + albumName);
- treeSelectionManager.setSelectedImage(null);
- treeSelectionManager.setSelectedAlbum(null);
+ selectedImage = null;
+ selectedAlbum = null;
}
public void deleteImage(Image image){
@@ -111,7 +135,7 @@
imageAction.deleteImage(image);
parent.removeChild(image.getId());
fileManager.deleteImage(user.getLogin() + fileManager.getFileSeparator() + albumName + fileManager.getFileSeparator() + imagePath);
- treeSelectionManager.setSelectedImage(null);
+ selectedImage = null;
}
public void editImage(Image image){
@@ -127,8 +151,8 @@
String fileNameOld = user.getLogin() + fileManager.getFileSeparator() + image.getAlbum().getName() + fileManager.getFileSeparator() + image.getPath();
String fileNameNew = user.getLogin() + fileManager.getFileSeparator() + image.getAlbumName() + fileManager.getFileSeparator() + image.getPath();
fileManager.renameImage(fileNameOld, fileNameNew);
- treeSelectionManager.setSelectedImage(imageItem.getImage());
- treeSelectionManager.setSelectedAlbum(albumItem.getAlbum());
+ selectedImage = imageItem.getImage();
+ selectedAlbum = albumItem.getAlbum();
}else{
TreeImageItem imageItem = (TreeImageItem)parent.getChild(image.getId());
imageItem.setImage(image);
@@ -140,8 +164,8 @@
TreeAlbumItem albumItem = treeRoot.getAlbumByName(image.getAlbumName());
TreeImageItem imageItem = new TreeImageItem(image.getId(),albumItem,image);
albumItem.addChild(image.getId(), imageItem);
- treeSelectionManager.setSelectedImage(imageItem.getImage());
- treeSelectionManager.setSelectedAlbum(albumItem.getAlbum());
+ selectedImage = imageItem.getImage();
+ selectedAlbum = albumItem.getAlbum();
}
public void editComment(Comment comment) {
@@ -152,7 +176,7 @@
imageAction.addComment(comment);
}
- public void addAutoComment(User user, Image image) {
+ public void addAutoComment(Image image) {
Comment comment = new Comment();
comment.setAuthor(user);
comment.setDate(new Date());
@@ -203,7 +227,32 @@
}*/
}
+ public void addToSharedAlbums(Image image){
+ userAction.addSharedAlbum(image.getAlbum());
+ }
+
+ @Begin(join=true)
+ public void removeFromSharedAlbums(Album album){
+ userAction.removeFromSharedAlbums(user, album);
+ }
+
public void vote(Image image){
imageAction.vote(image, (Long)Long.valueOf(ratingHelper.getInputSlider().getValue().toString()));
}
+
+ public void showSharedAlbum(Image image){
+ NavigationEnum mainArea = NavigationEnum.IMAGE_PREVIEW;
+ treeSelectionManager.setMainArea(mainArea);
+ selectedUser = image.getAlbum().getOwner();
+ selectedAlbum = image.getAlbum();
+ selectedImage = selectedAlbum.getImages().get(0);
+ selectedImageIndex.setSelectedImageIndex(1);
+ }
+
+ @Begin(join=true)
+ public void updateSelectedAlbum(){
+ selectedAlbum = user.getAlbumByName(this.getSelectedAlbumName());
+ selectedImage = selectedAlbum.getImages().get(0);
+ selectedImageIndex.setSelectedImageIndex(1);
+ }
}
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeRootItem.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeRootItem.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeRootItem.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -21,7 +21,7 @@
import org.richfaces.realworld.service.IImageAction;
@Name("treeRoot")
- at Scope(ScopeType.PAGE)
+ at Scope(ScopeType.CONVERSATION)
public class TreeRootItem implements TreeNode {
@In @Out
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -17,17 +17,16 @@
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
import javax.faces.model.SelectItem;
-import javax.faces.model.SelectItemGroup;
import javax.imageio.ImageIO;
import org.ajax4jsf.context.AjaxContext;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Begin;
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.Synchronized;
-import org.richfaces.component.UIDataTable;
import org.richfaces.component.UIDatascroller;
import org.richfaces.component.UIDragSupport;
import org.richfaces.component.UITree;
@@ -43,24 +42,26 @@
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.fileupload.FileManager;
import org.richfaces.realworld.util.NavigationEnum;
+import org.richfaces.realworld.util.SelectedImageIndex;
@Name("treeSelectionManager")
+ at Scope(ScopeType.CONVERSATION)
@Synchronized(timeout=2000)
- at Scope(ScopeType.SESSION)
public class TreeSelectionManager implements Serializable{
- private static final FacesContext FacesContext = null;
-
@In
private User user;
private NavigationEnum mainArea = NavigationEnum.IMAGE_PREVIEW;
+ @In(required=false) @Out
private Image selectedImage;
+ @In(required=false) @Out
private Album selectedAlbum;
- private int selectedImageIndex = 1;
+ @In(create=true) @Out
+ private SelectedImageIndex selectedImageIndex;
@In(create=true)
FileManager fileManager;
@@ -70,127 +71,43 @@
private String nodeTitle;
- public Album getSelectedAlbum() {
- return selectedAlbum;
- }
-
public void showFileUpload(TreeAlbumItem item){
- this.setSelectedAlbum(item.getAlbum());
+ selectedAlbum = item.getAlbum();
if(item.isLeaf()){
- this.setSelectedImage(null);
+ selectedImage=null;
}else{
- this.setSelectedImage(((TreeImageItem)(item.getImages().get(0))).getImage());
+ selectedImage = ((TreeImageItem)(item.getImages().get(0))).getImage();
}
this.setMainArea(NavigationEnum.FILE_UPLOAD);
}
public void scrollerListener(DataScrollerEvent event) {
- List<Image> images = this.getSelectedAlbum().getImages();
+ List<Image> images = selectedAlbum.getImages();
if (event.getNewScrolVal().equals("previous")) {
for(int index = 0 ; index < images.size(); index++){
- if(images.get(index) == this.getSelectedImage()){
- this.setSelectedImage(images.get(index - 1));
- this.setSelectedImageIndex(index);
+ if(images.get(index) == selectedImage){
+ selectedImage = images.get(index - 1);
+ selectedImageIndex.setSelectedImageIndex(index);
}
}
} else if (event.getNewScrolVal().equals("last")) {
- this.setSelectedImage(images.get(images.size() - 1));
- this.setSelectedImageIndex(images.size());
+ selectedImage = images.get(images.size() - 1);
+ selectedImageIndex.setSelectedImageIndex(images.size());
} else if (event.getNewScrolVal().equals("next")) {
for(int index = 0 ; index < images.size(); index++){
- if(images.get(index) == this.getSelectedImage()){
- this.setSelectedImage(images.get(index + 1));
- this.setSelectedImageIndex(index + 2);
+ if(images.get(index) == selectedImage){
+ selectedImage = images.get(index + 1);
+ selectedImageIndex.setSelectedImageIndex(index + 2);
return;
}
}
} else if (event.getNewScrolVal().equals("first")) {
- this.setSelectedImage(images.get(0));
- this.setSelectedImageIndex(1);
+ selectedImage = images.get(0);
+ selectedImageIndex.setSelectedImageIndex(1);
}
}
- public synchronized void paint(OutputStream out, Object data) throws IOException{
- if (null == data) {
- return;
- }
- File imageResource = fileManager.getImage(user.getLogin() + fileManager.getFileSeparator() + this.getSelectedAlbum().getName() + fileManager.getFileSeparator() + data.toString());
- if (imageResource != null) {
- FileInputStream fileInputStream = new FileInputStream(imageResource);
- BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream);
- InputStream paintData = bufferedInputStream;
- if (null == paintData) {
- // throw new Exception("");
- // TODO
- }
- try{
- BufferedImage image = ImageIO.read(paintData);
- ImageIO.write(image, "jpeg", out);
- }catch(Exception e){
-
- }finally{
- fileInputStream.close();
- bufferedInputStream.close();
- paintData.close();
- }
- }
- }
-
- public synchronized void paintAvatar(OutputStream out, Object data) throws IOException{
- if (null == data) {
- return;
- }
- File imageResource = fileManager.getImage(user.getLogin() + fileManager.getFileSeparator() + "avatars" + fileManager.getFileSeparator() + data.toString());
- if (imageResource != null) {
- FileInputStream fileInputStream = new FileInputStream(imageResource);
- BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream);
- InputStream paintData = bufferedInputStream;
- if (null == paintData) {
- // throw new Exception("");
- // TODO
- }
- try{
- BufferedImage image = ImageIO.read(paintData);
- ImageIO.write(image, "jpeg", out);
- }catch(Exception e){
-
- }finally{
- fileInputStream.close();
- bufferedInputStream.close();
- paintData.close();
- }
- }
- }
-
- public synchronized void paintFriendAvatar(OutputStream out, Object data) throws IOException{
- if (null == data) {
- return;
- }
- String temp = data.toString();
- String[] array = temp.split(":");
- File imageResource = fileManager.getImage(array[0] + fileManager.getFileSeparator() + "avatars" + fileManager.getFileSeparator() + array[1]);
- if (imageResource != null) {
- FileInputStream fileInputStream = new FileInputStream(imageResource);
- BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream);
- InputStream paintData = bufferedInputStream;
- if (null == paintData) {
- // throw new Exception("");
- // TODO
- }
- try{
- BufferedImage image = ImageIO.read(paintData);
- ImageIO.write(image, "jpeg", out);
- }catch(Exception e){
-
- }finally{
- fileInputStream.close();
- bufferedInputStream.close();
- paintData.close();
- }
- }
- }
-
public void dropListener(DropEvent dropEvent) {
// resolve drag destination attributes
@@ -275,37 +192,14 @@
return index;
}
- public Image getSelectedImage() {
- return selectedImage;
- }
-
- public void setSelectedImage(Image selectedImage) {
- this.selectedImage = selectedImage;
- }
-
- public void setSelectedAlbum(Album selectedAlbum) {
- this.selectedAlbum = selectedAlbum;
- }
-
public Boolean adviseNodeSelected(UITree tree) {
TreeRowKey treeRowKey = (TreeRowKey) tree.getRowKey();
TreeNode treeNode = (TreeNode) tree.getRowData(treeRowKey);
-
- if(treeNode instanceof TreeAlbumItem){
- TreeAlbumItem currentNode = (TreeAlbumItem)treeNode;
- if(this.getSelectedAlbum() != null){
- return currentNode.getAlbum() == this.getSelectedAlbum() && null == this.getSelectedImage() ? Boolean.TRUE: Boolean.FALSE;
- }else{
- this.setSelectedAlbum(currentNode.getAlbum());
- if(currentNode.isLeaf()){
- return Boolean.TRUE ;
- }else{
- this.setSelectedImage(((TreeImageItem)(currentNode.getImages().get(0))).getImage());
- return Boolean.FALSE ;
- }
- }
- }else if(treeNode instanceof TreeImageItem){
- return ((TreeImageItem)treeNode).getImage() == this.getSelectedImage() ? Boolean.TRUE : Boolean.FALSE;
+ if (treeNode instanceof TreeAlbumItem) {
+ TreeAlbumItem currentNode = (TreeAlbumItem) treeNode;
+ return currentNode.getAlbum() == selectedAlbum;
+ } else if (treeNode instanceof TreeImageItem) {
+ return ((TreeImageItem) treeNode).getImage() == selectedImage;
}
return null;
}
@@ -313,17 +207,9 @@
public Boolean adviseNodeOpened(UITree tree) {
TreeRowKey treeRowKey = (TreeRowKey) tree.getRowKey();
TreeNode treeNode = (TreeNode) tree.getRowData(treeRowKey);
- if(treeNode instanceof TreeAlbumItem){
- TreeAlbumItem currentNode = (TreeAlbumItem)treeNode;
- if(this.getSelectedAlbum() != null){
- return currentNode.getAlbum() == this.getSelectedAlbum() ? Boolean.TRUE: Boolean.FALSE;
- }else{
- this.setSelectedAlbum(currentNode.getAlbum());
- if(!currentNode.isLeaf()){
- this.setSelectedImage(((TreeImageItem)currentNode.getImages().get(0)).getImage());
- }
- return Boolean.TRUE ;
- }
+ if (treeNode instanceof TreeAlbumItem) {
+ TreeAlbumItem currentNode = (TreeAlbumItem) treeNode;
+ return currentNode.getAlbum() == selectedAlbum;
}
return null;
}
@@ -340,10 +226,10 @@
TreeNode<String> currentNode = tree.getModelTreeNode(tree.getRowKey());
if(currentNode instanceof TreeImageItem){
Image image = ((TreeImageItem)currentNode).getImage();
- this.setSelectedImage(image);
+ selectedImage = image;
Album album = ((TreeAlbumItem)currentNode.getParent()).getAlbum();
- if(album != this.getSelectedAlbum()){
- this.setSelectedAlbum(album);
+ if(album != selectedAlbum){
+ selectedAlbum = album;
}
int index = album.getIndex(image);
setDataScrollerIndex(index);
@@ -352,29 +238,29 @@
TreeAlbumItem node = (TreeAlbumItem)currentNode;
setDataScrollerIndex(0);
if (node.isLeaf()) {
- this.setSelectedImage(null);
+ selectedImage = null;
Album album = node.getAlbum();
- this.setSelectedAlbum(album);
+ selectedAlbum = album;
}else{
- if(node.getAlbum() == this.getSelectedAlbum()){
+ if(node.getAlbum() == selectedAlbum){
return;
}else{
- setSelectedAlbum(node.getAlbum());
- this.setSelectedImage(node.getAlbum().getImages().get(0));
+ selectedAlbum = node.getAlbum();
+ selectedImage = node.getAlbum().getImages().get(0);
}
}
}
}
public void updateScroller(ActionEvent event){
- this.setDataScrollerIndex(this.selectedImageIndex - 1);
+ this.setDataScrollerIndex(selectedImageIndex.getSelectedImageIndex()- 1);
}
private void setDataScrollerIndex(int index) {
UIComponent component = FacesContext.getCurrentInstance().getViewRoot();
UIDatascroller scroller = (UIDatascroller)component.findComponent("mainform:sc1");
scroller.setPage(index+1);
- this.setSelectedImageIndex(index+1);
+ selectedImageIndex.setSelectedImageIndex(index+1);
}
public String getNodeTitle() {
@@ -392,20 +278,18 @@
public void setMainArea(NavigationEnum mainArea) {
this.mainArea = mainArea;
}
-
- public int getSelectedImageIndex() {
- return selectedImageIndex;
- }
-
- public void setSelectedImageIndex(int selectedImageIndex) {
- this.selectedImageIndex = selectedImageIndex;
- }
public SelectItem[] getAvailableIndexOfImages(){
- SelectItem[] group = new SelectItem[this.getSelectedAlbum().getImages().size()];
- for(int i = 0; i < this.getSelectedAlbum().getImages().size(); i++){
+ SelectItem[] group = new SelectItem[selectedAlbum.getImages().size()];
+ for(int i = 0; i < selectedAlbum.getImages().size(); i++){
group[i] = new SelectItem(i+1);
}
return group;
}
+
+ public void updateSelectedItems(Image image){
+ selectedImage = image;
+ Integer index = selectedAlbum.getIndex(selectedImage);
+ setDataScrollerIndex(index);
+ }
}
Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java (rev 0)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -0,0 +1,65 @@
+package org.richfaces.realworld.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Begin;
+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.realworld.domain.Album;
+import org.richfaces.realworld.domain.Image;
+import org.richfaces.realworld.domain.User;
+
+ at Name("friendHelper")
+ at Scope(ScopeType.CONVERSATION)
+public class FriendHelper {
+
+ @Out(required=false)
+ private User selectedUser;
+
+ @In(required=false) @Out
+ private Image selectedImage;
+
+ @In(required=false) @Out
+ private Album selectedAlbum;
+
+ @In(create=true) @Out
+ private SelectedImageIndex selectedImageIndex;
+
+ private String albumName;
+
+ public String getAlbumName() {
+ return albumName;
+ }
+
+ public void setAlbumName(String albumName) {
+ this.albumName = albumName;
+ }
+
+ public List<String> getFriendAlbums(User friend){
+ List<String> albumNames = new ArrayList<String>();
+ for(Album album:friend.getChildAlbums()){
+ albumNames.add(album.getName());
+ }
+ return albumNames;
+ }
+
+ @Begin(join=true)
+ public void chooseAlbum(User friend){
+ selectedUser = friend;
+ selectedAlbum = selectedUser.getAlbumByName(this.getAlbumName());
+ selectedImage = selectedAlbum.getImages().get(0);
+ selectedImageIndex.setSelectedImageIndex(1);
+ }
+
+ @Begin(join=true)
+ public void chooseAlbum(Album album){
+ selectedUser = album.getOwner();
+ selectedAlbum = album;
+ selectedImage = selectedAlbum.getImages().get(0);
+ selectedImageIndex.setSelectedImageIndex(1);
+ }
+}
Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java (rev 0)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -0,0 +1,112 @@
+package org.richfaces.realworld.util;
+
+import java.awt.image.BufferedImage;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.imageio.ImageIO;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.richfaces.realworld.domain.Image;
+import org.richfaces.realworld.domain.User;
+import org.richfaces.realworld.fileupload.FileManager;
+
+ at Name("imageLoader")
+ at Scope(ScopeType.CONVERSATION)
+public class ImageLoader {
+
+ @In(create=true)
+ FileManager fileManager;
+
+ @In
+ private User user;
+
+ public synchronized void paint(OutputStream out, Object data) throws IOException{
+ if (null == data) {
+ return;
+ }
+ Image image = (Image)data;
+ File imageResource = fileManager.getImage(image.getAlbum().getOwner().getLogin() + fileManager.getFileSeparator() + image.getAlbum().getName() + fileManager.getFileSeparator() + image.getPath());
+ if (imageResource != null) {
+ FileInputStream fileInputStream = new FileInputStream(imageResource);
+ BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream);
+ InputStream paintData = bufferedInputStream;
+ if (null == paintData) {
+ // throw new Exception("");
+ // TODO
+ }
+ try{
+ BufferedImage images = ImageIO.read(paintData);
+ ImageIO.write(images, "jpeg", out);
+ }catch(Exception e){
+
+ }finally{
+ fileInputStream.close();
+ bufferedInputStream.close();
+ paintData.close();
+ }
+ }
+ }
+
+ public synchronized void paintAvatar(OutputStream out, Object data) throws IOException{
+ if (null == data) {
+ return;
+ }
+ File imageResource = fileManager.getImage(user.getLogin() + fileManager.getFileSeparator() + "avatars" + fileManager.getFileSeparator() + data.toString());
+ if (imageResource != null) {
+ FileInputStream fileInputStream = new FileInputStream(imageResource);
+ BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream);
+ InputStream paintData = bufferedInputStream;
+ if (null == paintData) {
+ // throw new Exception("");
+ // TODO
+ }
+ try{
+ BufferedImage image = ImageIO.read(paintData);
+ ImageIO.write(image, "jpeg", out);
+ }catch(Exception e){
+
+ }finally{
+ fileInputStream.close();
+ bufferedInputStream.close();
+ paintData.close();
+ }
+ }
+ }
+
+ public synchronized void paintFriendAvatar(OutputStream out, Object data) throws IOException{
+ if (null == data) {
+ return;
+ }
+ String temp = data.toString();
+ String[] array = temp.split(":");
+ File imageResource = fileManager.getImage(array[0] + fileManager.getFileSeparator() + "avatars" + fileManager.getFileSeparator() + array[1]);
+ if (imageResource != null) {
+ FileInputStream fileInputStream = new FileInputStream(imageResource);
+ BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream);
+ InputStream paintData = bufferedInputStream;
+ if (null == paintData) {
+ // throw new Exception("");
+ // TODO
+ }
+ try{
+ BufferedImage image = ImageIO.read(paintData);
+ ImageIO.write(image, "jpeg", out);
+ }catch(Exception e){
+
+ }finally{
+ fileInputStream.close();
+ bufferedInputStream.close();
+ paintData.close();
+ }
+ }
+ }
+}
Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ModalPanelHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ModalPanelHelper.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ModalPanelHelper.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -18,7 +18,7 @@
import org.richfaces.realworld.tree.TreeActionManager;
@Name("modalPanelHelper")
- at Scope(ScopeType.SESSION)
+ at Scope(ScopeType.CONVERSATION)
public class ModalPanelHelper implements Serializable{
private String caption;
@@ -145,7 +145,7 @@
this.searchRequired = false;
}
- public void initModalPanelData( String actionName, String caption, Comment comment, User user, Image image){
+ public void initModalPanelData( String actionName, String caption, Comment comment, Image image){
this.caption = caption;
this.actionName = actionName;
if(null != comment){
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationHelper.java 2008-12-08 15:38:23 UTC (rev 11641)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationHelper.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -1,8 +1,11 @@
package org.richfaces.realworld.util;
+import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
@Name(value="navigationHelper")
+ at Scope(ScopeType.CONVERSATION)
public class NavigationHelper {
private NavigationEnum navigationEnum;
Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/SelectedImageIndex.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/SelectedImageIndex.java (rev 0)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/SelectedImageIndex.java 2008-12-08 15:47:24 UTC (rev 11642)
@@ -0,0 +1,20 @@
+package org.richfaces.realworld.util;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+ at Name("selectedImageIndex")
+ at Scope(ScopeType.CONVERSATION)
+public class SelectedImageIndex {
+
+ private Integer selectedImageIndex = 1;
+
+ public Integer getSelectedImageIndex() {
+ return selectedImageIndex;
+ }
+
+ public void setSelectedImageIndex(Integer selectedImageIndex) {
+ this.selectedImageIndex = selectedImageIndex;
+ }
+}
Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/SelectedImageIndex.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/test-applications/realworld/web/src/main/webapp/fileUpload.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/imagePreview.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/layout/menuShared.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/navigation.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/search.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/userPrefs.xhtml
===================================================================
(Binary files differ)
More information about the richfaces-svn-commits
mailing list