[richfaces-svn-commits] JBoss Rich Faces SVN: r11841 - in trunk/test-applications/realworld: web and 4 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Dec 17 05:36:27 EST 2008
Author: amarkhel
Date: 2008-12-17 05:36:27 -0500 (Wed, 17 Dec 2008)
New Revision: 11841
Added:
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ComboboxHelper.java
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/IAlbumAction.java
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/pom.xml
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/util/FriendHelper.java
trunk/test-applications/realworld/web/src/main/webapp/navigation.xhtml
Log:
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-17 10:18:06 UTC (rev 11840)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2008-12-17 10:36:27 UTC (rev 11841)
@@ -59,9 +59,4 @@
public void destroy(){
}
-
- public Album resetAlbum(Album album) {
- em.refresh(album);
- return album;
- }
}
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java 2008-12-17 10:18:06 UTC (rev 11840)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java 2008-12-17 10:36:27 UTC (rev 11841)
@@ -19,6 +19,4 @@
@Destroy
public abstract void destroy();
- public abstract Album resetAlbum(Album album);
-
}
\ No newline at end of file
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-12-17 10:18:06 UTC (rev 11840)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java 2008-12-17 10:36:27 UTC (rev 11841)
@@ -35,6 +35,4 @@
public abstract void vote(Image image, Long value);
- public abstract Image resetImage(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-12-17 10:18:06 UTC (rev 11840)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2008-12-17 10:36:27 UTC (rev 11841)
@@ -95,9 +95,4 @@
image.getRank().setTotal(total);
em.flush();
}
-
- public Image resetImage(Image image) {
- em.refresh(image);
- return image;
- }
}
Modified: trunk/test-applications/realworld/web/pom.xml
===================================================================
--- trunk/test-applications/realworld/web/pom.xml 2008-12-17 10:18:06 UTC (rev 11840)
+++ trunk/test-applications/realworld/web/pom.xml 2008-12-17 10:36:27 UTC (rev 11841)
@@ -48,6 +48,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-remoting</artifactId>
<version>${seamVersion}</version>
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-17 10:18:06 UTC (rev 11840)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java 2008-12-17 10:36:27 UTC (rev 11841)
@@ -83,6 +83,14 @@
}
}
selectedUser = user;
+ for(User u:user.getFriends()){
+ for(Album a :u.getChildAlbums()){
+ a.getImages().get(0);
+ }
+ }
+ for(Album a:user.getSharedAlbums()){
+ a.getImages().get(0);
+ }
Events.instance().raiseEvent("updateMainArea", NavigationEnum.IMAGE_PREVIEW);
return true;
}
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-17 10:18:06 UTC (rev 11840)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java 2008-12-17 10:36:27 UTC (rev 11841)
@@ -167,17 +167,8 @@
imageItem.setImage(image);
}
}
+
@Transactional(TransactionPropagationType.REQUIRED)
- public void resetImage(Image image){
- image = imageAction.resetImage(image);
- selectedImage = image;
- }
- @Transactional(TransactionPropagationType.REQUIRED)
- public void resetAlbum(Album album){
- album = albumAction.resetAlbum(album);
- selectedAlbum = album;
- }
- @Transactional(TransactionPropagationType.REQUIRED)
@Observer("addImage")
public void addImage(Image image) {
imageAction.addImage(image);
Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ComboboxHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ComboboxHelper.java (rev 0)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ComboboxHelper.java 2008-12-17 10:36:27 UTC (rev 11841)
@@ -0,0 +1,34 @@
+package org.richfaces.realworld.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.richfaces.realworld.domain.Album;
+import org.richfaces.realworld.domain.User;
+
+ at Name("comboboxHelper")
+ at Scope(ScopeType.CONVERSATION)
+public class ComboboxHelper {
+
+
+ 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;
+ }
+}
Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ComboboxHelper.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/FriendHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java 2008-12-17 10:18:06 UTC (rev 11840)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java 2008-12-17 10:36:27 UTC (rev 11841)
@@ -4,6 +4,9 @@
import java.util.ArrayList;
import java.util.List;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Begin;
@@ -16,9 +19,11 @@
import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.domain.User;
+import org.richfaces.realworld.service.IAlbumAction;
+import org.richfaces.realworld.service.IUserAction;
@Name("friendHelper")
- at Scope(ScopeType.SESSION)
+ at Scope(ScopeType.CONVERSATION)
public class FriendHelper implements Serializable{
@Out(required=false)
@@ -30,37 +35,23 @@
@In(required=false) @Out(required=false)
private Album selectedAlbum;
+ @In(create=true)
+ private IAlbumAction albumAction;
+
@In(required=false) @Out(required=false)
private SelectedImageIndex selectedImageIndex;
- private String albumName;
+ @In(required=false)
+ ComboboxHelper comboboxHelper;
- 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;
- }
-
- @Transactional(TransactionPropagationType.REQUIRED)
@Begin(join=true)
public void chooseAlbum(User friend){
selectedUser = friend;
- selectedAlbum = selectedUser.getAlbumByName(this.getAlbumName());
+ selectedAlbum = selectedUser.getAlbumByName(comboboxHelper.getAlbumName());
selectedImage = selectedAlbum.getImages().get(0);
selectedImageIndex.setSelectedImageIndex(1);
}
- @Transactional(TransactionPropagationType.REQUIRED)
@Begin(join=true)
public void chooseAlbum(Album album){
selectedUser = album.getOwner();
Modified: trunk/test-applications/realworld/web/src/main/webapp/navigation.xhtml
===================================================================
(Binary files differ)
More information about the richfaces-svn-commits
mailing list