[Comsuite-svn] SF.net SVN: comsuite: [173] trunk/code/CSAdminPanel/JavaSource/org/ commsuite/web/beans

[<zd...@us...>]

Revision: 173
          http://svn.sourceforge.net/comsuite/?rev=173&view=rev
Author:   zduniak
Date:     2006-10-01 01:18:03 -0700 (Sun, 01 Oct 2006)

Log Message:
-----------
"--Wszystkie--" message internationalized

Modified Paths:
--------------
    trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java
    trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/users/SearchUserBean.java

Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java	2006-09-30 23:38:56 UTC (rev 172)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/servers/SearchServerBean.java	2006-10-01 08:18:03 UTC (rev 173)
@@ -371,7 +371,7 @@
     public List<SelectItem> getBooleanSearchList() {
     	List<SelectItem> items = new FastTable<SelectItem>();
     	SelectItem item = new SelectItem();
-    	item.setLabel(LanguageSelectionBean.getLabel(CHOICE_ALL_LABEL));
+    	item.setLabel(LanguageSelectionBean.getLabel(SearchServerBean.CHOICE_ALL_LABEL));
     	item.setValue(10);
     	items.add(item);
     	item = new SelectItem();

Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/users/SearchUserBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/users/SearchUserBean.java	2006-09-30 23:38:56 UTC (rev 172)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/users/SearchUserBean.java	2006-10-01 08:18:03 UTC (rev 173)
@@ -42,124 +42,157 @@
 /**
  * @since 1.0
  * @author Szymon Kuzniak
+ * @author Marcin Zduniak
  */
 public class SearchUserBean extends UserBean {
 
-    private static final Logger logger = Logger.getLogger(SearchUserBean.class);
-    
-    private static final int ROWS_ON_PAGE = 5;
-    
-    private static final String MESSAGE_ALL = "--Wszystkie--";
-    
-    private boolean searching;
-    
-    private int totalUsers;
-	
+	private static final Logger logger = Logger.getLogger(SearchUserBean.class);
+
+	private static final int ROWS_ON_PAGE = 5;
+
+	private boolean searching;
+
+	private int totalUsers;
+
+	/**
+	 * TODO: JavaDoc
+	 */
 	public int getTotalUsers() {
 		return totalUsers;
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public void setTotalUsers(int totalUsers) {
 		this.totalUsers = totalUsers;
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public boolean isSearching() {
 		return searching;
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public void setSearching(boolean searching) {
 		this.searching = searching;
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public void selectUser(ActionEvent event) {
 		try {
 			this.searching = "true".equals(getParameter("searching"));
-		} catch(IllegalArgumentException iae) {
+		} catch (IllegalArgumentException iae) {
 			logger.fatal("Unknown parameter");
 		}
 	}
 
 	/**
-     * gets list of users from database, using WSUser object
-     * created from HTML from.
-     * @return list of users that matches given criteria
-     */
-    public List<WSUser> getUsersAvailable() {
-        try {
-            final ICommunicateWS ws = (ICommunicateWS) SpringAdminPanelContext.getCommunicateWS();
-            logger.debug("SEARCHING VALUE: "+ this.searching);
-            if (this.searching) {
-            	List<WSUser> users;
-            	logger.debug("INSIDE IF FOR SEARCHING");
-            	if (this.getEnabledSearch() < 10) {
-            		logger.debug("SEARCHIN WITH ENABLED DISABLED");
-            		users = new FastTable<WSUser>(this.getUsers(this.createUserFromFields(), true, ws));
-            	} else {
-            		logger.debug("SEARCHIN WITH ENABLED ENABLED");
-            		users = new FastTable<WSUser>(this.getUsers(this.createUserFromFields(), false, ws));
-            	}
-            	return users;
-            } else {
-            	List<WSUser> users;
-            	if (this.getEnabledSearch() < 10) {
-            		users = new FastTable<WSUser>(this.getUsers(null, true, ws));
-            	} else {
-            		users = new FastTable<WSUser>(this.getUsers(null, false, ws));
-            	}
-            	return users;
-            }
-        } catch (WebServiceException wse) {
-            logger.fatal("Exception while receiving available users", wse);
-            LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_DATABASE, 
-            		BeansUtils.MESSAGE_USER_ERROR_FETCH, 
-            		BeansUtils.USERS_LIST_NAVIGATION);
-            return new ArrayList<WSUser>();
-        } catch (Exception e) {
-            logger.fatal("Exception", e);
-            LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_GENERAL, 
-            		BeansUtils.MESSAGE_USER_ERROR_FETCH, 
-            		BeansUtils.USERS_LIST_NAVIGATION);
-            return new ArrayList<WSUser>();
-        }
-    }
-    
-    private List<WSUser> getUsers(WSUser model, boolean enabledSearch, ICommunicateWS ws)
-    		throws WebServiceException{
-    	logger.debug("INSIDE GET USERS");
-    	this.totalUsers = ws.getUsersSize(model, enabledSearch);
-        this.totalPages = ((this.totalUsers - 1) / ROWS_ON_PAGE) + 1;
-        
-        int begin = (this.actualPage - 1) * ROWS_ON_PAGE;
-        int end = (this.actualPage * ROWS_ON_PAGE) - 1;
-        if (end >= this.totalUsers) end = (this.totalUsers - 1);
-        logger.debug("begin & end: "+ begin+ " "+ end);
-        
-        if (null == model) {
-        	return (List<WSUser>)ws.getUsersSubset(begin, end);
-        } else {
-        	return (List<WSUser>)ws.getSelectedUsersSubset(model, enabledSearch, begin, end);
-        }
-    }
-    
-    public List<SelectItem> getCountriesList() {
-    	List<SelectItem> choices = new FastTable<SelectItem>();
-    	SelectItem item = new SelectItem();
-		item.setLabel(MESSAGE_ALL);
-	//	item.setValue(null);
+	 * gets list of users from database, using WSUser object created from HTML
+	 * from.
+	 * 
+	 * @return list of users that matches given criteria
+	 */
+	public List<WSUser> getUsersAvailable() {
+		try {
+			final ICommunicateWS ws = (ICommunicateWS) SpringAdminPanelContext
+					.getCommunicateWS();
+			logger.debug("SEARCHING VALUE: " + this.searching);
+			if (this.searching) {
+				List<WSUser> users;
+				logger.debug("INSIDE IF FOR SEARCHING");
+				if (this.getEnabledSearch() < 10) {
+					logger.debug("SEARCHIN WITH ENABLED DISABLED");
+					users = new FastTable<WSUser>(this.getUsers(this
+							.createUserFromFields(), true, ws));
+				} else {
+					logger.debug("SEARCHIN WITH ENABLED ENABLED");
+					users = new FastTable<WSUser>(this.getUsers(this
+							.createUserFromFields(), false, ws));
+				}
+				return users;
+			} else {
+				List<WSUser> users;
+				if (this.getEnabledSearch() < 10) {
+					users = new FastTable<WSUser>(this.getUsers(null, true, ws));
+				} else {
+					users = new FastTable<WSUser>(this
+							.getUsers(null, false, ws));
+				}
+				return users;
+			}
+		} catch (WebServiceException wse) {
+			logger.fatal("Exception while receiving available users", wse);
+			LanguageSelectionBean.showMessage(
+					BeansUtils.MESSAGE_ERROR_DATABASE,
+					BeansUtils.MESSAGE_USER_ERROR_FETCH,
+					BeansUtils.USERS_LIST_NAVIGATION);
+			return new ArrayList<WSUser>();
+		} catch (Exception e) {
+			logger.fatal("Exception", e);
+			LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_ERROR_GENERAL,
+					BeansUtils.MESSAGE_USER_ERROR_FETCH,
+					BeansUtils.USERS_LIST_NAVIGATION);
+			return new ArrayList<WSUser>();
+		}
+	}
+
+	/**
+	 * TODO: JavaDoc
+	 */
+	private List<WSUser> getUsers(WSUser model, boolean enabledSearch,
+			ICommunicateWS ws) throws WebServiceException {
+		logger.debug("INSIDE GET USERS");
+		this.totalUsers = ws.getUsersSize(model, enabledSearch);
+		this.totalPages = ((this.totalUsers - 1) / ROWS_ON_PAGE) + 1;
+
+		int begin = (this.actualPage - 1) * ROWS_ON_PAGE;
+		int end = (this.actualPage * ROWS_ON_PAGE) - 1;
+		if (end >= this.totalUsers)
+			end = (this.totalUsers - 1);
+		logger.debug("begin & end: " + begin + " " + end);
+
+		if (null == model) {
+			return (List<WSUser>) ws.getUsersSubset(begin, end);
+		} else {
+			return (List<WSUser>) ws.getSelectedUsersSubset(model,
+					enabledSearch, begin, end);
+		}
+	}
+
+	/**
+	 * TODO: JavaDoc
+	 */
+	public List<SelectItem> getCountriesList() {
+		List<SelectItem> choices = new FastTable<SelectItem>();
+		SelectItem item = new SelectItem();
+		item.setLabel(LanguageSelectionBean
+				.getLabel("CHOICE_ALL_LABEL"));
+		// item.setValue(null);
 		choices.add(item);
-    	for(Country country : Country.values()) {
-    		item = new SelectItem();
-    		item.setLabel(country.toString());
-    		item.setValue(country);
-    		choices.add(item);
-    	}
-    	return choices;
-    }
-    
-    public List<SelectItem> getEnabledList() {
-    	List<SelectItem> choices = new FastTable<SelectItem>();
-    	SelectItem item = new SelectItem();
-		item.setLabel(MESSAGE_ALL);
+		for (Country country : Country.values()) {
+			item = new SelectItem();
+			item.setLabel(country.toString());
+			item.setValue(country);
+			choices.add(item);
+		}
+		return choices;
+	}
+
+	/**
+	 * TODO: JavaDoc
+	 */
+	public List<SelectItem> getEnabledList() {
+		List<SelectItem> choices = new FastTable<SelectItem>();
+		SelectItem item = new SelectItem();
+		item.setLabel(LanguageSelectionBean
+				.getLabel("CHOICE_ALL_LABEL"));
 		item.setValue(10);
 		choices.add(item);
 		item = new SelectItem();
@@ -170,37 +203,45 @@
 		item.setLabel("false");
 		item.setValue(0);
 		choices.add(item);
-    	return choices;
-    }
-    
-    public List<SelectItem> getTimezonesList() {
-    	List<SelectItem> choices = new FastTable<SelectItem>();
-    	SelectItem item = new SelectItem();
-		item.setLabel(MESSAGE_ALL);
-	//	item.setValue(null);
+		return choices;
+	}
+
+	/**
+	 * TODO: JavaDoc
+	 */
+	public List<SelectItem> getTimezonesList() {
+		List<SelectItem> choices = new FastTable<SelectItem>();
+		SelectItem item = new SelectItem();
+		item.setLabel(LanguageSelectionBean
+				.getLabel("CHOICE_ALL_LABEL"));
+		// item.setValue(null);
 		choices.add(item);
-    	for(TimeZone timezone : TimeZone.values()) {
-    		item = new SelectItem();
-    		item.setLabel(timezone.toString());
-    		item.setValue(timezone);
-    		choices.add(item);
-    	}
-    	return choices;
-    }
-    
-    public List<SelectItem> getLanguagesList() {
-    	List<SelectItem> choices = new FastTable<SelectItem>();
-    	SelectItem item = new SelectItem();
-		item.setLabel(MESSAGE_ALL);
-	//	item.setValue(null);
+		for (TimeZone timezone : TimeZone.values()) {
+			item = new SelectItem();
+			item.setLabel(timezone.toString());
+			item.setValue(timezone);
+			choices.add(item);
+		}
+		return choices;
+	}
+
+	/**
+	 * TODO: JavaDoc
+	 */
+	public List<SelectItem> getLanguagesList() {
+		List<SelectItem> choices = new FastTable<SelectItem>();
+		SelectItem item = new SelectItem();
+		item.setLabel(LanguageSelectionBean
+				.getLabel("CHOICE_ALL_LABEL"));
+		// item.setValue(null);
 		choices.add(item);
-    	for(Language language : Language.values()) {
-    		item = new SelectItem();
-    		item.setLabel(language.toString());
-    		item.setValue(language);
-    		choices.add(item);
-    	}
-    	return choices;
-    }
+		for (Language language : Language.values()) {
+			item = new SelectItem();
+			item.setLabel(language.toString());
+			item.setValue(language);
+			choices.add(item);
+		}
+		return choices;
+	}
 
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.