[richfaces-svn-commits] JBoss Rich Faces SVN: r13633 - in trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld: service and 1 other directory.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Fri Apr 17 09:37:57 EDT 2009
Author: amarkhel
Date: 2009-04-17 09:37:57 -0400 (Fri, 17 Apr 2009)
New Revision: 13633
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/Constants.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java
Log:
Fix bugs
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2009-04-17 13:31:42 UTC (rev 13632)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2009-04-17 13:37:57 UTC (rev 13633)
@@ -72,7 +72,7 @@
),
@NamedQuery(
name = "user-shelves",
- query = "select distinct s from Shelf s where (s.shared = true and s.owner.preDefined = true) or s.owner = :user order by s.name"
+ query = "select distinct s from Shelf s where (s.shared = true and s.owner.preDefined = true) order by s.name"
),
@NamedQuery(
name = "image-exist",
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-04-17 13:31:42 UTC (rev 13632)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-04-17 13:37:57 UTC (rev 13633)
@@ -166,7 +166,7 @@
}
/**
- * Getter for property shared. If true - all users can view this shelfs and albums and images, contained in this shelf,
+ * Getter for property shared. If true - all users can view this shelves and albums and images, contained in this shelf,
* otherwise this shelf can view only owner.
*
* @return shared
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java 2009-04-17 13:31:42 UTC (rev 13632)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java 2009-04-17 13:37:57 UTC (rev 13633)
@@ -138,7 +138,7 @@
@OneToMany(mappedBy = "owner", cascade = { CascadeType.ALL})
@org.hibernate.annotations.LazyCollection(org.hibernate.annotations.LazyCollectionOption.EXTRA)
@org.hibernate.annotations.OrderBy(clause = "NAME asc")
- private List<Shelf> shelfs = new ArrayList<Shelf>();
+ private List<Shelf> shelves = new ArrayList<Shelf>();
private boolean preDefined;
@@ -219,12 +219,12 @@
this.confirmPassword = confirmPassword;
}
- public List<Shelf> getShelfs() {
- return shelfs;
+ public List<Shelf> getShelves() {
+ return shelves;
}
- public void setShelfs(List<Shelf> shelfs) {
- this.shelfs = shelfs;
+ public void setShelves(List<Shelf> shelves) {
+ this.shelves = shelves;
}
public Sex getSex() {
@@ -255,9 +255,9 @@
if (shelf == null) {
throw new IllegalArgumentException("Null shelf!");
}
- if(!shelfs.contains(shelf)){
+ if(!shelves.contains(shelf)){
shelf.setOwner(this);
- shelfs.add(shelf);
+ shelves.add(shelf);
}
}
@@ -273,7 +273,7 @@
}
if(shelf.getOwner().getLogin().equals(this.getLogin())){
shelf.setOwner(null);
- shelfs.remove(shelf);
+ shelves.remove(shelf);
}else{
throw new IllegalArgumentException("Shelf not belongs to this user!");
}
@@ -297,7 +297,7 @@
*/
public List<Image> getImages() {
List<Image> images = new ArrayList<Image>();
- for (Shelf s : getShelfs()) {
+ for (Shelf s : getShelves()) {
for (Album a : s.getAlbums()) {
images.addAll(a.getImages());
}
@@ -312,7 +312,7 @@
*/
public List<Album> getAlbums() {
List<Album> albums = new ArrayList<Album>();
- for (Shelf s : getShelfs()) {
+ for (Shelf s : getShelves()) {
albums.addAll(s.getAlbums());
}
return albums;
@@ -325,7 +325,7 @@
*/
public List<Image> getSharedImages() {
List<Image> images = new ArrayList<Image>();
- for (Shelf s : getShelfs()) {
+ for (Shelf s : getShelves()) {
if(!s.isShared()){
continue;
}
@@ -343,7 +343,7 @@
*/
public List<Album> getSharedAlbums() {
List<Album> albums = new ArrayList<Album>();
- for (Shelf s : getShelfs()) {
+ for (Shelf s : getShelves()) {
if(!s.isShared()){
continue;
}
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/Constants.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/Constants.java 2009-04-17 13:31:42 UTC (rev 13632)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/Constants.java 2009-04-17 13:37:57 UTC (rev 13633)
@@ -34,7 +34,7 @@
public static final String ALBUM_EDITED_EVENT = "albumEdited";
public static final String UPDATE_MAIN_AREA_EVENT = "updateMainArea";
public static final String CLEAR_EDITOR_EVENT = "clearEditor";
- public static final String CLEAR_TREE_EVENT = "clearTree";
+ //public static final String CLEAR_TREE_EVENT = "clearTree";
public static final String ALBUM_ADDED_EVENT = "albumAdded";
public static final String IMAGE_DRAGGED_EVENT = "imageDraggedEvent";
public static final String ALBUM_DRAGGED_EVENT = "albumDraggedEvent";
@@ -163,6 +163,7 @@
public static final String PATH_PARAMETER = "path";
public static final String IMAGE_PATH_EXIST_QUERY = "image-exist";
public static final String SEARCH_NO_OPTIONS_ERROR = "You must select at least one search option";
+ public static final String TREE_ID = "mainform:tree";
private Constants(){
}
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java 2009-04-17 13:31:42 UTC (rev 13632)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java 2009-04-17 13:37:57 UTC (rev 13633)
@@ -42,5 +42,5 @@
void editShelf(Shelf shelf) throws RealworldException;
- List<Shelf> getShelfs(User user);
+ List<Shelf> getPredefinedShelves(User user);
}
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java 2009-04-17 13:31:42 UTC (rev 13632)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java 2009-04-17 13:37:57 UTC (rev 13633)
@@ -73,8 +73,8 @@
* @throws RealworldException
*/
public void deleteShelf(Shelf shelf) throws RealworldException {
- //Remove reference from user
try{
+ //Remove reference from user
user.removeShelf(shelf);
em.remove(shelf);
em.flush();
@@ -99,14 +99,11 @@
}
/**
- * Return list of shared shelfs(pre-defined) and if user is logged all user's shelfs
+ * Return list of shared shelves(pre-defined)
* @param shelf - shelf to Synchronize
*/
@SuppressWarnings("unchecked")
- public List<Shelf> getShelfs(User user) {
- Query query = em.createNamedQuery(Constants.USER_SHELVES_QUERY);
- //If user not-logged parameter will be set to null
- query.setParameter(Constants.USER_PARAMETER, user.getId() == null ? null : user);
- return query.getResultList();
+ public List<Shelf> getPredefinedShelves(User user) {
+ return em.createNamedQuery(Constants.USER_SHELVES_QUERY).getResultList();
}
}
\ No newline at end of file
More information about the richfaces-svn-commits
mailing list