[richfaces-svn-commits] JBoss Rich Faces SVN: r12797 - in trunk/test-applications/realworld2/web/src/main: webapp/img and 5 other directories.

Author: andrei_exadel Date: 2009-03-03 07:46:14 -0500 (Tue, 03 Mar 2009) New Revision: 12797 Added: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java trunk/test-applications/realworld2/web/src/main/webapp/img/search/ trunk/test-applications/realworld2/web/src/main/webapp/img/search/bull_arr_down.gif trunk/test-applications/realworld2/web/src/main/webapp/img/search/bull_arr_up.gif trunk/test-applications/realworld2/web/src/main/webapp/img/search/search_bg.png trunk/test-applications/realworld2/web/src/main/webapp/img/search/search_option_bg.png trunk/test-applications/realworld2/web/src/main/webapp/img/search/spacer.gif trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/tagsResult.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByAlbumTemplate.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByImageTemplate.xhtml trunk/test-applications/realworld2/web/src/main/webapp/layout/menu.xhtml trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css Log: Searching Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java 2009-03-03 00:59:57 UTC (rev 12796) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java 2009-03-03 12:46:14 UTC (rev 12797) @@ -25,8 +25,9 @@ public abstract String getSearchResultTemplate(); - public abstract void search(ISearchAction action); + public abstract void search(ISearchAction action, String searchQuery, boolean searchInMyAlbums, boolean searchInShared); + public boolean getSelected() { return selected; } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-03-03 00:59:57 UTC (rev 12796) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-03-03 12:46:14 UTC (rev 12797) @@ -14,7 +14,6 @@ import org.jboss.seam.annotations.Scope; import org.richfaces.realworld.navigation.NavigationEnum; import org.richfaces.realworld.service.ISearchAction; -import org.richfaces.realworld.service.SearchAction; import org.richfaces.realworld.util.ConversationState; @Name("searchImageHelper") @@ -35,16 +34,31 @@ String selectedTab; + String searchQuery; + + boolean seachInMyAlbums; + + boolean searchInShared = true; + public ImageSearchHelper() { options = new ArrayList<ISearchOption>(); options.add(new SearchOptionByAlbum()); options.add(new SearchOptionByImage()); + options.add(new SearchOptionByUser()); + options.add(new SearchOptionByTag()); } public void search(ActionEvent event) { conversationState.setMainArea(NavigationEnum.SEARCH); - selectedOption.search(searchAction); - setSelectedTab(selectedOption.getSearchResultName()); + Iterator<ISearchOption> it = options.iterator(); + while (it.hasNext()) { + ISearchOption option = it.next(); + if (option.getSelected()) { + option.search(searchAction, searchQuery, seachInMyAlbums, searchInShared); + }else { + option.setSearchResult(null); + } + } } boolean isOptionSelected() { @@ -101,6 +115,30 @@ public void setSelectedTab(String selectedTab) { this.selectedTab = selectedTab; } + + public String getSearchQuery() { + return searchQuery; + } + + public void setSearchQuery(String searchQuery) { + this.searchQuery = searchQuery; + } + + public boolean isSeachInMyAlbums() { + return seachInMyAlbums; + } + + public void setSeachInMyAlbums(boolean seachInMyAlbums) { + this.seachInMyAlbums = seachInMyAlbums; + } + + public boolean isSearchInShared() { + return searchInShared; + } + + public void setSearchInShared(boolean searchInShared) { + this.searchInShared = searchInShared; + } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java 2009-03-03 00:59:57 UTC (rev 12796) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java 2009-03-03 12:46:14 UTC (rev 12797) @@ -1,23 +1,19 @@ package org.richfaces.realworld.search; +import java.util.HashMap; +import java.util.Map; + import org.richfaces.realworld.service.ISearchAction; -import org.richfaces.realworld.util.ConversationState; public class SearchOptionByAlbum extends ISearchOption { + Map<String, Object> params = new HashMap<String, Object>(); - String albumName; - - String ownerName; - - String description; - - boolean shared; @Override public String getName() { - return "Search By Album"; + return "Albums"; } @Override @@ -26,8 +22,8 @@ } @Override - public void search(ISearchAction action) { - setSearchResult(action.searchByAlbum(albumName, description, ownerName, shared)); + public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) { + setSearchResult(action.searchByAlbum(q, searchInMyAlbums, searchInShared)); } @Override @@ -39,39 +35,15 @@ public String getSearchResultTemplate() { return "/includes/search/result/albumsResult.xhtml"; } - - - public String getAlbumName() { - return albumName; + public Map<String, Object> getParams() { + return params; } - public void setAlbumName(String albumName) { - this.albumName = albumName; + public void setParams(Map<String, Object> params) { + this.params = params; } + - public String getOwnerName() { - return ownerName; - } - public void setOwnerName(String ownerName) { - this.ownerName = ownerName; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public boolean getShared() { - return shared; - } - - public void setShared(boolean shared) { - this.shared = shared; - } - } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java 2009-03-03 00:59:57 UTC (rev 12796) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java 2009-03-03 12:46:14 UTC (rev 12797) @@ -4,7 +4,10 @@ package org.richfaces.realworld.search; import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import org.jboss.seam.annotations.In; import org.richfaces.realworld.service.ISearchAction; /** @@ -13,29 +16,13 @@ */ public class SearchOptionByImage extends ISearchOption { - String fileName; + Map<String, Object> params = new HashMap<String, Object>(); - String description; - - String path; - - Integer fileSize; - - Integer width; - - Integer height; - - Date uploadedDate; - - Date createdDate; - - - /* (non-Javadoc) * @see org.richfaces.realworld.search.ISearchOption#getName() */ public String getName() { - return "Search By Image"; + return "Images"; } @Override @@ -44,8 +31,8 @@ } @Override - public void search(ISearchAction action) { - setSearchResult(action.searchByImage(fileName, description, path, width, height, fileSize, createdDate, uploadedDate)); + public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) { + setSearchResult(action.searchByImage(q, searchInMyAlbums, searchInShared)); } @@ -61,75 +48,15 @@ return "/includes/search/result/imageResult.xhtml"; } - - public String getFileName() { - return fileName; + public Map<String, Object> getParams() { + return params; } - - public void setFileName(String fileName) { - this.fileName = fileName; + public void setParams(Map<String, Object> params) { + this.params = params; } - public Integer getFileSize() { - return fileSize; - } - - public void setFileSize(Integer fileSize) { - this.fileSize = fileSize; - } - - - public Date getUploadedDate() { - return uploadedDate; - } - - - public void setUploadedDate(Date uploadedDate) { - this.uploadedDate = uploadedDate; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public Integer getWidth() { - return width; - } - - public void setWidth(Integer width) { - this.width = width; - } - - public Integer getHeight() { - return height; - } - - public void setHeight(Integer height) { - this.height = height; - } - - public Date getCreatedDate() { - return createdDate; - } - - public void setCreatedDate(Date createdDate) { - this.createdDate = createdDate; - } - } Added: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java (rev 0) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java 2009-03-03 12:46:14 UTC (rev 12797) @@ -0,0 +1,57 @@ +/** + * + */ +package org.richfaces.realworld.search; + +import org.richfaces.realworld.service.ISearchAction; + +/** + * @author Andrey + * + */ +public class SearchOptionByTag extends ISearchOption { + + /* (non-Javadoc) + * @see org.richfaces.realworld.search.ISearchOption#getName() + */ + @Override + public String getName() { + return "Tags"; + } + + /* (non-Javadoc) + * @see org.richfaces.realworld.search.ISearchOption#getSearchResultName() + */ + @Override + public String getSearchResultName() { + return "Tags"; + } + + /* (non-Javadoc) + * @see org.richfaces.realworld.search.ISearchOption#getSearchResultTemplate() + */ + @Override + public String getSearchResultTemplate() { + return "includes/search/result/tagsResult.xhtml"; + } + + /* (non-Javadoc) + * @see org.richfaces.realworld.search.ISearchOption#getTemplate() + */ + @Override + public String getTemplate() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.richfaces.realworld.search.ISearchOption#search(org.richfaces.realworld.service.ISearchAction, java.lang.String, boolean, boolean) + */ + @Override + public void search(ISearchAction action, String searchQuery, + boolean searchInMyAlbums, boolean searchInShared) { + setSearchResult(action.searchByTags(searchQuery, searchInMyAlbums, searchInShared)); + + } + +} Added: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java (rev 0) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java 2009-03-03 12:46:14 UTC (rev 12797) @@ -0,0 +1,55 @@ +/** + * + */ +package org.richfaces.realworld.search; + +import org.richfaces.realworld.service.ISearchAction; + +/** + * @author Andrey Markavtsov + * + */ +public class SearchOptionByUser extends ISearchOption { + + /* (non-Javadoc) + * @see org.richfaces.realworld.search.ISearchOption#getName() + */ + @Override + public String getName() { + return "Users"; + } + + /* (non-Javadoc) + * @see org.richfaces.realworld.search.ISearchOption#getSearchResultName() + */ + @Override + public String getSearchResultName() { + return "Users"; + } + + /* (non-Javadoc) + * @see org.richfaces.realworld.search.ISearchOption#getSearchResultTemplate() + */ + @Override + public String getSearchResultTemplate() { + return "/includes/search/result/userResult.xhtml"; + } + + /* (non-Javadoc) + * @see org.richfaces.realworld.search.ISearchOption#getTemplate() + */ + @Override + public String getTemplate() { + return null; + } + + /* (non-Javadoc) + * @see org.richfaces.realworld.search.ISearchOption#search(org.richfaces.realworld.service.ISearchAction) + */ + @Override + public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) { + setSearchResult(action.searchByUsers(q, searchInMyAlbums, searchInShared)); + + } + +} Added: trunk/test-applications/realworld2/web/src/main/webapp/img/search/bull_arr_down.gif =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/search/bull_arr_down.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/test-applications/realworld2/web/src/main/webapp/img/search/bull_arr_up.gif =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/search/bull_arr_up.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/test-applications/realworld2/web/src/main/webapp/img/search/search_bg.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/search/search_bg.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/test-applications/realworld2/web/src/main/webapp/img/search/search_option_bg.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/search/search_option_bg.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/test-applications/realworld2/web/src/main/webapp/img/search/spacer.gif =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/search/spacer.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/tagsResult.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/tagsResult.xhtml (rev 0) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/tagsResult.xhtml 2009-03-03 12:46:14 UTC (rev 12797) @@ -0,0 +1,10 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <a4j:repeat id="previewList" value="#{result}" var="tag"> + <h:outputText value="#{tag.tag}"></h:outputText><br/> + </a4j:repeat> +</ui:composition> \ No newline at end of file Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml (rev 0) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-03-03 12:46:14 UTC (rev 12797) @@ -0,0 +1,12 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <a4j:repeat id="previewList" value="#{result}" var="user"> + <div> + <img src="" width="50" height="50" /><h:outputText value="#{user.firstName user.lastName}"></h:outputText> + </div> + </a4j:repeat> +</ui:composition> \ No newline at end of file Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByAlbumTemplate.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByAlbumTemplate.xhtml 2009-03-03 00:59:57 UTC (rev 12796) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByAlbumTemplate.xhtml 2009-03-03 12:46:14 UTC (rev 12797) @@ -7,13 +7,13 @@ <h:panelGrid columns="2"> <h:outputText value="Name"></h:outputText> - <h:inputText value="#{searchImageHelper.selectedOption.albumName}" /> + <h:inputText value="#{searchImageHelper.selectedOption.params['name']}" /> <h:outputText value="Description"></h:outputText> - <h:inputText value="#{searchImageHelper.selectedOption.description}"></h:inputText> + <h:inputText value="#{searchImageHelper.selectedOption.params['description']}"></h:inputText> <h:outputText value="Owner Name"></h:outputText> - <h:inputText value="#{searchImageHelper.selectedOption.ownerName}" /> + <h:inputText value="#{searchImageHelper.selectedOption.params['owner.login']}" /> <h:outputText value="Shared"></h:outputText> - <h:inputText value="#{searchImageHelper.selectedOption.shared}" /> + <h:selectBooleanCheckbox value="#{searchImageHelper.selectedOption.params['shared']}"></h:selectBooleanCheckbox> </h:panelGrid> Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByImageTemplate.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByImageTemplate.xhtml 2009-03-03 00:59:57 UTC (rev 12796) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByImageTemplate.xhtml 2009-03-03 12:46:14 UTC (rev 12797) @@ -7,21 +7,21 @@ <h:panelGrid columns="2"> <h:outputText value="Name"></h:outputText> - <h:inputText value="#{searchImageHelper.selectedOption.fileName}" /> + <h:inputText value="#{searchImageHelper.selectedOption.params['name']}" /> <h:outputText value="Description"></h:outputText> - <h:inputText value="#{searchImageHelper.selectedOption.description}" /> + <h:inputText value="#{searchImageHelper.selectedOption.params['description']}" /> <h:outputText value="Path"></h:outputText> - <h:inputText value="#{searchImageHelper.selectedOption.path}" /> + <h:inputText value="#{searchImageHelper.selectedOption.params['path']}" /> <h:outputText value="Size"></h:outputText> - <h:inputText value="#{searchImageHelper.selectedOption.fileSize}" /> + <h:inputText value="#{searchImageHelper.selectedOption.params['size']}" converter="javax.faces.Integer" /> <h:outputText value="Width"></h:outputText> - <h:inputText value="#{searchImageHelper.selectedOption.width}" /> + <h:inputText value="#{searchImageHelper.selectedOption.params['width']}" converter="javax.faces.Integer" /> <h:outputText value="Height"></h:outputText> - <h:inputText value="#{searchImageHelper.selectedOption.height}" /> + <h:inputText value="#{searchImageHelper.selectedOption.params['height']}" converter="javax.faces.Integer"/> <h:outputText value="Uploaded Date"></h:outputText> - <rich:calendar value="#{searchImageHelper.selectedOption.uploadedDate}"></rich:calendar> + <rich:calendar value="#{searchImageHelper.selectedOption.params['uploaded']}" /> <h:outputText value="Created Date"></h:outputText> - <rich:calendar value="#{searchImageHelper.selectedOption.createdDate}"></rich:calendar> + <rich:calendar value="#{searchImageHelper.selectedOption.params['created']}" /> </h:panelGrid> </ui:composition> \ No newline at end of file Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/menu.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-03 00:59:57 UTC (rev 12796) +++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-03 12:46:14 UTC (rev 12797) @@ -288,3 +288,113 @@ color: black; } +.search-div { + height: 65px; + width: 339px; + position: absolute; + top: 64px; + right: 0px; + margin-right: 0px; +} + +.search-img-bg { + position: absolute; + top: 0px; + left: 0px; +} + +.search-label { + position: absolute; + color: rgb(255, 255, 255); + font-weight: bold; + top: 22px; + left: 20px; +} + +.search-find-button { + position: absolute; + color: rgb(255, 255, 255); + font-weight: bold; + top: 21px; + left: 277px; + text-decoration: none; +} + +.search-input { + border: 0px none ; + background: transparent none repeat scroll 0% 0%; + width: 176px; + height: 17px; + position: absolute; + top: 20px; + left: 73px; + -moz-background-clip: -moz-initial; + -moz-background-origin: -moz-initial; + -moz-background-inline-policy: -moz-initial; + font-weight: bold; +} + +.search-img { + width: 61px; + height: 18px; + position: absolute; + top: 20px; + left: 261px; +} + +.search-option-div { + position: absolute; + top: 41px; + left: 197px; +} + +.search-option-link { + color: rgb(255, 255, 255); + text-decoration: none; +} + +.search-options { + background: transparent none repeat scroll 0% 0%; + overflow: hidden; + height: 90px; + width: 327px; + position: absolute; + top: 107px; + right: 5px; + -moz-background-clip: -moz-initial; + -moz-background-origin: -moz-initial; + -moz-background-inline-policy: -moz-initial; +} + +.search-option-img { + position: absolute; + bottom: 0px; + left: 0px; +} + +.search-options-div1 { + position: absolute; + color: white; + top: 7px; + left: 45px; +} + +.search-options-div2 { + border-top: 1px solid rgb(56, 56, 56); + position: absolute; + color: white; + top: 32px; + padding-top: 3px; + left: 38px; +} + +.search-hide-options-div { + position: absolute; + top: 70px; + left: 163px; +} + +.search-hide-options-link { + color: rgb(255, 255, 255); + text-decoration: none; +} \ No newline at end of file