Author: amarkhel Date: 2009-01-12 14:16:58 -0500 (Mon, 12 Jan 2009) New Revision: 12237 Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/ErrorHandler.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/ErrorHandlerBean.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/ErrorHandlerInterceptor.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/RealworldException.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/EditorBean.java trunk/test-applications/realworld/web/src/main/resources/messages_ru.properties trunk/test-applications/realworld/web/src/main/resources/org/ trunk/test-applications/realworld/web/src/main/resources/org/richfaces/ trunk/test-applications/realworld/web/src/main/resources/org/richfaces/realworld/ trunk/test-applications/realworld/web/src/main/resources/org/richfaces/realworld/editor/ trunk/test-applications/realworld/web/src/main/resources/org/richfaces/realworld/editor/advanced.properties trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/error.xhtml trunk/test-applications/realworld/web/src/main/webapp/img/gb.png trunk/test-applications/realworld/web/src/main/webapp/img/ru.png Removed: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/lib/metadata-extractor-2.3.1.jar Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java trunk/test-applications/realworld/ejb/src/main/resources/import.sql trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileManager.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/gallery/GalleryBean.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/UserManager.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/slideshow/SlideshowBean.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/MessagePanelHelper.java trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/faces-config.xml trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/message.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/image/comments.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/image/imagePreview.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/image/slideshow.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/imagePreview.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/messages.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/misc/modalPanels.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/panelBar/sharedAlbums.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/panelBar/tree.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchResults.xhtml trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml trunk/test-applications/realworld/web/src/main/webapp/main.xhtml Log: Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java =================================================================== --- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -49,9 +49,6 @@ public List<Image> searchImages(String searchPattern, String additionalParams, Map<String, Object> paramMap){ String fullQuery = null; - if(searchPattern.equals("")){ - return null; - } if(paramMap != null && paramMap.get(CASE_SENSITIVE_PARAMETER) != null){ boolean sensitive = (Boolean)paramMap.get(CASE_SENSITIVE_PARAMETER); if(sensitive){ 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 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -88,7 +88,7 @@ public boolean isUserExist(String login) { return em.createNamedQuery(USER_EXIST_QUERY) .setParameter(LOGIN_PARAMETER, login) - .getResultList().size() == 0; + .getResultList().size() != 0; } public List<String> getUsers(String suggest) { @@ -134,6 +134,7 @@ public void addSharedAlbum(Album album) { user.addSharedAlbum(album); + album.getSharedOwners().add(user); em.flush(); } Modified: trunk/test-applications/realworld/ejb/src/main/resources/import.sql =================================================================== --- trunk/test-applications/realworld/ejb/src/main/resources/import.sql 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/ejb/src/main/resources/import.sql 2009-01-12 19:16:58 UTC (rev 12237) @@ -1,6 +1,7 @@ INSERT INTO Users(user_id, firstname, secondname, email, avatarpath, login, password, birthdate) VALUES (1, 'Andrey', 'Markhel', &#39;amarkhel(a)exadel.com&#39;, 'avatar.jpg', 'amarkhel', '12345', '1985-01-08'); INSERT INTO Users(user_id, firstname, secondname, email, avatarpath, login, password, birthdate) VALUES (2, 'Andrey', 'Markhel', &#39;amarkhel(a)exadel.com&#39;, 'avatar.jpg', 'root', '12345', '1985-01-08'); INSERT INTO Users(user_id, firstname, secondname, email, avatarpath, login, password, birthdate) VALUES (3, 'Andrey', 'Markhel', &#39;amarkhel(a)exadel.com&#39;, 'avatar.jpg', 'qqqq', '12345', '1985-01-08'); +INSERT INTO Users(user_id, firstname, secondname, email, avatarpath, login, password, birthdate) VALUES (4, 'Andrey', 'Markhel', &#39;amarkhel(a)exadel.com&#39;, 'avatar.jpg', 'sss', '12345', '1985-01-08'); INSERT INTO albums(album_id, name, description, shared, album_user_id) VALUES (1, 'Cars', 'Photo of my dog', true, 1); INSERT INTO albums(album_id, name, description, shared, album_user_id) VALUES (2, 'Tetki', 'Simple Album 2', true, 1); INSERT INTO albums(album_id, name, description, shared, album_user_id) VALUES (3, 'Football', 'Simple Album 3', true, 2); Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/ErrorHandler.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/ErrorHandler.java (rev 0) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/ErrorHandler.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -0,0 +1,13 @@ +package org.richfaces.realworld.error; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.jboss.seam.annotations.intercept.Interceptors; + +(a)Target({ElementType.TYPE ,ElementType.METHOD }) +(a)Retention(RetentionPolicy.RUNTIME) +(a)Interceptors(ErrorHandlerInterceptor.class) +public @interface ErrorHandler {} Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/ErrorHandler.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/error/ErrorHandlerBean.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/ErrorHandlerBean.java (rev 0) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/ErrorHandlerBean.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -0,0 +1,47 @@ +package org.richfaces.realworld.error; + +import java.util.ArrayList; +import java.util.List; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.context.AjaxContext; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.AutoCreate; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Observer; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.Startup; + +@Name("errorHandlerBean") +(a)Scope(ScopeType.EVENT) +@AutoCreate +public class ErrorHandlerBean { + + private List<Exception> errors = new ArrayList<Exception>(); + + public List<Exception> getErrors() { + return errors; + } + + public void setErrors(List<Exception> errors) { + this.errors = errors; + } + + public boolean isErrorExist(){ + return errors.size() > 0 ; + } + + @Observer("clearErrorEvent") + public void clearEvents(){ + errors.clear(); + } + + @Observer("addErrorEvent") + public void addToErrors(Exception e){ + FacesContext context = FacesContext.getCurrentInstance(); + AjaxContext ac = AjaxContext.getCurrentInstance(context); + ac.addRenderedArea("mainform:error"); + errors.add(e); + } +} Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/ErrorHandlerBean.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/error/ErrorHandlerInterceptor.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/ErrorHandlerInterceptor.java (rev 0) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/ErrorHandlerInterceptor.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -0,0 +1,18 @@ +package org.richfaces.realworld.error; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.intercept.AroundInvoke; +import org.jboss.seam.annotations.intercept.Interceptor; +import org.jboss.seam.core.BijectionInterceptor; +import org.jboss.seam.core.Events; +import org.jboss.seam.intercept.InvocationContext; + +@Name("interceptor") +public class ErrorHandlerInterceptor { + + @AroundInvoke + public Object process(InvocationContext invocation) throws Exception { + Events.instance().raiseEvent("clearErrorEvent"); + return invocation.proceed(); + } +} Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/ErrorHandlerInterceptor.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/error/RealworldException.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/RealworldException.java (rev 0) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/RealworldException.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -0,0 +1,21 @@ +package org.richfaces.realworld.error; + +import javax.ejb.ApplicationException; + +@ApplicationException +public class RealworldException extends Exception{ + + private static final long serialVersionUID = -5514996140663854304L; + + public RealworldException(String message) { + super(message); + } + + public RealworldException(String message, Throwable cause) { + super(message, cause); + } + + public RealworldException(Throwable cause) { + super(cause); + } +} Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/error/RealworldException.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/fileupload/FileManager.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileManager.java 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileManager.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -26,7 +26,6 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.HashMap; @@ -157,7 +156,7 @@ g.drawRenderedImage(bsrc, at); String dest = getUploadRoot() + transformPath(fileName, format); - ImageIO.write(bsrc, "JPG", new File(dest)); + ImageIO.write(bdest, "JPG", new File(dest)); inputStream.close(); } Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -36,7 +36,6 @@ 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; @Name("imageLoader") Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/gallery/GalleryBean.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/gallery/GalleryBean.java 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/gallery/GalleryBean.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -17,6 +17,7 @@ import org.richfaces.model.UploadItem; import org.richfaces.realworld.domain.Gallery; import org.richfaces.realworld.domain.GalleryImage; +import org.richfaces.realworld.error.ErrorHandler; import org.richfaces.realworld.fileupload.FileItem; import org.richfaces.realworld.fileupload.FileManager; import org.richfaces.realworld.service.IGalleryAction; @@ -67,7 +68,7 @@ image.setName(name); image.setUploaded(new Date()); image.setPath(path); - image.setSize(file.getLength()); + image.setSize(file.getLength()/1000); try { InputStream in = new ByteArrayInputStream(file.getData()); Metadata metadata = JpegMetadataReader.readMetadata(in); Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -29,6 +29,7 @@ import org.jboss.seam.annotations.Scope; import org.richfaces.realworld.domain.Album; import org.richfaces.realworld.domain.User; +import org.richfaces.realworld.error.ErrorHandler; import org.richfaces.realworld.fileupload.FileManager; import org.richfaces.realworld.service.IAlbumAction; import org.richfaces.realworld.tree.TreeAlbumItem; Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -24,6 +24,7 @@ import java.io.Serializable; import javax.faces.application.FacesMessage; +import javax.faces.application.FacesMessage.Severity; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -106,9 +107,9 @@ } if(user.getChildAlbums().size() > 0){ selectionHelper.setSelectedAlbum(user.getChildAlbums().get(0)); - if(selectionHelper.getSelectedAlbum().getImages().size() > 0){ - selectionHelper.setSelectedImage(selectionHelper.getSelectedAlbum().getImages().get(0)); - } + //if(selectionHelper.getSelectedAlbum().getImages().size() > 0){ + //selectionHelper.setSelectedImage(selectionHelper.getSelectedAlbum().getImages().get(0)); + //} } Events.instance().raiseEvent(UPDATE_MAIN_AREA_EVENT, NavigationEnum.IMAGE_PREVIEW); return true; @@ -152,6 +153,9 @@ e.printStackTrace(); } } + + String messageTemplate = "You are successfully registered."; + facesMessages.add(messageTemplate); return INDEX_OUTCOME; } } Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -31,6 +31,7 @@ import org.richfaces.realworld.domain.Comment; import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.domain.User; +import org.richfaces.realworld.error.ErrorHandler; import org.richfaces.realworld.fileupload.FileManager; import org.richfaces.realworld.service.IImageAction; import org.richfaces.realworld.tree.TreeAlbumItem; Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/UserManager.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -35,6 +35,7 @@ import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.domain.Message; import org.richfaces.realworld.domain.User; +import org.richfaces.realworld.error.ErrorHandler; import org.richfaces.realworld.navigation.NavigationEnum; import org.richfaces.realworld.service.IMessageAction; import org.richfaces.realworld.service.IUserAction; @@ -119,7 +120,7 @@ throw new Exception("This user won't be your friend!"); }*/ } - + public void addToSharedAlbums(Image image){ userAction.addSharedAlbum(image.getAlbum()); } 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 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchBean.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -38,6 +38,7 @@ import org.richfaces.realworld.domain.Album; import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.domain.User; +import org.richfaces.realworld.error.ErrorHandler; import org.richfaces.realworld.service.ISearchService; import org.richfaces.realworld.service.SearchService; Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -27,6 +27,7 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; +import org.richfaces.realworld.error.ErrorHandler; import org.richfaces.realworld.tree.TreeSelectionManager; @Name("slideshow") @@ -76,8 +77,8 @@ public void updateInterval(){ this.setInterval((int)(DELAY * Long.valueOf(slideshowHelper.getInputSlider().getValue().toString()))); } - - public void incrementSlide(){ + @ErrorHandler + public void incrementSlide() { treeSelectionManager.incrementSlideshowIndex(); } } 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 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -28,7 +28,6 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; import javax.faces.model.SelectItem; import org.ajax4jsf.context.AjaxContext; @@ -39,6 +38,7 @@ import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Synchronized; +import org.jboss.seam.core.Events; import org.richfaces.component.UIDatascroller; import org.richfaces.component.UIDragSupport; import org.richfaces.component.UITree; @@ -51,6 +51,7 @@ import org.richfaces.model.TreeRowKey; import org.richfaces.realworld.domain.Album; import org.richfaces.realworld.domain.Image; +import org.richfaces.realworld.error.ErrorHandler; import org.richfaces.realworld.fileupload.FileManager; import org.richfaces.realworld.manager.ImageManager; import org.richfaces.realworld.navigation.NavigationEnum; @@ -70,6 +71,8 @@ private static final String NEXT = "next"; private static final String LAST = "last"; + + private static final String UPDATE_MAIN_AREA_EVENT = "updateMainArea"; private static final String PREVIOUS = "previous"; @@ -246,6 +249,7 @@ nodeTitle = ((TreeAlbumItem) (tree.getRowData())).getAlbum() .getName(); } + Events.instance().raiseEvent(UPDATE_MAIN_AREA_EVENT, NavigationEnum.IMAGE_PREVIEW); TreeNode<String> currentNode = tree.getModelTreeNode(tree.getRowKey()); selectionHelper.setUserAlbumSelected(true); if(currentNode instanceof TreeImageItem){ @@ -260,9 +264,10 @@ return; }else if(currentNode instanceof TreeAlbumItem){ TreeAlbumItem node = (TreeAlbumItem)currentNode; + selectionHelper.setSelectedImage(null); setDataScrollerIndex(0); if (node.isLeaf()) { - selectionHelper.setSelectedImage(null); + //selectionHelper.setSelectedImage(null); Album album = node.getAlbum(); selectionHelper.setSelectedAlbum(album); }else{ @@ -270,7 +275,7 @@ return; }else{ selectionHelper.setSelectedAlbum(node.getAlbum()); - selectionHelper.setSelectedImage(node.getAlbum().getImages().get(0)); + //selectionHelper.setSelectedImage(node.getAlbum().getImages().get(0)); } } } @@ -280,9 +285,9 @@ } } - public void updateScroller(ActionEvent event){ - this.setDataScrollerIndex(selectionHelper.getSelectedImageIndex()- 1); - } + //public void updateScroller(ActionEvent event){ + //this.setDataScrollerIndex(selectionHelper.getSelectedImageIndex()- 1); + //} private void setDataScrollerIndex(int index) { UIComponent component = FacesContext.getCurrentInstance().getViewRoot(); @@ -292,7 +297,12 @@ selectionHelper.setSelectedImageIndex(index+1); } + public void incrementSlideshowIndex() { + if(null == selectionHelper.getSelectedAlbum()){ + //Events.instance().raiseEvent("addErrorEvent", new RealworldException("You have no albums and images")); + return; + } int index = selectionHelper.getSelectedAlbum().getIndex(selectionHelper.getSelectedImage()); if(selectionHelper.getSelectedAlbum().getImages().size() == index +1){ index = -1; @@ -329,6 +339,7 @@ return group; } + @ErrorHandler public void updateSelectedItems(Image image){ selectionHelper.setSelectedImage(image); Integer index = selectionHelper.getSelectedAlbum().getIndex(selectionHelper.getSelectedImage()); Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/EditorBean.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/EditorBean.java (rev 0) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/EditorBean.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -0,0 +1,24 @@ +package org.richfaces.realworld.util; + +import org.jboss.seam.annotations.Name; + +@Name("editorBean") +public class EditorBean { + + private String currentConfiguration = "/org/richfaces/realworld/editor/advanced"; + + private boolean liveUpdatesEnabled=false; + + public String getCurrentConfiguration() { + return currentConfiguration; + } + + public boolean isLiveUpdatesEnabled() { + return liveUpdatesEnabled; + } + + public void setLiveUpdatesEnabled(boolean liveUpdatesEnabled) { + this.liveUpdatesEnabled = liveUpdatesEnabled; + } + +} Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/EditorBean.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/MessagePanelHelper.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/MessagePanelHelper.java 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/MessagePanelHelper.java 2009-01-12 19:16:58 UTC (rev 12237) @@ -42,6 +42,8 @@ private boolean sendRequired; + private boolean messageSelected; + private boolean searchRequired = false; @In @@ -53,6 +55,10 @@ @In(create=true, required=true) @Out private UserManager userManager; + public void closeMessage(){ + this.setMessageSelected(false); + } + public void initReMessage(boolean sendRequired, Message message){ this.sendRequired = sendRequired; this.message = new Message(); @@ -61,6 +67,7 @@ this.message.setOwner(message.getAuthor()); this.message.setReaded(false); this.searchRequired = false; + this.setMessageSelected(true); } public void initMessage(boolean sendRequired, Message message, boolean userSearchRequired){ @@ -69,6 +76,7 @@ this.message = new Message(); this.message.setAuthor(user); this.message.setReaded(false); + this.setMessageSelected(true); } public void initMessage(boolean sendRequired, Message message){ @@ -77,6 +85,7 @@ this.message.setReaded(true); this.searchRequired = false; userManager.setCountUnreadedMessages(null); + this.setMessageSelected(true); } public void initMessage(boolean sendRequired, User owner){ @@ -86,6 +95,7 @@ this.message.setOwner(owner); this.message.setReaded(false); this.searchRequired = false; + this.setMessageSelected(true); } public void initMessage(boolean sendRequired, User owner, String theme, String message){ @@ -97,6 +107,7 @@ this.message.setTheme(theme); this.message.setMessage(message); this.searchRequired = false; + this.setMessageSelected(true); } public void initMessage(boolean sendRequired, User owner, String theme, String message, boolean friendshipRequest){ @@ -109,11 +120,13 @@ this.message.setMessage(message); this.message.setFriendshipRequest(friendshipRequest); this.searchRequired = false; + this.setMessageSelected(true); } public void sendMessage(ActionEvent event){ this.message.setDate(new Date()); userManager.sendMessage(this.message); + this.setMessageSelected(false); } public boolean isSendRequired() { @@ -131,4 +144,12 @@ public void setSearchRequired(boolean searchRequired) { this.searchRequired = searchRequired; } + + public boolean isMessageSelected() { + return messageSelected; + } + + public void setMessageSelected(boolean messageSelected) { + this.messageSelected = messageSelected; + } } Added: trunk/test-applications/realworld/web/src/main/resources/messages_ru.properties =================================================================== --- trunk/test-applications/realworld/web/src/main/resources/messages_ru.properties (rev 0) +++ trunk/test-applications/realworld/web/src/main/resources/messages_ru.properties 2009-01-12 19:16:58 UTC (rev 12237) @@ -0,0 +1,198 @@ +\ufeffvalidator.assertFalse=\u041f\u0440\u0438 \u0432\u0430\u043b\u0438\u0434\u0430\u0446\u0438\u0438 \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430 +validator.assertTrue=\u041F\u0440\u0438 \u0432\u0430\u043B\u0438\u0434\u0430\u0446\u0438\u0438 \u043F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430 +validator.future=\u042D\u0442\u0430 \u0434\u0430\u0442\u0430 \u0434\u043E\u043B\u0436\u043D\u0430 \u0431\u044B\u0442\u044C \u0432 \u0431\u0443\u0434\u0443\u0449\u0435\u043C +validator.length=\u0414\u043B\u0438\u043D\u0430 \u0434\u043E\u043B\u0436\u043D\u0430 \u0431\u044B\u0442\u044C \u043C\u0435\u0436\u0434\u0443 {min} \u0438 {max} +validator.max=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u043C\u0435\u043D\u044C\u0448\u0435 \u0438\u043B\u0438 \u0440\u0430\u0432\u043D\u044B\u043C {value} +validator.min=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u0431\u043E\u043B\u044C\u0448\u0435 \u0438\u043B\u0438 \u0440\u0430\u0432\u043D\u044B\u043C {value} +validator.notNull=\u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u043D\u0443\u043B\u0435\u043C +validator.past=\u042D\u0442\u0430 \u0434\u0430\u0442\u0430 \u0434\u043E\u043B\u0436\u043D\u0430 \u0431\u044B\u0442\u044C \u0432 \u043F\u0440\u043E\u0448\u043B\u043E\u043C +validator.pattern=\u0434\u043E\u043B\u0436\u043D\u043E \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u043E\u0432\u0430\u0442\u044C \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u044E "{regex}" +validator.range=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0434\u043E\u043B\u0436\u043D\u043E \u043D\u0430\u0445\u043E\u0434\u0438\u0442\u044C\u0441\u044F \u043C\u0435\u0436\u0434\u0443 {min} \u0438 {max} +validator.size=\u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u043C\u0435\u0436\u0434\u0443 {min} \u0438 {max} +validator.email=email \u0430\u0434\u0440\u0435\u0441 \u0434\u043E\u043B\u0436\u0435\u043D \u0431\u044B\u0442\u044C \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u044B\u043C + +org.jboss.seam.loginFailed=\u041E\u0448\u0438\u0431\u043A\u0430 \u043F\u0440\u0438 \u043B\u043E\u0433\u0438\u043D\u0435 +org.jboss.seam.loginSuccessful=\u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C, \#0 + +javax.faces.component.UIInput.CONVERSION=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u043F\u043E\u043B\u044F \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u043F\u0440\u0435\u043E\u0431\u0440\u0430\u0437\u043E\u0432\u0430\u043D\u043E \u043A \u043D\u0443\u0436\u043D\u043E\u043C\u0443 \u0444\u043E\u0440\u043C\u0430\u0442\u0443 +javax.faces.component.UIInput.REQUIRED=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E +javax.faces.component.UIInput.UPDATE=\u043F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430 +javax.faces.component.UISelectOne.INVALID=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u043D\u0435\u0432\u0435\u0440\u043D\u043E +javax.faces.component.UISelectMany.INVALID=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u043D\u0435\u0432\u0435\u0440\u043D\u043E + +javax.faces.converter.BigDecimalConverter.DECIMAL=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u0447\u0438\u0441\u043B\u043E\u043C +javax.faces.converter.BigDecimalConverter.DECIMAL_detail=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u043F\u043E\u043B\u043E\u0436\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u043C \u0432\u0435\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u043C \u0447\u0438\u0441\u043B\u043E\u043C, \u0441\u043E\u0441\u0442\u043E\u044F\u0449\u0438\u043C \u0438\u0437 \u043E\u0434\u043D\u043E\u0439 \u0438\u043B\u0438 \u0431\u043E\u043B\u0435\u0435 \u0446\u0438\u0444\u0440, \u0430 \u0442\u0430\u043A\u0436\u0435 \u043E\u043F\u0446\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u043E \u0434\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u043E \u0442\u043E\u0447\u043A\u043E\u0439, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440 . {1} +javax.faces.converter.BigIntegerConverter.BIGINTEGER=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u0446\u0435\u043B\u044B\u043C \u0447\u0438\u0441\u043B\u043E\u043C +javax.faces.converter.BigIntegerConverter.BIGINTEGER_detail=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u043F\u043E\u043B\u043E\u0436\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u043C \u0447\u0438\u0441\u043B\u043E\u043C, \u0441\u043E\u0441\u0442\u043E\u044F\u0449\u0438\u043C \u0438\u0437 \u043E\u0434\u043D\u043E\u0439 \u0438\u043B\u0438 \u0431\u043E\u043B\u0435\u0435 \u0446\u0438\u0444\u0440 +javax.faces.converter.BooleanConverter.BOOLEAN=\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u043B\u0438\u0431\u043E \u0438\u0441\u0442\u0438\u043D\u043D\u044B\u043C \u043B\u0438\u0431\u043E \u043D\u0435\u0442 +javax.faces.converter.ByteConverter.BYTE=\u0447\u0438\u0441\u043B\u043E \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u043C\u0435\u0436\u0434\u0443 0 \u0438 255 +javax.faces.converter.ByteConverter.BYTE_detail=\u0447\u0438\u0441\u043B\u043E \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u043C\u0435\u0436\u0434\u0443 0 \u0438 255 + +error=\u041E\u0448\u0438\u0431\u043A\u0430 +errorStub=\u0421\u043B\u0443\u0447\u0438\u043B\u043E\u0441\u044C \u0447\u0442\u043E-\u0442\u043E \u043D\u0435\u043F\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043D\u043D\u043E\u0435 \:-( + +fileUpload.header=\u0412\u0430\u0448\u0438 \u0444\u0430\u0439\u043B\u044B \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D\u044B \u0432 \u0430\u043B\u044C\u0431\u043E\u043C\: \#{selectionHelper.selectedAlbum.name}. \u0415\u0441\u043B\u0438 \u0432\u044B \u0445\u043E\u0442\u0438\u0442\u0435 \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0438\u0445 \u0432 \u0434\u0440\u0443\u0433\u043E\u0439 \u0430\u043B\u044C\u0431\u043E\u043C, \u0432\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0435\u0433\u043E. +fileUpload.header2=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0430\u043B\u044C\u0431\u043E\u043C\: +fileUpload.uploadedPanelHeader=\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043E \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D\u043D\u044B\u0445 \u0444\u0430\u0439\u043B\u0430\u0445 +fileUpload.fileNameLabel=\u0418\u043C\u044F \u0444\u0430\u0439\u043B\u0430\: +fileUpload.fileLengthLabel=\u0420\u0430\u0437\u043C\u0435\u0440 \u0444\u0430\u0439\u043B\u0430 \u0432 \u0431\u0430\u0439\u0442\u0430\u0445\: +fileUpload.fileEditLabel=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C +fileUpload.storeAllLabel=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0432\u0441\u0435 +fileUpload.storeSelectedLabel=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0435 +fileUpload.clearLabel=\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u0432\u0441\u0435 +fileUpload.clearSelectedLabel=\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0435 + +comment.label=\u041A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 (\#{selectionHelper.selectedImage.comments.size}) +comment.author=\u0410\u0432\u0442\u043E\u0440\: \#{record.author.login} +comment.askForFriend=\u0417\u0430\u043F\u0440\u043E\u0441 \u043D\u0430 \u0434\u0440\u0443\u0436\u0431\u0443 +comment.askForFriend.message=\u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0434\u043E\u0431\u0430\u0432\u044C\u0442\u0435 \u043C\u0435\u043D\u044F \u0432 \u0441\u043F\u0438\u0441\u043E\u043A \u0432\u0430\u0448\u0438\u0445 \u0434\u0440\u0443\u0437\u0435\u0439. +comment.date=\u0414\u0430\u0442\u0430\: \#{record.date} +comment.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0439 +comment.edit=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0439 +comment.noComments=\u041A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 \u043A \u044D\u0442\u043E\u0439 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0438 \u043E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044E\u0442 +comment.add=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A\u043E\u043C\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0439 +comment.save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C +comment.cancel=\u041E\u0442\u043C\u0435\u043D\u0430 + +message.sendMessage=\u041F\u043E\u0441\u043B\u0430\u0442\u044C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 +message.sendToUser=\u041F\u043E\u0441\u043B\u0430\u0442\u044C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u044D\u0442\u043E\u043C\u0443 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044E +message.readed=\u041E\u0442\u043C\u0435\u0442\u0438\u0442\u044C \u043A\u0430\u043A \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u043D\u043D\u043E\u0435 +message.authorHeader=\u0410\u0432\u0442\u043E\u0440 +message.themeHeader=\u0422\u0435\u043C\u0430 +message.dateHeader=\u0414\u0430\u0442\u0430 +message.theme=\u0422\u0435\u043C\u0430\: +message.author=\u0410\u0432\u0442\u043E\u0440\: +message.date=\u0414\u0430\u0442\u0430\: \#{record.date} +message.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C +message.read=\u041F\u0440\u043E\u0447\u0438\u0442\u0430\u0442\u044C +message.re=Re: +message.message=\u0421\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 +message.owner=\u041F\u043E\u043B\u0443\u0447\u0430\u0442\u0435\u043B\u044C\: +message.content=\u0421\u043E\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435\: +message.addFriend=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0432 \u0434\u0440\u0443\u0437\u044C\u044F +message.friendRequest=\u042D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u043C \u043D\u0430 \u0434\u0440\u0443\u0436\u0431\u0443. Y\u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0431\u0430\u0432\u0442\u044C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F \u0432 \u0434\u0440\u0443\u0437\u044C\u044F, \u043D\u0430\u0436\u0430\u0432 \u043D\u0430 \u043A\u043D\u043E\u043F\u043A\u0443 '\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0432 \u0434\u0440\u0443\u0437\u044C\u044F'. +message.send=\u041F\u043E\u0441\u043B\u0430\u0442\u044C +message.close=\u0417\u0430\u043A\u0440\u044B\u0442\u044C + +confirm.confirm=\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u0435\: +confirm.ok=OK +confirm.cancel=\u041E\u0442\u043C\u0435\u043D\u0430 + +shared.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0438\u0437 shared \u0430\u043B\u044C\u0431\u043E\u043C\u043E\u0432 + +album.edit=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C +album.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C +album.delete.confirm=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B? \u0412\u0441\u0435 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438 \u0432 \u044D\u0442\u043E\u043C \u0430\u043B\u044C\u0431\u043E\u043C\u0435 \u0442\u0430\u043A\u0436\u0435 \u0431\u0443\u0434\u0443\u0442 \u0443\u0434\u0430\u043B\u0435\u043D\u044B\! \u041D\u0430\u0436\u043C\u0438\u0442\u0435 \u041E\u041A \u0434\u043B\u044F \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0435\u043D\u0438\u044F \u0438\u043B\u0438 \u041E\u0442\u043C\u0435\u043D\u0430 \u0434\u043B\u044F \u043F\u0440\u0435\u0440\u044B\u0432\u0430\u043D\u0438\u044F \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u0438. +album.add=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0430\u043B\u044C\u0431\u043E\u043C +album.edit.long=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0430\u043B\u044C\u0431\u043E\u043C\: +album.addImages=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A\u0430\u0440\u0442\u0438\u043D\u043E\u043A +album.name=\u0418\u043C\u044F\: +album.shared=\u0414\u043E\u0441\u0442\u0443\u043F \u0434\u043B\u044F \u0432\u0441\u0435\u0445\: +album.owner=\u0412\u043B\u0430\u0434\u0435\u043B\u0435\u0446\: +album.desc=\u041A\u043E\u0440\u043E\u0442\u043A\u043E\u0435 \u043E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: +album.store=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C +album.cancel=\u041E\u0442\u043C\u0435\u043D\u0430 + +scroller.first=\u041F\u0435\u0440\u0432\u0430\u044F +scroller.last=\u041F\u043E\u0441\u043B\u0435\u0434\u043D\u044F\u044F +scroller.prev=\u041F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0430\u044F +scroller.next=\u0421\u043B\u0435\u0434\u0443\u044E\u0449\u0430\u044F +scroller.pager.begin=\u0418\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 +scroller.pager.end= \u0438\u0437 \#{selectionHelper.selectedAlbum.images.size} + +image.rating=\u0422\u0435\u043A\u0443\u0449\u0438\u0439 \u0440\u0435\u0439\u0442\u0438\u043D\u0433\: \#{record.rank.rating} +image.numberVotes=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0433\u043E\u043B\u043E\u0441\u043E\u0432\: \#{record.rank.hits} +image.vote=\u041F\u0440\u043E\u0433\u043E\u043B\u043E\u0441\u043E\u0432\u0430\u0442\u044C \u0437\u0430 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 +image.vote.short=\u0413\u043E\u043B\u043E\u0441\u043E\u0432\u0430\u0442\u044C +image.panelHeader=\u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0439\: \u0412\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u0430\u043B\u044C\u0431\u043E\u043C\: \#{selectionHelper.selectedAlbum.name} +image.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C +image.delete.confirm=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B? +image.edit=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0430 +image.prop=\u0421\u0432\u043E\u0439\u0441\u0442\u0432\u0430 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F\: +image.name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435\: +image.desc=\u041A\u043E\u0440\u043E\u0442\u043A\u043E\u0435 \u043E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: +image.album=\u0410\u043B\u044C\u0431\u043E\u043C +image.date=\u0414\u0430\u0442\u0430 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F\: +image.meta=\u041C\u0435\u0442\u0430-\u0438\u043D\u043E\u0444\u0440\u043C\u0430\u0446\u0438\u044F\: +image.store=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C +image.cancel=\u041E\u0442\u043C\u0435\u043D\u0430 + +slideshow.start=\u041D\u0430\u0447\u0430\u0442\u044C \u0441\u043B\u0430\u0439\u0434-\u0448\u043E\u0443 +slideshow.stop=\u041E\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0441\u043B\u0430\u0439\u0434-\u0448\u043E\u0443 +slideshow.interval=\u0418\u043D\u0442\u0435\u0440\u0432\u0430\u043B \u0432 \u0441\u0435\u043A. + +index.header=\u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C\! + +login.header=\u0412\u0445\u043E\u0434 \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u0443 +login.login=\u041B\u043E\u0433\u0438\u043D +login.userName=\u0418\u043C\u044F \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F +login.password=\u041F\u0430\u0440\u043E\u043B\u044C +login.register=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044F +login.anonymous=\u0410\u043D\u043E\u043D\u0438\u043C\u043D\u044B\u0439 \u0432\u0445\u043E\u0434 + +friends.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0438\u0437 \u0441\u043F\u0438\u0441\u043A\u0430 \u0434\u0440\u0443\u0437\u0435\u0439 +friends.choose=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0430\u043B\u044C\u0431\u043E\u043C \u0434\u043B\u044F \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430\: + +search.advanced=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u044B\u0439 \u043F\u043E\u0438\u0441\u043A\: +search.rank=\u0422\u0435\u043A\u0443\u0449\u0430\u044F \u043E\u0446\u0435\u043D\u043A\u0430\: +search.numberVotes=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043F\u0440\u043E\u0433\u043E\u043B\u043E\u0441\u043E\u0432\u0430\u0432\u0448\u0438\u0445\: +search.date=\u0414\u0430\u0442\u0430 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F +search.addShared=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A 'shared' \u0430\u043B\u044C\u0431\u043E\u043C\u0430\u043C +search.preview=\u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 +search.search=\u041F\u043E\u0438\u0441\u043A +search.popular=\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u043D\u044B\u0435 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438 +search.unpopular=\u041E\u0442\u0441\u0442\u043E\u0439 +search.nofound=\u041D\u0438 \u043E\u0434\u043D\u043E \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F \u043D\u0435 \u043F\u043E\u0434\u0445\u043E\u0434\u0438\u0442 \u043F\u043E\u0434 \u0432\u0430\u0448\u0438 \u043A\u0440\u0438\u0442\u0435\u0440\u0438\u0438 + +user.loginPrefs=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0430\u043A\u043A\u0430\u0443\u043D\u0442\u0430 +user.registration=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044F +user.reginfo=\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F, \u043A\u0430\u0441\u0430\u044E\u0449\u0430\u044F\u0441\u044F \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438\: +user.firstname=\u0418\u043C\u044F +user.secondname=\u0424\u0430\u043C\u0438\u043B\u0438\u044F +user.login=\u041B\u043E\u0433\u0438\u043D +user.password=\u041F\u0430\u0440\u043E\u043B\u044C +user.email=Email +user.birthdate=\u0414\u0430\u0442\u0430 \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F +user.avatar=\u0410\u0432\u0430\u0442\u0430\u0440 +user.userPrefs=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F +user.save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C +user.reset=\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u043D\u0430 \u043F\u0440\u0435\u0436\u043D\u0438\u0435 +user.confirm=\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435 \u043F\u0430\u0440\u043E\u043B\u044C +user.avatar.info=\u0418\u043D\u043E\u0444\u0440\u043C\u0430\u0446\u0438\u044F \u043E \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D\u043D\u044B\u0445 \u0444\u0430\u0439\u043B\u0430\u0445 +user.avatar.name=\u0418\u043C\u044F \u0444\u0430\u0439\u043B\u0430\: +user.avatar.length=\u0414\u043B\u0438\u043D\u0430 \u0444\u0430\u0439\u043B\u0430 \u0432 \u0431\u0430\u0439\u0442\u0430\u0445\: +user.register=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043E\u0432\u0430\u0442\u044C\u0441\u044F +user.cancel=\u041E\u0442\u043C\u0435\u043D\u0430 +user.exist=\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C \u0441 \u0442\u0430\u043A\u0438\u043C \u043B\u043E\u0433\u0438\u043D\u043E\u043C \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442; +user.confirm.error=\u041F\u0430\u0440\u043E\u043B\u0438 \u0434\u043E\u043B\u0436\u043D\u044B \u0441\u043E\u0432\u043F\u0430\u0434\u0430\u0442\u044C + +menu.welcome=\u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C, \#{identity.username}\! +menu.welcome.guest=\u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C, \u0433\u043E\u0441\u0442\u044C\! \u0415\u0441\u043B\u0438 \u0432\u044B \u0445\u043E\u0442\u0438\u0442\u0435 \u0438\u043C\u0435\u0442\u044C \u0434\u043E\u0441\u0442\u0443\u043F \u043A\u043E \u0432\u0441\u0435\u043C \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044F\u043C \u0441\u0438\u0441\u0442\u0435\u043C\u044B, \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0443\u0439\u0442\u0435\u0441\u044C +menu.message.tooltip=\u0423 \u0432\u0430\u0441 \#{userManager.countUnreadedMessages} \u043D\u0435\u043F\u0440\u043E\u0447\u0438\u0442\u0430\u043D\u043D\u044B\u0445 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 +menu.messages=\u0421\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F +menu.search=\u041F\u043E\u0438\u0441\u043A +menu.image=\u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 \u043A\u0430\u0440\u0442\u0438\u043D\u043E\u043A +menu.user=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F +menu.file=\u0417\u0430\u0433\u0440\u0443\u0437\u043A\u0430 \u043A\u0430\u0440\u0442\u0438\u043D\u043E\u043A +menu.logout=\u0412\u044B\u0445\u043E\u0434 +menu.login=\u0412\u0445\u043E\u0434 + +realworld=RealWorld Demo application +panel.albumHeader=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0430\u043B\u044C\u0431\u043E\u043C\u0430\u043C\u0438 +panel.my=\u041C\u043E\u0438 \u0430\u043B\u044C\u0431\u043E\u043C\u044B +panel.friend=\u0410\u043B\u044C\u0431\u043E\u043C\u044B \u0434\u0440\u0443\u0437\u0435\u0439 +panel.shared=\u041B\u044E\u0431\u0438\u043C\u044B\u0435 \u0430\u043B\u044C\u0431\u043E\u043C\u044B + +samplename=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 +sampledesc=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 +addedtofriends=\u0412\u044B \u0431\u044B\u043B\u0438 \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0432 \u0441\u043F\u0438\u0441\u043E\u043A \u0434\u0440\u0443\u0437\u0435\u0439 +addedtofriendsby=\u0412\u044B \u0431\u044B\u043B\u0438 \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0432 \u0441\u043F\u0438\u0441\u043E\u043A \u0434\u0440\u0443\u0437\u0435\u0439 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C +removedfromfriends=\u0412\u044B \u0431\u044B\u043B\u0438 \u0443\u0434\u0430\u043B\u0435\u043D\u044B \u0438\u0437 \u0441\u043F\u0438\u0441\u043A\u0430 \u0434\u0440\u0443\u0437\u0435\u0439 +removedfromfriendsby=\u0412\u044B \u0431\u044B\u043B\u0438 \u0443\u0434\u0430\u043B\u0435\u043D\u044B \u0438\u0437 \u0441\u043F\u0438\u0441\u043A\u0430 \u0434\u0440\u0443\u0437\u0435\u0439 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F +equals=\u0420\u0430\u0432\u043D\u043E +more=\u041C\u0435\u043D\u044C\u0448\u0435 +less=\u0411\u043E\u043B\u044C\u0448\u0435 +nomatter=\u041D\u0435 \u0438\u043C\u0435\u0435\u0442 \u0437\u0430\u043D\u0447\u0435\u043D\u0438\u044F +small=\u041C\u0430\u043B\u0435\u043D\u044C\u043A\u0430\u044F +medium=\u0421\u0440\u0435\u0434\u043D\u044F\u044F +full=\u041F\u043E\u043B\u043D\u044B\u0439 \u0440\u0430\u0437\u043C\u0435\u0440 Property changes on: trunk/test-applications/realworld/web/src/main/resources/messages_ru.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/test-applications/realworld/web/src/main/resources/org/richfaces/realworld/editor/advanced.properties =================================================================== --- trunk/test-applications/realworld/web/src/main/resources/org/richfaces/realworld/editor/advanced.properties (rev 0) +++ trunk/test-applications/realworld/web/src/main/resources/org/richfaces/realworld/editor/advanced.properties 2009-01-12 19:16:58 UTC (rev 12237) @@ -0,0 +1,5 @@ +theme="advanced" +theme_advanced_toolbar_location="top" +theme_advanced_toolbar_align="left" +plugins="preview,insertdatetime" +theme_advanced_buttons3="hr,removeformat,visualaid,separator,sub,sup,separator,charmap" Property changes on: trunk/test-applications/realworld/web/src/main/resources/org/richfaces/realworld/editor/advanced.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml 2009-01-12 19:16:58 UTC (rev 12237) @@ -22,6 +22,7 @@ <core:init transaction-management-enabled="false" debug="true" jndi-pattern="@jndiPattern@"/> <web:context-filter url-pattern="/picture/*" /> + <web:character-encoding-filter encoding="UTF-8" override-client="true" url-pattern="*.seam" /> <core:manager concurrent-request-timeout="20000" conversation-timeout="120000" conversation-id-parameter="cid" Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/faces-config.xml 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/faces-config.xml 2009-01-12 19:16:58 UTC (rev 12237) @@ -7,11 +7,8 @@ <application> <locale-config> <default-locale>en</default-locale> - <supported-locale>bg</supported-locale> - <supported-locale>de</supported-locale> <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <supported-locale>tr</supported-locale> + <supported-locale>ru</supported-locale> </locale-config> <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> </application> Deleted: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/lib/metadata-extractor-2.3.1.jar =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml 2009-01-12 19:16:58 UTC (rev 12237) @@ -11,6 +11,9 @@ <rule if-outcome="home"> <redirect view-id="/index.xhtml"/> </rule> + <rule if-outcome="index"> + <redirect view-id="/index.xhtml"/> + </rule> <rule if-outcome="register"> <redirect view-id="/register.xhtml"/> </rule> Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml 2009-01-12 19:00:22 UTC (rev 12236) +++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml 2009-01-12 19:16:58 UTC (rev 12237) @@ -28,4 +28,8 @@ <tag-name>linkPanel</tag-name> <source>templates/linkPanel.xhtml</source> </tag> + <tag> + <tag-name>error</tag-name> + <source>templates/error.xhtml</source> + </tag> </facelet-taglib> \ No newline at end of file Added: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/error.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/error.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/message.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld/web/src/main/webapp/img/gb.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/gb.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld/web/src/main/webapp/img/ru.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld/web/src/main/webapp/img/ru.png ___________________________________________________________________ Name: svn:mime-type + image/png Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/image/comments.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/image/imagePreview.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/image/slideshow.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/imagePreview.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/messages.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/misc/modalPanels.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/panelBar/sharedAlbums.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/panelBar/tree.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchResults.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)