[richfaces-svn-commits] JBoss Rich Faces SVN: r13426 - in trunk/test-applications/realworld2/web/src/main: java/org/richfaces/realworld/search and 12 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Apr 8 07:43:56 EDT 2009
Author: amarkhel
Date: 2009-04-08 07:43:55 -0400 (Wed, 08 Apr 2009)
New Revision: 13426
Removed:
trunk/test-applications/realworld2/web/src/main/webapp/img/tree/
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java
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/java/org/richfaces/realworld/search/SearchOptionByShelf.java
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/java/org/richfaces/realworld/ui/ConfirmationPopupHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/DirectLinkHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/EditorBean.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/CopyImageStuff.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java
trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties
trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/pages.xml
trunk/test-applications/realworld2/web/src/main/webapp/error.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/createAlbum.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForAlbum.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForImage.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForShelf.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForUser.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/index/login.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/index/menu.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/confirmation.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/help.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/modalPanels.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/slideShowPooler.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/createShelf.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/index.xhtml
Log:
Refactoring
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -47,20 +47,24 @@
public class AlbumManager implements Serializable{
private static final long serialVersionUID = 2631634926126857691L;
+
private boolean validationSuccess = false;
+
@In private IAlbumAction albumAction;
@In private User user;
@In FileManager fileManager;
+
@In FacesMessages facesMessages;
+
@In @Out Model model;
@Restrict("#{s:hasRole('admin')}")
public void addAlbum(Album album){
if(album.getShelf() == null){
- facesMessages.addToControl("shelf", "Shelf must be not-null", null);
- Contexts.getConversationContext().set("album", album);
+ facesMessages.addToControl(Constants.SHELF_ID, Constants.SHELF_MUST_BE_NOT_NULL_ERROR, null);
+ Contexts.getConversationContext().set(Constants.ALBUM_VARIABLE, album);
return;
}
validationSuccess = true;
@@ -68,9 +72,9 @@
fileManager.addDirectory(user.getLogin(), album.getId().toString());
model.resetModel(NavigationEnum.ALBUM_PREVIEW, album.getShelf().getOwner(), album.getShelf(), album, null, album.getImages());
model.setImages(new ArrayList<Image>());
- Contexts.getConversationContext().set("album", null);
- Events.instance().raiseEvent("albumAdded");
- Events.instance().raiseEvent("clearTree");
+ Contexts.getConversationContext().set(Constants.ALBUM_VARIABLE, null);
+ Events.instance().raiseEvent(Constants.ALBUM_ADDED_EVENT);
+ Events.instance().raiseEvent(Constants.CLEAR_TREE_EVENT);
}
@Restrict("#{s:hasRole('admin')}")
@@ -81,19 +85,19 @@
shelf = user.getShelfs().get(0);
}
if(shelf == null){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "You must create at least one shelf before creating album!");
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.NO_SHELF_ERROR);
return;
}
}
album.setShelf(shelf);
- Contexts.getConversationContext().set("album", album);
+ Contexts.getConversationContext().set(Constants.ALBUM_VARIABLE, album);
}
@Restrict("#{s:hasRole('admin')}")
public void editAlbum(Album album){
albumAction.editAlbum(album);
model.resetModel(NavigationEnum.ALBUM_PREVIEW, model.getSelectedUser(), model.getSelectedShelf(), album, null, album.getImages());
- Events.instance().raiseEvent("albumEdited");
+ Events.instance().raiseEvent(Constants.ALBUM_EDITED_EVENT);
}
@Restrict("#{s:hasRole('admin')}")
@@ -102,8 +106,8 @@
albumAction.deleteAlbum(album);
fileManager.deleteDirectory(user.getLogin(), albumName);
model.resetModel(NavigationEnum.ALL_ALBUMS, model.getSelectedUser(), model.getSelectedShelf(), null, null, null);
- Events.instance().raiseEvent("albumDeleted");
- Events.instance().raiseEvent("clearTree");
+ Events.instance().raiseEvent(Constants.ALBUM_DELETED_EVENT);
+ Events.instance().raiseEvent(Constants.CLEAR_TREE_EVENT);
}
public List<Image> getUnvisitedImages(Album album){
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -51,30 +51,23 @@
@Scope(ScopeType.CONVERSATION)
public class Authenticator implements Serializable{
- @In ShelfManager shelfManager;
+ private static final long serialVersionUID = -4585673256547342140L;
- @In("#{messages['invalid_login']}")
- private String INVALID_LOGIN_OR_PASSWORD;
+ @In ShelfManager shelfManager;
@RequestParameter protected Long startConversation;
- private static final long serialVersionUID = -4585673256547342140L;
-
- @In("#{messages['user.exist']}") private String USER_WITH_THIS_LOGIN_ALREADY_EXIST;
-
- @In("#{messages['user.confirm.error']}") private String CONFIRM_PASSWORD_NOT_EQUALS_PASSWORD;
-
@Logger Log log;
@In Identity identity;
@Out(required=false) User user;
+
@In Credentials credentials;
@In FacesMessages facesMessages;
- @In("#{conversation}") @Out
- Conversation conversation;
+ @In @Out Conversation conversation;
@In IUserAction userAction;
@@ -107,7 +100,7 @@
}
}
public String login(){
- if(identity.hasRole("admin")){
+ if(identity.hasRole(Constants.ADMIN_ROLE)){
return null;
}
String password = credentials.getPassword();
@@ -123,24 +116,24 @@
identity.login();
identity.addRole(Constants.GUEST_ROLE);
facesMessages.clear();
- facesMessages.add(INVALID_LOGIN_OR_PASSWORD);
+ facesMessages.add(Constants.INVALID_LOGIN_OR_PASSWORD);
FacesContext.getCurrentInstance().renderResponse();
}
- return "main";
+ return Constants.MAIN_OUTCOME;
}
@End
public String register(User user){
if(checkPassword(user) || checkUserExist(user)){
- return "";
+ return null;
}
user.setPasswordHash(hash(user.getPassword()));
userAction.register(user);
- return "index";
+ return Constants.INDEX_OUTCOME;
}
public String goToIndex(){
- return "index";
+ return Constants.INDEX_OUTCOME;
}
public String goToRegister(){
@@ -148,12 +141,12 @@
identity.unAuthenticate();
credentials.clear();
credentials.invalidate();
- return "register";
+ return Constants.REGISTER_OUTCOME;
}
private boolean checkUserExist(User user) {
if(userAction.isUserExist(user.getLogin())){
- addFacesMessage(Constants.REGISTER_LOGIN_NAME_ID, USER_WITH_THIS_LOGIN_ALREADY_EXIST);
+ addFacesMessage(Constants.REGISTER_LOGIN_NAME_ID, Constants.USER_WITH_THIS_LOGIN_ALREADY_EXIST);
return true;
}
return false;
@@ -168,7 +161,7 @@
private boolean checkPassword(User user) {
if(!user.getPassword().equals(user.getConfirmPassword())){
- addFacesMessage(Constants.REGISTER_CONFIRM_PASSWORD_ID, CONFIRM_PASSWORD_NOT_EQUALS_PASSWORD);
+ addFacesMessage(Constants.REGISTER_CONFIRM_PASSWORD_ID, Constants.CONFIRM_PASSWORD_NOT_EQUALS_PASSWORD);
return true;
}
return false;
@@ -182,7 +175,6 @@
return true;
}
try {
- //TODO nick - move password holder into userAction
user = userAction.login(credentials.getUsername(), hash(credentials.getPassword()));
if (user != null) {
identity.addRole(Constants.ADMIN_ROLE);
@@ -201,28 +193,26 @@
identity.unAuthenticate();
credentials.clear();
Session.instance().invalidate();
- return "logout";
+ return Constants.LOGOUT_OUTCOME;
}
- public String start(){
+ public String startConversation(){
if(!identity.isLoggedIn()){
credentials.clear();
try {
identity.authenticate();
} catch (LoginException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ //No cases for that
}
}
- return "";
+ return null;
}
- public String startConversation(){
- //TODO nick - rename to destroyConversation()?
+ public String destroyConversation(){
identity.logout();
identity.unAuthenticate();
credentials.clear();
- return "";
+ return null;
}
private boolean wantLoginAnonymous() {
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -41,10 +41,9 @@
@Scope(ScopeType.EVENT)
public class Controller implements Serializable{
- private static final long serialVersionUID = 5656562187249324512L;
+ private static final String ALBUM_CREATE_ERROR = "You must create at least one shelf before creating album!";
- @In("#{messages['acess_not_granted']}")
- private String HAVENT_ACCESS;
+ private static final long serialVersionUID = 5656562187249324512L;
@In @Out Model model;
@@ -54,8 +53,7 @@
@In AlbumManager albumManager;
- @In
- private User user;
+ @In private User user;
public void selectShelfs(){
model.resetModel(NavigationEnum.ALL_SHELFS, user, null, null, null, null);
@@ -72,7 +70,7 @@
@Restrict("#{s:hasRole('admin')}")
public void startEditShelf(Shelf shelf){
if(!canViewShelf(shelf)){
- pushEvent(Constants.ADD_ERROR_EVENT, HAVENT_ACCESS);
+ pushEvent(Constants.ADD_ERROR_EVENT, Constants.HAVENT_ACCESS);
return;
}
model.resetModel(NavigationEnum.SHELF_EDIT, shelf.getOwner(), shelf, null, null, null);
@@ -84,7 +82,7 @@
public void showAlbum(Album album){
if(!canViewAlbum(album)){
- pushEvent(Constants.ADD_ERROR_EVENT, HAVENT_ACCESS);
+ pushEvent(Constants.ADD_ERROR_EVENT, Constants.HAVENT_ACCESS);
return;
}
model.resetModel(NavigationEnum.ALBUM_PREVIEW, album.getOwner(), album.getShelf(), album, null, album.getImages());
@@ -92,7 +90,7 @@
public void showImage(Image image){
if(!canViewImage(image)){
- pushEvent(Constants.ADD_ERROR_EVENT, HAVENT_ACCESS);
+ pushEvent(Constants.ADD_ERROR_EVENT, Constants.HAVENT_ACCESS);
return;
}
model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, image.getAlbum().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), image, image.getAlbum().getImages());
@@ -101,7 +99,6 @@
public void scroll(DataScrollerEvent e){
Integer index = e.getPage();
- model.setSelectedImageIndex(index);
Image image = model.getSelectedAlbum().getImages().get(index - 1);
model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, image.getAlbum().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), image, image.getAlbum().getImages());
image.getAlbum().visitImage(image, true);
@@ -110,7 +107,7 @@
@Restrict("#{s:hasRole('admin')}")
public void startEditImage(Image image){
if(!canViewImage(image)){
- pushEvent(Constants.ADD_ERROR_EVENT, HAVENT_ACCESS);
+ pushEvent(Constants.ADD_ERROR_EVENT, Constants.HAVENT_ACCESS);
return;
}
model.resetModel(NavigationEnum.ALBUM_IMAGE_EDIT, image.getAlbum().getShelf().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), image, image.getAlbum().getImages());
@@ -154,7 +151,7 @@
@Restrict("#{s:hasRole('admin')}")
public void startEditAlbum(Album album){
if(!album.getOwner().getLogin().equals(user.getLogin())){
- pushEvent(Constants.ADD_ERROR_EVENT, HAVENT_ACCESS);
+ pushEvent(Constants.ADD_ERROR_EVENT, Constants.HAVENT_ACCESS);
return;
}
model.resetModel(NavigationEnum.ALBUM_EDIT, album.getShelf().getOwner(), album.getShelf(), album, null, album.getImages());
@@ -166,7 +163,7 @@
public void showFileUpload(){
if(!(user.getShelfs().size() > 0)){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "You must create at least one shelf before creating album!");
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, ALBUM_CREATE_ERROR);
return;
}
model.resetModel(NavigationEnum.FILE_UPLOAD, model.getSelectedUser(), model.getSelectedShelf(), model.getSelectedAlbum(), model.getSelectedImage(), model.getImages());
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -38,7 +38,9 @@
public class DnDManager implements DropListener {
@In User user;
+
@In FileManager fileManager;
+
@In IAlbumAction albumAction;
@Restrict("#{s:hasRole('admin')}")
@@ -48,13 +50,13 @@
Object dropValue = dropzone.getDropValue();
if(dragValue instanceof Image){
if(!((Album)dropValue).getOwner().getLogin().equals(user.getLogin())){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "You can't add photo's to that album");
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.DND_PHOTO_ERROR);
return;
}
handleImage((Image)dragValue, (Album)dropValue);
}else if(dragValue instanceof Album){
if(!((Shelf)dropValue).getOwner().getLogin().equals(user.getLogin())){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "You can't add album to that shelf");
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.DND_ALBUM_ERROR);
return;
}
handleAlbum((Album)dragValue, (Shelf)dropValue);
@@ -64,7 +66,7 @@
private void handleAlbum(Album dragValue, Shelf dropValue) {
dropValue.addAlbum(dragValue);
albumAction.editAlbum(dragValue);
- Events.instance().raiseEvent("clearTree");
+ Events.instance().raiseEvent(Constants.CLEAR_TREE_EVENT);
}
private void handleImage(Image dragValue, Album dropValue) {
@@ -75,15 +77,14 @@
dragValue.setPath(newPath);
dropValue.addImage(dragValue);
albumAction.editAlbum(dropValue);
- Events.instance().raiseEvent("DNDUploadedEvent", dragValue);
-
+ Events.instance().raiseEvent(Constants.DNDUPLOADED_EVENT, dragValue);
}
private String generateNewPathOfImage(Image dragValue, Album dropValue) {
String fileNameOld = dragValue.getPath();
int lastIndexOf = dragValue.getPath().lastIndexOf(Constants.SLASH);
String prevPathEnd = dragValue.getPath().substring(lastIndexOf);
- String fileNameNew = user.getLogin()+Constants.SLASH+dropValue.getId()+Constants.SLASH+prevPathEnd;
+ String fileNameNew = user.getLogin() + Constants.SLASH + dropValue.getId() + Constants.SLASH + prevPathEnd;
fileManager.renameImage(fileNameOld, fileNameNew);
return fileNameNew;
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -51,22 +51,14 @@
@AutoCreate
public class FileManager {
- private static final String _SMALL160 = "_small160";
- private static final String _SMALL120 = "_small120";
- private static final String _SMALL80 = "_small80";
- private static final String _SMALL200 = "_small200";
- private static final String _MEDIUM = "_medium";
-
- private static final String UPLOAD_ROOT_COMPONENT_NAME = "uploadRoot";
- private static final String UPLOAD_ROOT_PATH_COMPONENT_NAME = "uploadRootPath";
-
private File uploadRoot;
+
private String uploadRootPath;
@Create
public void create() {
- uploadRoot = (File)Component.getInstance(UPLOAD_ROOT_COMPONENT_NAME, ScopeType.APPLICATION);
- uploadRootPath = (String)Component.getInstance(UPLOAD_ROOT_PATH_COMPONENT_NAME, ScopeType.APPLICATION);
+ uploadRoot = (File)Component.getInstance(Constants.UPLOAD_ROOT_COMPONENT_NAME, ScopeType.APPLICATION);
+ uploadRootPath = (String)Component.getInstance(Constants.UPLOAD_ROOT_PATH_COMPONENT_NAME, ScopeType.APPLICATION);
}
public void setUploadRoot(String uploadRootPath) throws IOException {
@@ -111,22 +103,28 @@
@Restrict("#{s:hasRole('admin')}")
public void deleteDirectory(String... directories) {
final File file = getFileByPath(joinFiles(directories).toString());
- if (file.exists()) {
+ deleteDirectory(file);
+ }
+
+ private void deleteDirectory(File file) {
+ if (file.exists()) {
for (String f : file.list()) {
final File temp = new File(file, f);
- temp.delete();
+ if(temp.isDirectory()){
+ deleteDirectory(temp);
+ }else{
+ temp.delete();
+ }
}
file.delete();
}
- }
+ }
-
- private String joinFiles(String... files) {
+ private String joinFiles(String... files) {
final StringBuilder res = new StringBuilder();
for (String file : files) {
res.append(file).append(File.pathSeparatorChar);
}
-
return res.substring(0, res.length() - 1);
}
@@ -160,8 +158,8 @@
@Restrict("#{s:hasRole('admin')}")
public boolean saveAvatar(String path, User user) {
- return writeFile("/" + user.getLogin() +
- "/avatar.jpg", path, "", 80, true);
+ return writeFile(Constants.SLASH + user.getLogin() +
+ Constants.AVATAR_JPG, path, "", Constants.AVATAR_SIZE, true);
}
@Restrict("#{s:hasRole('admin')}")
@@ -169,48 +167,48 @@
createDirectoryIfNotExist(fileNameNew);
renameImage(getFileByPath(fileNameNew), getFileByPath(fileNameOld));
- renameImage(getFileByPath(transformPath(fileNameNew, _MEDIUM)),
- getFileByPath(transformPath(fileNameOld, _MEDIUM)));
+ renameImage(getFileByPath(transformPath(fileNameNew, Constants._MEDIUM)),
+ getFileByPath(transformPath(fileNameOld, Constants._MEDIUM)));
- renameImage(getFileByPath(transformPath(fileNameNew, _SMALL80)),
- getFileByPath(transformPath(fileNameOld, _SMALL80)));
+ renameImage(getFileByPath(transformPath(fileNameNew, Constants._SMALL80)),
+ getFileByPath(transformPath(fileNameOld, Constants._SMALL80)));
- renameImage(getFileByPath(transformPath(fileNameNew, _SMALL120)),
- getFileByPath(transformPath(fileNameOld, _SMALL120)));
+ renameImage(getFileByPath(transformPath(fileNameNew, Constants._SMALL120)),
+ getFileByPath(transformPath(fileNameOld, Constants._SMALL120)));
- renameImage(getFileByPath(transformPath(fileNameNew, _SMALL160)),
- getFileByPath(transformPath(fileNameOld, _SMALL160)));
+ renameImage(getFileByPath(transformPath(fileNameNew, Constants._SMALL160)),
+ getFileByPath(transformPath(fileNameOld, Constants._SMALL160)));
- renameImage(getFileByPath(transformPath(fileNameNew, _SMALL200)),
- getFileByPath(transformPath(fileNameOld, _SMALL200)));
+ renameImage(getFileByPath(transformPath(fileNameNew, Constants._SMALL200)),
+ getFileByPath(transformPath(fileNameOld, Constants._SMALL200)));
}
@Restrict("#{s:hasRole('admin')}")
public void deleteImage(String fileName) {
deleteImage(getFileByPath(fileName));
- deleteImage(getFileByPath(transformPath(fileName, _MEDIUM)));
- deleteImage(getFileByPath(transformPath(fileName, _SMALL80)));
- deleteImage(getFileByPath(transformPath(fileName, _SMALL120)));
- deleteImage(getFileByPath(transformPath(fileName, _SMALL160)));
- deleteImage(getFileByPath(transformPath(fileName, _SMALL200)));
+ deleteImage(getFileByPath(transformPath(fileName, Constants._MEDIUM)));
+ deleteImage(getFileByPath(transformPath(fileName, Constants._SMALL80)));
+ deleteImage(getFileByPath(transformPath(fileName, Constants._SMALL120)));
+ deleteImage(getFileByPath(transformPath(fileName, Constants._SMALL160)));
+ deleteImage(getFileByPath(transformPath(fileName, Constants._SMALL200)));
}
@Restrict("#{s:hasRole('admin')}")
public boolean addImage(String fileName, String tempFilePath) {
createDirectoryIfNotExist(fileName);
- if(!writeFile(fileName, tempFilePath, _SMALL80, 80, true)){
+ if(!writeFile(fileName, tempFilePath, Constants._SMALL80, Constants.SMALL_80_SIZE, true)){
return false;
}
- if(!writeFile(fileName, tempFilePath, _SMALL120, 120, true)){
+ if(!writeFile(fileName, tempFilePath, Constants._SMALL120, Constants.SMALL_120_SIZE, true)){
return false;
}
- if(!writeFile(fileName, tempFilePath, _SMALL160, 160, true)){
+ if(!writeFile(fileName, tempFilePath, Constants._SMALL160, Constants.SMALL_160_SIZE, true)){
return false;
}
- if(!writeFile(fileName, tempFilePath, _SMALL200, 200, true)){
+ if(!writeFile(fileName, tempFilePath, Constants._SMALL200, Constants.SMALL_200_SIZE, true)){
return false;
}
- if(!writeFile(fileName, tempFilePath, _MEDIUM, 600, true)){
+ if(!writeFile(fileName, tempFilePath, Constants._MEDIUM, Constants.MEDIUM_SIZE, true)){
return false;
}
return true;
@@ -312,7 +310,7 @@
String pattern, int size, boolean includeUploadRoot) {
BufferedImage bsrc = null;
try {
- bsrc = bitmapToImage(fileName, "JPG");
+ bsrc = bitmapToImage(fileName, Constants.JPG);
} catch (IOException e1) {
return false;
}
@@ -329,7 +327,7 @@
+ transformPath(newFileName, pattern) : transformPath(
newFileName, pattern);
try {
- imageToBitmap(bdest, dest, "JPG");
+ imageToBitmap(bdest, dest, Constants.JPG);
} catch (IOException ex) {
return false;
}
@@ -361,7 +359,7 @@
}
private void createDirectoryIfNotExist(String fileNameNew) {
- final int lastIndexOf = fileNameNew.lastIndexOf('/');
+ final int lastIndexOf = fileNameNew.lastIndexOf(Constants.SLASH);
if (lastIndexOf > 0) {
final String directory = fileNameNew.substring(0, lastIndexOf);
final File file = getFileByPath(directory);
@@ -383,7 +381,6 @@
}
public File getFileByAbsolutePath(String path) {
- File result = new File(path);
- return result;
+ return new File(path);
}
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -56,20 +56,16 @@
@Scope(ScopeType.EVENT)
public class FileUploadManager implements Serializable {
- @In("#{messages['file_processing_error']}")
- private String FILE_PROCESSING_ERROR;
-
- @In("#{messages['file_saving_error']}")
- private String FILE_SAVE_ERROR;
+ private static final long serialVersionUID = 4969087557225414955L;
@In IImageAction imageAction;
+
@In(required = true, scope=ScopeType.CONVERSATION) @Out(scope=ScopeType.CONVERSATION)
FileWrapper fileWrapper;
@In Model model;
- @In private FileManager fileManager;
- private static final long serialVersionUID = 4969087557225414955L;
+ @In private FileManager fileManager;
@Restrict("#{s:hasRole('admin')}")
public void listener(UploadEvent event) throws Exception {
@@ -78,24 +74,24 @@
try {
extractMetadata(item, image);
} catch (Exception e1) {
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, FILE_PROCESSING_ERROR);
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.FILE_PROCESSING_ERROR);
return;
}
image.setAlbum(model.getSelectedAlbum());
if(model.getSelectedAlbum() == null){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "Please specify album to download");
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.NO_ALBUM_TO_DOWNLOAD_ERROR);
return;
}
String newPath = Constants.SLASH + model.getSelectedAlbum().getOwner().getLogin() + Constants.SLASH + model.getSelectedAlbum().getId() + Constants.SLASH +item.getFileName();
image.setPath(newPath);
if(!fileManager.addImage(newPath, item.getFile().getPath())){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, FILE_SAVE_ERROR);
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.FILE_SAVE_ERROR);
item.getFile().delete();
return;
}
fileWrapper.getFiles().add(image);
imageAction.addImage(image);
- Events.instance().raiseEvent("imageAdded");
+ Events.instance().raiseEvent(Constants.IMAGE_ADDED_EVENT);
item.getFile().delete();
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -51,17 +51,13 @@
private static String imageDirectLinkPrefix;
- @In
- IImageAction imageAction;
+ @In IImageAction imageAction;
- @In
- FileManager fileManager;
+ @In FileManager fileManager;
- @In @Out
- Model model;
+ @In @Out Model model;
- @In
- private User user;
+ @In User user;
@Restrict("#{s:hasRole('admin')}")
public void deleteImage(Image image) {
@@ -69,23 +65,22 @@
model.resetModel(NavigationEnum.ALBUM_PREVIEW, image.getAlbum().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), null, image.getAlbum().getImages());
imageAction.deleteImage(image);
fileManager.deleteImage(imagePath);
- Events.instance().raiseEvent("imageDeleted");
+ Events.instance().raiseEvent(Constants.IMAGE_DELETED_EVENT);
}
@Restrict("#{s:hasRole('admin')}")
public void editImage(Image image) {
imageAction.editImage(image);
Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_IMAGE_PREVIEW);
- Events.instance().raiseEvent("imageEdited");
}
@Restrict("#{s:hasRole('admin')}")
public void addComment(Image image, String message) {
if (null == user.getLogin()) {
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "For vote on this picture you must login");
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.ADDING_COMMENT_ERROR);
return;
}if(message.trim().equals("")){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "Comment must be not-null");
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.NULL_COMMENT_ERROR);
return;
}
Comment comment = new Comment();
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -22,7 +22,6 @@
public class Model implements Serializable{
private static final long serialVersionUID = -1767281809514660171L;
- private Integer selectedImageIndex = 0;
private Image selectedImage;
@@ -45,15 +44,12 @@
this.setSelectedShelf(selectedShelf);
this.setSelectedUser(selectedUser);
this.images = images;
- if(this.getSelectedAlbum() != null && this.getSelectedImage() != null){
- this.setSelectedImageIndex(this.getSelectedAlbum().getIndex(this.getSelectedImage())+1);
- }
}
@Observer(Constants.UPDATE_MAIN_AREA_EVENT)
public void setMainArea(NavigationEnum mainArea) {
if(this.mainArea != null && this.mainArea.equals(NavigationEnum.FILE_UPLOAD)){
- Events.instance().raiseEvent("clearFileUpload");
+ Events.instance().raiseEvent(Constants.CLEAR_FILE_UPLOAD_EVENT);
}
this.mainArea = mainArea;
if(this.mainArea != null && this.mainArea.equals(NavigationEnum.FILE_UPLOAD)){
@@ -63,18 +59,10 @@
}
}
}
-
- public Integer getSelectedImageIndex() {
- return selectedImageIndex;
- }
public NavigationEnum getMainArea() {
return mainArea;
}
-
- public void setSelectedImageIndex(Integer selectedImageIndex) {
- this.selectedImageIndex = selectedImageIndex;
- }
public Image getSelectedImage() {
return selectedImage;
@@ -112,7 +100,7 @@
return selectedTag;
}
- @Observer("updateSelectedTag")
+ @Observer(Constants.UPDATE_SELECTED_TAG_EVENT)
public void setSelectedTag(MetaTag selectedTag) {
this.selectedTag = selectedTag;
}
@@ -124,4 +112,4 @@
public void setImages(List<Image> images) {
this.images = images;
}
-}
+}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -46,26 +46,24 @@
@AutoCreate
public class ShelfManager implements Serializable {
- private static final long serialVersionUID = 2631634926126857691L;
+ private static final long serialVersionUID = 2631634926126857691L;
+
private boolean validationSuccess = false;
+
private List<Shelf> shelfs;
- @In
- FileManager fileManager;
+ @In FileManager fileManager;
- @In
- IShelfAction shelfAction;
+ @In IShelfAction shelfAction;
- @In @Out
- Model model;
+ @In @Out Model model;
- @In
- User user;
+ @In User user;
@Restrict("#{s:hasRole('admin')}")
public void createShelf() {
Shelf shelf = new Shelf();
- Contexts.getConversationContext().set("shelf", shelf);
+ Contexts.getConversationContext().set(Constants.SHELF_VARIABLE, shelf);
}
@Restrict("#{s:hasRole('admin')}")
@@ -74,7 +72,7 @@
shelf.setPreDefined(false);
shelfAction.addShelf(shelf);
model.resetModel(NavigationEnum.SHELF_PREVIEW, shelf.getOwner(), shelf, null, null, null);
- Events.instance().raiseEvent("clearTree");
+ Events.instance().raiseEvent(Constants.CLEAR_TREE_EVENT);
}
public List<Shelf> getAvailableShelfs(User user) {
@@ -98,8 +96,8 @@
shelfAction.deleteShelf(shelf);
deleteDirectories(directoriesToDelete);
model.resetModel(NavigationEnum.ALL_SHELFS, model.getSelectedUser(), null, null, null, null);
- Events.instance().raiseEvent("shelfDeleted");
- Events.instance().raiseEvent("clearTree");
+ Events.instance().raiseEvent(Constants.SHELF_DELETED_EVENT);
+ Events.instance().raiseEvent(Constants.CLEAR_TREE_EVENT);
}
private void deleteDirectories(List<String> directoriesToDelete) {
@@ -113,7 +111,7 @@
return shelfs;
}
- @Observer("clearTree")
+ @Observer(Constants.CLEAR_TREE_EVENT)
public void clearShelfs() {
shelfs = null;
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -37,8 +37,11 @@
public class SlideshowManager implements Serializable{
private static final long serialVersionUID = 7801877176558409702L;
+
private Integer slideshowIndex;
+
private Image selectedImage;
+
private boolean active;
@In @Out Model model;
@@ -66,7 +69,7 @@
this.slideshowIndex = 0;
if(model.getImages() == null || model.getImages().size() < 1){
stopSlideshow();
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "No images for slideshow!");
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.NO_IMAGES_FOR_SLIDESHOW_ERROR);
return;
}
this.selectedImage = model.getImages().get(this.slideshowIndex);
@@ -77,7 +80,7 @@
active = true;
if(model.getImages() == null || model.getImages().size() < 1){
stopSlideshow();
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "No images for slideshow!");
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.NO_IMAGES_FOR_SLIDESHOW_ERROR);
return;
}
this.slideshowIndex = model.getImages().indexOf(selectedImage);
@@ -85,7 +88,7 @@
this.selectedImage.getAlbum().visitImage(selectedImage, true);
}
- @Observer("stopSlideshow")
+ @Observer(Constants.STOP_SLIDESHOW_EVENT)
public void stopSlideshow(){
active = false;
this.selectedImage = null;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -14,6 +14,7 @@
public class TreeManager implements Serializable{
@In @Out Model model;
+
private static final long serialVersionUID = 5656562187249324512L;
@SuppressWarnings("unchecked")
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -42,13 +42,16 @@
@Scope(ScopeType.EVENT)
@AutoCreate
public class UserManager implements Serializable{
-
+
private static final long serialVersionUID = 6027103521084558931L;
- @In(scope=ScopeType.SESSION) @Out(scope=ScopeType.SESSION) private User user;
+ @In(scope=ScopeType.SESSION) @Out(scope=ScopeType.SESSION) User user;
+
@In FileManager fileManager;
- @In(required=false, scope=ScopeType.CONVERSATION) @Out(required=false, scope=ScopeType.CONVERSATION) private File avatarData;
- @In private IUserAction userAction;
+
+ @In(required=false, scope=ScopeType.CONVERSATION) @Out(required=false, scope=ScopeType.CONVERSATION) File avatarData;
+
+ @In IUserAction userAction;
public Long countImages() {
if(null == user.getCountImages() ){
@@ -83,7 +86,7 @@
public void editUser(){
if (avatarData != null) {
if(!fileManager.saveAvatar(avatarData.getPath(), user)){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "File IO Error");
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.FILE_IO_ERROR);
return;
}
avatarData.delete();
@@ -97,29 +100,28 @@
avatarData = null;
}
- @Observer(value = "imageAdded")
+ @Observer(Constants.IMAGE_ADDED_EVENT)
public void onImageAdded() {
user.updateStatistics();
}
- @Observer(value = "imageDeleted")
+ @Observer(Constants.IMAGE_DELETED_EVENT)
public void onImageDeleted(){
user.updateStatistics();
}
- @Observer(value = "albumDeleted")
+ @Observer(Constants.ALBUM_DELETED_EVENT)
public void onAlbumDeleted(){
user.updateStatistics();
}
- @Observer(value = "albumAdded")
+ @Observer(Constants.ALBUM_ADDED_EVENT)
public void onAlbumAdded(){
user.updateStatistics();
}
- @Observer(value = "shelfDeleted")
+ @Observer(Constants.SHELF_DELETED_EVENT)
public void onShelfDeleted(){
user.updateStatistics();
}
-
}
\ No newline at end of file
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-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -13,6 +13,8 @@
*/
public abstract class ISearchOption {
+ private static final String TEMPLATE = "/includes/search/result/albumsResult.xhtml";
+
private boolean selected = true;
private List<?> searchResult;
@@ -37,7 +39,7 @@
}
public String getSearchResultTemplate() {
- return "/includes/search/result/albumsResult.xhtml";
+ return TEMPLATE;
}
public List<?> getSearchResult() {
@@ -47,5 +49,4 @@
public void setSearchResult(List<?> searchResult) {
this.searchResult = searchResult;
}
-
}
\ No newline at end of file
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-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -29,6 +29,7 @@
ISearchOption selectedOption;
List<ISearchOption> options;
+
String selectedTab;
String searchQuery;
@@ -54,7 +55,7 @@
StringBuilder s = new StringBuilder();
for(ISearchOption option:options) {
if(option.getSelected()){
- s.append(option.getName() + ",");
+ s.append(option.getName() + Constants.COMMA);
}
}
if (s.length() >= 2) {
@@ -89,7 +90,7 @@
}
private List<String> parse(String searchQuery2) {
- return Arrays.asList(searchQuery2.split(","));
+ return Arrays.asList(searchQuery2.split(Constants.COMMA));
}
boolean isOptionSelected() {
@@ -163,5 +164,4 @@
public void setSelectedKeyword(String selectedKeyword) {
this.selectedKeyword = selectedKeyword;
}
-
-}
+}
\ No newline at end of file
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-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -11,16 +11,19 @@
public class SearchOptionByAlbum extends ISearchOption {
+ private static final String TEMPLATE = "/includes/search/result/albumsResult.xhtml";
+ private static final String ALBUMS_SEARCH_RESULT = "Albums search result";
+ private static final String ALBUMS = "Albums";
Map<String, Object> params = new HashMap<String, Object>();
@Override
public String getName() {
- return "Albums";
+ return ALBUMS;
}
@Override
public String getSearchResultName() {
- return "Albums search result";
+ return ALBUMS_SEARCH_RESULT;
}
@Override
@@ -35,7 +38,7 @@
@Override
public String getSearchResultTemplate() {
- return "/includes/search/result/albumsResult.xhtml";
+ return TEMPLATE;
}
public Map<String, Object> getParams() {
@@ -45,5 +48,4 @@
public void setParams(Map<String, Object> params) {
this.params = params;
}
-
-}
+}
\ No newline at end of file
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-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -17,18 +17,21 @@
*/
public class SearchOptionByImage extends ISearchOption {
+ private static final String TEMPLATE = "/includes/search/result/imageResult.xhtml";
+ private static final String IMAGES_SEARCH_RESULT = "Images search result";
+ private static final String IMAGES = "Images";
Map<String, Object> params = new HashMap<String, Object>();
/* (non-Javadoc)
* @see org.richfaces.realworld.search.ISearchOption#getName()
*/
public String getName() {
- return "Images";
+ return IMAGES;
}
@Override
public String getSearchResultName() {
- return "Images search result";
+ return IMAGES_SEARCH_RESULT;
}
@Override
@@ -43,7 +46,7 @@
@Override
public String getSearchResultTemplate() {
- return "/includes/search/result/imageResult.xhtml";
+ return TEMPLATE;
}
public Map<String, Object> getParams() {
@@ -53,5 +56,4 @@
public void setParams(Map<String, Object> params) {
this.params = params;
}
-
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByShelf.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByShelf.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByShelf.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -15,12 +15,16 @@
*/
public class SearchOptionByShelf extends ISearchOption {
+ private static final String TEMPLATE = "/includes/search/result/shelfResult.xhtml";
+ private static final String SHELF_SEARCH_RESULT = "Shelf search result";
+ private static final String SHELVES = "Shelves";
+
/* (non-Javadoc)
* @see org.richfaces.realworld.search.ISearchOption#getName()
*/
@Override
public String getName() {
- return "Shelves";
+ return SHELVES;
}
/* (non-Javadoc)
@@ -28,7 +32,7 @@
*/
@Override
public String getSearchResultName() {
- return "Shelf search result";
+ return SHELF_SEARCH_RESULT;
}
/* (non-Javadoc)
@@ -36,7 +40,7 @@
*/
@Override
public String getSearchResultTemplate() {
- return "/includes/search/result/shelfResult.xhtml";
+ return TEMPLATE;
}
/* (non-Javadoc)
@@ -51,7 +55,5 @@
}else{
setSearchResult(new ArrayList<Shelf>());
}
-
}
-
-}
+}
\ No newline at end of file
Modified: 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 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -15,12 +15,16 @@
*/
public class SearchOptionByTag extends ISearchOption {
+ private static final String TEMPLATE = "/includes/search/result/tagsResult.xhtml";
+ private static final String TAGS_SEARCH_RESULT = "Tags search result";
+ private static final String TAGS = "Tags";
+
/* (non-Javadoc)
* @see org.richfaces.realworld.search.ISearchOption#getName()
*/
@Override
public String getName() {
- return "Tags";
+ return TAGS;
}
/* (non-Javadoc)
@@ -28,7 +32,7 @@
*/
@Override
public String getSearchResultName() {
- return "Tags search result";
+ return TAGS_SEARCH_RESULT;
}
/* (non-Javadoc)
@@ -36,7 +40,7 @@
*/
@Override
public String getSearchResultTemplate() {
- return "/includes/search/result/tagsResult.xhtml";
+ return TEMPLATE;
}
/* (non-Javadoc)
@@ -51,6 +55,5 @@
}else{
setSearchResult(new ArrayList<MetaTag>());
}
-
}
-}
+}
\ No newline at end of file
Modified: 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 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -15,12 +15,16 @@
*/
public class SearchOptionByUser extends ISearchOption {
+ private static final String TEMPLATE = "/includes/search/result/userResult.xhtml";
+ private static final String USERS_SEARCH_RESULT = "Users search result";
+ private static final String USERS = "Users";
+
/* (non-Javadoc)
* @see org.richfaces.realworld.search.ISearchOption#getName()
*/
@Override
public String getName() {
- return "Users";
+ return USERS;
}
/* (non-Javadoc)
@@ -28,7 +32,7 @@
*/
@Override
public String getSearchResultName() {
- return "Users search result";
+ return USERS_SEARCH_RESULT;
}
/* (non-Javadoc)
@@ -36,7 +40,7 @@
*/
@Override
public String getSearchResultTemplate() {
- return "/includes/search/result/userResult.xhtml";
+ return TEMPLATE;
}
/* (non-Javadoc)
@@ -50,7 +54,5 @@
}else{
setSearchResult(new ArrayList<User>());
}
-
}
-
-}
+}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ConfirmationPopupHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ConfirmationPopupHelper.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ConfirmationPopupHelper.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -44,14 +44,11 @@
private String actionName;
- @In @Out
- private Image image;
+ @In @Out private Image image;
- @In @Out
- private Shelf shelf;
+ @In @Out private Shelf shelf;
- @In @Out
- private Album album;
+ @In @Out private Album album;
@In AlbumManager albumManager;
@@ -104,5 +101,4 @@
public void deleteImage(){
imageManager.deleteImage(this.image);
}
-
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/DirectLinkHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/DirectLinkHelper.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/DirectLinkHelper.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -20,10 +20,8 @@
@Scope(ScopeType.EVENT)
@AutoCreate
public class DirectLinkHelper {
- private static final String DEFAULT_PICTURE = "default/noimage.jpg";
- @In(value="entityManager")
- protected EntityManager em;
+ @In(value="entityManager") EntityManager em;
@In ImageLoader imageLoader;
@@ -36,7 +34,7 @@
Long id = Long.valueOf(data.toString());
Image im = em.find(Image.class, id);
if(im == null || im.getAlbum() == null || im.getAlbum().getShelf() == null){
- imageLoader.paintImage(out, DEFAULT_PICTURE);
+ imageLoader.paintImage(out, Constants.DEFAULT_PICTURE);
return;
}
if(im.getAlbum().getShelf().isShared() || (identity.hasRole(Constants.ADMIN_ROLE) && im.getAlbum().getOwner().getLogin().equals(credentials.getUsername()))){
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/EditorBean.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/EditorBean.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/EditorBean.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -22,6 +22,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Observer;
+import org.richfaces.realworld.service.Constants;
@Name("editorBean")
public class EditorBean {
@@ -34,7 +35,7 @@
return message;
}
- @Observer("clearEditor")
+ @Observer(Constants.CLEAR_EDITOR_EVENT)
public void setMessage(String message) {
this.message = message;
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -30,6 +30,7 @@
import org.jboss.seam.annotations.Observer;
import org.jboss.seam.annotations.Scope;
import org.richfaces.realworld.domain.Image;
+import org.richfaces.realworld.service.Constants;
@Name("fileWrapper")
@Scope(ScopeType.CONVERSATION)
@@ -52,12 +53,12 @@
this.files = files;
}
- @Observer("DNDUploadedEvent")
+ @Observer(Constants.DNDUPLOADED_EVENT)
public void removeImage(Image image){
files.remove(image);
}
- @Observer("clearFileUpload")
+ @Observer(Constants.CLEAR_FILE_UPLOAD_EVENT)
public void clear(){
files.clear();
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -35,30 +35,30 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.richfaces.realworld.manager.FileManager;
+import org.richfaces.realworld.service.Constants;
@Name("imageLoader")
@Scope(ScopeType.EVENT)
@AutoCreate
public class ImageLoader implements Serializable {
- private static final long serialVersionUID = -1572789608594870285L;
+ private static final long serialVersionUID = -1572789608594870285L;
- @In
- FileManager fileManager;
+ @In FileManager fileManager;
public void paintImage(OutputStream out, Object data) throws IOException {
if (null == data) {
return;
}
File imageResource = null;
- if(data.toString().endsWith("upload")){
+ if(data.toString().endsWith(Constants.UPLOAD)){
imageResource = fileManager.getFileByAbsolutePath(data.toString());
}else{
imageResource = fileManager.getFileByPath(data.toString());
}
if (imageResource != null && imageResource.exists()) {
- byte [] toWrite = new byte[8192];
+ byte [] toWrite = new byte[Constants.DEFAULT_BUFFER_SIZE];
ImageInputStream inputStream = ImageIO.createImageInputStream(imageResource);
ImageOutputStream outputStream = ImageIO.createImageOutputStream(out);
@@ -75,4 +75,4 @@
}
}
-}
+}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -16,6 +16,7 @@
import org.richfaces.event.UploadEvent;
import org.richfaces.model.UploadItem;
import org.richfaces.realworld.domain.Sex;
+import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IUserAction;
/**
@@ -26,6 +27,7 @@
@Scope(ScopeType.CONVERSATION)
public class UserPrefsHelper implements Serializable{
private static final long serialVersionUID = -1767281809514660171L;
+
@In IUserAction userAction;
Boolean avatarModalOpened = false;
@@ -33,8 +35,8 @@
@In(required=false, scope=ScopeType.CONVERSATION) @Out(required=false, scope=ScopeType.CONVERSATION) private File avatarData;
static final SelectItem[] sexs = new SelectItem[] {
- new SelectItem(Sex.MALE, "Male"),
- new SelectItem(Sex.FEMALE, "Female") };
+ new SelectItem(Sex.MALE, Constants.MALE),
+ new SelectItem(Sex.FEMALE, Constants.FEMALE) };
public SelectItem [] getSexs() {
return sexs;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/CopyImageStuff.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/CopyImageStuff.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/CopyImageStuff.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -15,6 +15,7 @@
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Startup;
+import org.richfaces.realworld.service.Constants;
/**
@@ -27,13 +28,6 @@
@Startup
public class CopyImageStuff {
- static final String WEB_INF = "WEB-INF";
-
- static final String IMAGE_FOLDER = "/Upload";
-
- //TODO nick - change constant value to include "richfaces"
- static final String REALWORLD_FOLDER = "realworld";
-
@Out(scope = ScopeType.APPLICATION)
File uploadRoot;
@@ -68,26 +62,26 @@
}
if (classLoadPath != null) {
- int index = classLoadPath.indexOf(WEB_INF);
+ int index = classLoadPath.indexOf(Constants.WEB_INF);
if (index != -1) {
- realPath = classLoadPath.substring(0, index + WEB_INF.length()) + IMAGE_FOLDER;
+ realPath = classLoadPath.substring(0, index + Constants.WEB_INF.length()) + Constants.IMAGE_FOLDER;
}
}
if (realPath != null) {
this.imageSrc = realPath;
}else {
- throw new NullPointerException("Cannot bound image folder path");
+ throw new NullPointerException(Constants.UPLOAD_FOLDER_PATH_ERROR);
}
}
void resolveUploadRoot()throws IOException {
- String property = System.getProperty("java.io.tmpdir");
+ String property = System.getProperty(Constants.TEMP_DIR);
if(!property.endsWith(File.separator)){
property+=File.separator;
}
- String uploadRootPath = property + REALWORLD_FOLDER + File.separator;
+ String uploadRootPath = property + Constants.REALWORLD_FOLDER + File.separator;
if (uploadRootPath != null) {
uploadRoot = new File(uploadRootPath);
if (uploadRoot.exists()) {
@@ -96,12 +90,11 @@
uploadRoot.mkdir();
this.uploadRootPath = uploadRoot.getCanonicalPath();
}else {
- throw new NullPointerException("Upload root was not created");
+ throw new NullPointerException(Constants.UPLOAD_ROOT_CREATION_ERROR);
}
}
void copyImages()throws IOException {
FileUtils.copyDirectory(new File(imageSrc), uploadRoot);
}
-
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -5,12 +5,14 @@
public class FileUtils {
- private static final int BUFFER_SIZE = 4 * 1024;
+ private static final String JPEG = "jpeg";
+ private static final String JPG = "jpg";
+ private static final int BUFFER_SIZE = 4 * 1024;
private static final boolean CLOCK = true;
private static final boolean VERIFY = true;
public static void copyFile(File srcFile, File destFile) throws IOException {
- if (!srcFile.getPath().toLowerCase().endsWith("jpg") && !srcFile.getPath().toLowerCase().endsWith("jpeg")) {
+ if (!srcFile.getPath().toLowerCase().endsWith(JPG) && !srcFile.getPath().toLowerCase().endsWith(JPEG)) {
return;
}
final InputStream in = new FileInputStream(srcFile);
@@ -41,7 +43,6 @@
out.close();
in.close();
}
-
}
public static void copyDirectory(File srcDir, File dstDir)
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java 2009-04-08 11:43:55 UTC (rev 13426)
@@ -19,8 +19,9 @@
public class SessionListener {
@In(required=false) User user;
- @In(value="entityManager")
- EntityManager em;
+
+ @In(value="entityManager") EntityManager em;
+
@In FileManager fileManager;
@Destroy @Transactional @Observer("org.jboss.seam.sessionExpired")
Modified: trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties
===================================================================
--- trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties 2009-04-08 11:43:55 UTC (rev 13426)
@@ -90,21 +90,8 @@
error=Error
errorStub=Something bad happened :-(
-fileUpload.header=You will upload files in album: #{model.selectedAlbum.name}. If you want upload in another album, select it.
-fileUpload.header2=Choose album:
-fileUpload.uploadedPanelHeader=Uploaded Files Info
-fileUpload.fileNameLabel=File Name:
-fileUpload.fileLengthLabel=File Length(bytes):
-fileUpload.fileEditLabel=Edit
-fileUpload.storeAllLabel=Store All
-fileUpload.storeSelectedLabel=Store Selected
-fileUpload.clearLabel=Clear Uploaded Data
-fileUpload.clearSelectedLabel=Clear Selected
-
comment.label=View comments(#{model.selectedImage.comments.size})
comment.author=Author: #{comment.author.login}
-comment.askForFriend=Ask for friendship
-comment.askForFriend.message=Please, add me to your friends
comment.date=Date: #{comment.date}
comment.delete=Delete comment
comment.edit=Edit Comment
@@ -114,32 +101,10 @@
comment.cancel=Cancel
comment.comments=Comments
-message.sendMessage=Send message
-message.sendToUser=Send message for this user
-message.readed=Mark as read
-message.authorHeader=Author
-message.themeHeader=Theme
-message.dateHeader=Date
-message.theme=Theme\:
-message.author=Author\:
-message.date=Date: #{record.date}
-message.delete=Delete
-message.read=Read
-message.re=Re:
-message.message=Message
-message.owner=Owner\:
-message.content=Content\:
-message.addFriend=Add to friends
-message.friendRequest=It is request for friendship message. You may add this user to your friends by clicking on the 'Add to Friends button'
-message.send=Send
-message.close=Close
-
confirm.confirm=Confirmation:
confirm.ok=OK
confirm.cancel=Cancel
-shared.delete=Delete From shared
-
album.edit=Edit
album.delete=Delete
album.delete.confirm=Are you sure? All images associated with this album will also dropped! Click OK to proceed, else click Cancel.
@@ -153,13 +118,6 @@
album.store=Store
album.cancel=Cancel
-scroller.first=First
-scroller.last=Last
-scroller.prev=Prev
-scroller.next=Next
-scroller.pager=Image #{model.selectedImageIndex} of #{model.selectedAlbum.images.size}
-
-image.panelHeader=Image Preview: Selected Album: #{model.selectedAlbum.name}
image.delete=Delete
image.delete.confirm=Are you sure? Click OK to proceed, else click Cancel.
image.edit=Edit Properties
@@ -168,14 +126,12 @@
image.desc=Short Description:
image.album=Album
image.date=Created Date:
-image.meta=Image Meta-information:
image.store=Store
image.cancel=Cancel
image.save=Save
slideshow.start=Start Slideshow
slideshow.stop=Stop slideshow
-slideshow.interval=Interval in sec
index.header=Welcome!
@@ -184,20 +140,8 @@
login.userName=Username
login.password=Password
login.register=Register
-login.anonymous=Anonymous
-friends.delete=Delete from friends
-friends.choose=Choose album for preview:
-
-search.advanced=Advanced search:
-search.rank=Rank:
-search.numberVotes=Number of votes:
-search.date=Date created
-search.addShared=Add to favorite Albums
-search.preview=Preview
search.search=Search
-search.popular=Popular Images
-search.unpopular=UnPopular Images
search.nofound=No images found
user.loginPrefs=Login Preferences
@@ -228,33 +172,9 @@
menu.welcome=Welcome,
menu.welcome.guest=Welcome, guest! If you want access to full version of application, please register or login.
-menu.message.tooltip=You have #{messageManager.countUnreadedMessages} not-readed messages
-menu.messages=Read Messages
-menu.search=Search
-menu.image=Image Preview
-menu.user=User Prefs
-menu.file=File Upload
menu.logout=Logout
menu.login=Login
-realworld=RealWorld Demo application
-panel.albumHeader=Album Management
-panel.my=My albums
-panel.friend=Friend Albums
-panel.shared=Favorites
-
-samplename=Sample Name
-sampledesc=Sample Description
-addedtofriends=You are were added to friends
-addedtofriendsby=You are were added to friends by User
-removedfromfriends=You are were removed from friends
-removedfromfriendsby=You are were removed from friends of
-equals=Equals
-more=More
-less=Less
-nomatter=No Matter
-small=Small
-medium=Medium
full=Full size
file_processing_error=Error processing occured during upload
@@ -262,71 +182,35 @@
invalid_login=Invalid login or password
login_success=You are successfully registered.
wrong_dnd=That album isn't yours, so you can't change it's location
-friend_error=This user won't be your friend!
acess_not_granted=You have no rights to view this album
-invalid_syntax=Invalid syntax
album_addImage=Add image
-album_addToFavorites=Add to favorite albums
album_present=Album with this name already present!
-album_deleteFromFavorite=Delete from favorite
album_show=Show album
-album_reqForFriend=Send owner request for friendship
-album_deleteFromFriends=Delete owner from friends
album_viewProfile=View profile of owner
-album_sendMessage=Send message for owner
album_show_all=Show all albums of owner
-album_show_history=Show message history with owner
-image_showLinks=Show Links
-image_addFavorites=Add to favorite images
-image_deleteFavorites=Remove from favorite images
image_show_parent=Show parent album
image_show=Show image
-image_addParentToFavorite=Add parent to favorite albums
-image_removeParentFavorite=Remove parent from favorite albums
image_showParent=Show parent album
user_profile=View profile
-user_history=Show message history
user_show_albums=Show albums
-fileUpload_choosemode=Choose mode for upload:
-
camera=Camera
uploaded=Uploaded at
-size=Size
-dimensions=Dimensions
-sizeInKB=Size in KB
-width=Width
-height=Height
-choose_camera=Choose camera:
-choose_metatag=Choose metatag for search:
-case_sensitive=Case-sensitive search
-my_albums=My albums
-my_friends=My friends
-content=Content
-closeHistory=Close history
-history=History
-
errorGeneral=OOOps..... Error happened
errorDetail=Error: #{error.message}
albums=Albums:
images=Images:
-friends_albums=Friend albums
album=Album:
owner=Owner
metatags=Metatags:
-rating=Rating:
-friends=Friends
-friendsInfo=Friends info
viewProfile=View profile
show_albums=Show albums
-show_history=Show message history
author=Author
-linkManagement=Link management
close=Close
myAlbumShelfs=My album shelfs
newPhotos=New photos
Modified: trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties
===================================================================
--- trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties 2009-04-08 11:43:55 UTC (rev 13426)
@@ -31,21 +31,8 @@
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\: \#{model.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 (\#{model.selectedImage.comments.size})
comment.author=\u0410\u0432\u0442\u043E\u0440\: \#{comment.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\: \#{comment.date}
comment.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
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
@@ -54,32 +41,10 @@
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.
@@ -92,14 +57,6 @@
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=\u0418\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \#{model.selectedImageIndex} \u0438\u0437 \#{model.selectedAlbum.images.size}
-
-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\: \#{model.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
@@ -108,14 +65,12 @@
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
image.save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C
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\!
@@ -124,22 +79,7 @@
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\:
@@ -154,9 +94,6 @@
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;
@@ -168,106 +105,38 @@
menu.welcome=\u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C,
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 \#{messageManager.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
-
file_processing_error=\u041F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430 \u043F\u0440\u0438 \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0435 \u0444\u0430\u0439\u043B\u0430
file_saving_error=\u041F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043F\u043E\u043F\u044B\u0442\u043A\u0430 \u043F\u0440\u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0438 \u0444\u0430\u0439\u043B\u0430 \u043D\u0430 \u0434\u0438\u0441\u043A
invalid_login=\u041D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u044B\u0439 \u043B\u043E\u0433\u0438\u043D \u0438\u043B\u0438 \u043F\u0430\u0440\u043E\u043B\u044C
login_success=\u0412\u044B \u0443\u0441\u043F\u0435\u0448\u043D\u043E \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u044B
wrong_dnd=\u0412\u044B \u043D\u0435 \u043C\u043E\u0436\u0435\u0442\u0435 \u043F\u0435\u0440\u0435\u043C\u0435\u0441\u0442\u0438\u0442\u044C \u044D\u0442\u043E\u0442 \u0430\u043B\u044C\u0431\u043E\u043C, \u0442\u0430\u043A \u043A\u0430\u043A \u043E\u043D \u043D\u0435 \u0432\u0430\u0448
-friend_error=\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C \u043D\u0435 \u0445\u043E\u0447\u0435\u0442 \u0431\u044B\u0442\u044C \u0432\u0430\u0448\u0438\u043C \u0434\u0440\u0443\u0433\u043E\u043C\!
acess_not_granted=\u0412\u044B \u043D\u0435 \u0438\u043C\u0435\u0435\u0442\u0435 \u043F\u0440\u0430\u0432 \u0434\u043B\u044F \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 \u044D\u0442\u043E\u0433\u043E \u0430\u043B\u044C\u0431\u043E\u043C\u0430
-invalid_syntax=\u041D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u044B\u0439 \u0441\u0438\u043D\u0442\u0430\u043A\u0441\u0438\u0441
album_addImage=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0443
-album_addToFavorites=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0432 \u0438\u0437\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u0430\u043B\u044C\u0431\u043E\u043C\u044B
album_present=\u0410\u043B\u044C\u0431\u043E\u043C \u0441 \u0442\u0430\u043A\u0438\u043C \u0438\u043C\u0435\u043D\u0435\u043C \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442\!
-album_deleteFromFavorite=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0438\u0437 \u0438\u0437\u0431\u0440\u0430\u043D\u043D\u043E\u0433\u043E
album_show=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0430\u043B\u044C\u0431\u043E\u043C
-album_reqForFriend=\u041F\u043E\u0441\u043B\u0430\u0442\u044C \u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0443 \u0437\u0430\u043F\u0440\u043E\u0441 \u043D\u0430 \u0434\u0440\u0443\u0436\u0431\u0443
-album_deleteFromFriends=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0430 \u0438\u0437 \u0441\u043F\u0438\u0441\u043A\u0430 \u0434\u0440\u0443\u0437\u0435\u0439
album_viewProfile=\u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u043F\u0440\u043E\u0444\u0438\u043B\u044C \u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0430
-album_sendMessage=\u041F\u043E\u0441\u043B\u0430\u0442\u044C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0443 \u0430\u043B\u044C\u0431\u043E\u043C\u0430
album_show_all=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0432\u0441\u0435 \u0430\u043B\u044C\u0431\u043E\u043C\u044B \u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0430
-album_show_history=\u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 \u0441 \u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0435\u043C \u0430\u043B\u044C\u0431\u043E\u043C\u0430
-
-
-image_showLinks=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0438
-image_addFavorites=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A \u0438\u0437\u0431\u0440\u0430\u043D\u043D\u044B\u043C \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u044F\u043C
-image_deleteFavorites=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0438\u0437 \u0438\u0437\u0431\u0440\u0430\u043D\u043D\u044B\u0445 \u043A\u0430\u0440\u0442\u0438\u043D\u043E\u043A
image_show_parent=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0430\u043B\u044C\u0431\u043E\u043C, \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0449\u0438\u0439 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435
image_show=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435
-image_addParentToFavorite=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0432 \u0438\u0437\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u0430\u043B\u044C\u0431\u043E\u043C\u044B
-image_removeParentFavorite=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0438\u0437 \u0438\u0437\u0431\u0440\u0430\u043D\u043D\u044B\u0445 \u0430\u043B\u044C\u0431\u043E\u043C\u043E\u0432
image_showParent=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0430\u043B\u044C\u0431\u043E\u043C, \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0449\u0438\u0439 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435
user_profile=\u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u043F\u0440\u043E\u0444\u0438\u043B\u044C
-user_history=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439
user_show_albums=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0430\u043B\u044C\u0431\u043E\u043C\u044B
-fileUpload_choosemode=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0436\u0438\u043C \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438\:
-
camera=\u041C\u043E\u0434\u0435\u043B\u044C \u043A\u0430\u043C\u0435\u0440\u044B
-uploaded=\u0414\u0430\u0442\u0430 \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438
-size=\u0420\u0430\u0437\u043C\u0435\u0440
-dimensions=\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0435
-sizeInKB=\u0420\u0430\u0437\u043C\u0435\u0440 \u0432 KB
-width=\u0428\u0438\u0440\u0438\u043D\u0430
-height=\u0412\u044B\u0441\u043E\u0442\u0430
-choose_camera=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043C\u043E\u0434\u0435\u043B\u044C \u043A\u0430\u043C\u0435\u0440\u044B\:
-choose_metatag=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043C\u0435\u0442\u0430\u0442\u044D\u0433\u0438 \u0434\u043B\u044F \u043F\u043E\u0438\u0441\u043A\u0430\:
-case_sensitive=\u0423\u0447\u0438\u0442\u044B\u0432\u0430\u0442\u044C \u0440\u0435\u0433\u0438\u0441\u0442\u0440
-tooltip_top=\u0411\u0443\u0434\u0443\u0442 \u043F\u043E\u043A\u0430\u0437\u0430\u043D\u044B \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438 \u0441 \u043C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u044B\u043C \u0440\u0435\u0439\u0442\u0438\u043D\u0433\u043E\u043C
-tooltip_worst=\u0411\u0443\u0434\u0443\u0442 \u043F\u043E\u043A\u0430\u0437\u0430\u043D\u044B \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438 \u0441 \u043C\u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u044B\u043C \u0440\u0435\u0439\u0442\u0438\u043D\u0433\u043E\u043C
-my_albums=\u041C\u043E\u0438 \u0430\u043B\u044C\u0431\u043E\u043C\u044B
-my_friends=\u041C\u043E\u0438 \u0434\u0440\u0443\u0437\u044C\u044F
-content=\u0421\u043E\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435
-closeHistory=\u0417\u0430\u043A\u0440\u044B\u0442\u044C \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439
-history=\u0418\u0441\u0442\u043E\u0440\u0438\u044F \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439
-
errorGeneral=\u0443\u043F\u0441....\u041F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430
errorDetail=\u041E\u0448\u0438\u0431\u043A\u0430\: \#{error.message}
-
-albums=\u0418\u0437\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u0430\u043B\u044C\u0431\u043E\u043C\u044B\:
-images=\u0418\u0437\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F\:
-friends_albums=\u0410\u043B\u044C\u0431\u043E\u043C\u044B \u0434\u0440\u0443\u0437\u0435\u0439
album=\u0410\u043B\u044C\u0431\u043E\u043C\:
owner=\u0412\u043B\u0430\u0434\u0435\u043B\u0435\u0446
metatags=\u041C\u0435\u0442\u0430\u0442\u044D\u0433\u0438\:
friends=\u0414\u0440\u0443\u0437\u044C\u044F
-friendsInfo=\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043E \u0434\u0440\u0443\u0437\u044C\u044F\u0445
viewProfile=\u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u043F\u0440\u043E\u0444\u0438\u043B\u044C
show_albums=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0430\u043B\u044C\u0431\u043E\u043C\u044B
-show_history=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439
author=\u0410\u0432\u0442\u043E\u0440
-linkManagement=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0441\u0441\u044B\u043B\u043A\u0430\u043C\u0438
close=\u0417\u0430\u043A\u0440\u044B\u0442\u044C
myAlbumShelfs=\u041C\u043E\u0438 \u043A\u043E\u043B\u043B\u0435\u043A\u0446\u0438\u0438 \u0430\u043B\u044C\u0431\u043E\u043C\u043E\u0432
newPhotos=\u041D\u043E\u0432\u044B\u0435 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0438
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/pages.xml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/pages.xml 2009-04-08 10:01:51 UTC (rev 13425)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/pages.xml 2009-04-08 11:43:55 UTC (rev 13426)
@@ -19,15 +19,15 @@
<page view-id="/index.xhtml">
<begin-conversation if="#{!identity.isLoggedIn()}"/>
- <action if="#{authenticator.startConversation!=null}" execute="#{authenticator.startConversation()}"/>
- <action if="#{!identity.isLoggedIn()}" execute="#{authenticator.start}"/>
+ <action if="#{authenticator.startConversation!=null}" execute="#{authenticator.destroyConversation()}"/>
+ <action if="#{!identity.isLoggedIn()}" execute="#{authenticator.startConversation()}"/>
<navigation from-action="#{authenticator.logout}">
<rule if-outcome="logout">
<end-conversation />
<redirect view-id="/index.html"/>
</rule>
</navigation>
- <navigation from-action="#{authenticator.start}">
+ <navigation from-action="#{authenticator.startConversation}">
<redirect view-id="/index.xhtml"/>
</navigation>
</page>
Modified: trunk/test-applications/realworld2/web/src/main/webapp/error.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/createAlbum.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForAlbum.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForImage.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForShelf.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForUser.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/index/login.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/index/menu.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/confirmation.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/help.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/modalPanels.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/slideShowPooler.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/createShelf.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/index.xhtml
===================================================================
(Binary files differ)
More information about the richfaces-svn-commits
mailing list