Author: amarkhel
Date: 2008-11-28 11:31:04 -0500 (Fri, 28 Nov 2008)
New Revision: 11438
Added:
trunk/test-applications/realworld/web/src/main/webapp/readMessages.xhtml
trunk/test-applications/realworld/web/src/main/webapp/search.xhtml
Modified:
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/User.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationEnum.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationHelper.java
trunk/test-applications/realworld/web/src/main/webapp/index.xhtml
trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml
trunk/test-applications/realworld/web/src/main/webapp/main.xhtml
trunk/test-applications/realworld/web/src/main/webapp/navigation.xhtml
Log:
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-11-28
16:00:59 UTC (rev 11437)
+++
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/User.java 2008-11-28
16:31:04 UTC (rev 11438)
@@ -106,7 +106,7 @@
joinColumns = @JoinColumn(name = "USER1_ID"),
inverseJoinColumns = @JoinColumn(name = "USER2_ID")
)
- private Set<User> friends;
+ private List<User> friends;
@Temporal(TemporalType.TIMESTAMP)
private Date birthDate;
@@ -231,11 +231,11 @@
this.confirmPassword = confirmPassword;
}
- public Set<User> getFriends() {
+ public List<User> getFriends() {
return friends;
}
- public void setFriends(Set<User> friends) {
+ public void setFriends(List<User> friends) {
this.friends = friends;
}
Modified:
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationEnum.java
===================================================================
---
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationEnum.java 2008-11-28
16:00:59 UTC (rev 11437)
+++
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationEnum.java 2008-11-28
16:31:04 UTC (rev 11438)
@@ -3,5 +3,5 @@
public enum NavigationEnum {
IMAGE_PREVIEW,
FILE_UPLOAD,
- USER_PREFS,
+ USER_PREFS, SEARCH, READ_MESSAGES,
}
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-11-28
16:00:59 UTC (rev 11437)
+++
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationHelper.java 2008-11-28
16:31:04 UTC (rev 11438)
@@ -11,10 +11,14 @@
return NavigationEnum.USER_PREFS;
}
- public NavigationEnum getNavigationEnumImagePreview(){
- return NavigationEnum.IMAGE_PREVIEW;
+ public NavigationEnum getNavigationSearch(){
+ return NavigationEnum.SEARCH;
}
+ public NavigationEnum getNavigationReadMessages(){
+ return NavigationEnum.READ_MESSAGES;
+ }
+
public NavigationEnum getNavigationEnumFileUpload(){
return NavigationEnum.FILE_UPLOAD;
}
Modified: trunk/test-applications/realworld/web/src/main/webapp/index.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/main.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/navigation.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld/web/src/main/webapp/readMessages.xhtml
===================================================================
(Binary files differ)
Property changes on:
trunk/test-applications/realworld/web/src/main/webapp/readMessages.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/test-applications/realworld/web/src/main/webapp/search.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/search.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Show replies by date