Author: thomas.heute(a)jboss.com Date: 2008-06-02 03:37:18 -0400 (Mon, 02 Jun 2008) New Revision: 10899 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java Log: Revert i18n changes and compilation breaking Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2008-06-02 07:23:17 UTC (rev 10898) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2008-06-02 07:37:18 UTC (rev 10899) @@ -22,18 +22,13 @@ package org.jboss.portal.core.admin.ui; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import javax.faces.model.SelectItem; - -import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.control.ControlConstants; +import javax.faces.model.SelectItem; +import java.util.ArrayList; +import java.util.List; + /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @version $Revision$ @@ -49,24 +44,9 @@ /** . */ final PortalObjectManagerBean pomgr; - - private static Map<Locale,String> DISPLAY_THE_DEFAULT_ERROR_MESSAGE_DISPLAY_NAME = new HashMap<Locale,String>(); - private static Map<Locale,String> REDIRECT_TO_THE_SPECIFIED_RESOURCE_DISPLAY_NAME = new HashMap<Locale,String>(); - private static Map<Locale,String> REMOVE_THE_RESOURCE_FROM_PAGE_DISPLAY_NAME = new HashMap<Locale,String>(); - - static { - DISPLAY_THE_DEFAULT_ERROR_MESSAGE_DISPLAY_NAME.put(Locale.ENGLISH, "Display the default error message"); - REDIRECT_TO_THE_SPECIFIED_RESOURCE_DISPLAY_NAME.put(Locale.ENGLISH, "Redirect to the specified resource"); - REMOVE_THE_RESOURCE_FROM_PAGE_DISPLAY_NAME.put(Locale.ENGLISH, "Remove the resource from page"); - - DISPLAY_THE_DEFAULT_ERROR_MESSAGE_DISPLAY_NAME.put(Locale.ITALY, "Visualizza il messaggio di errore di default"); - REDIRECT_TO_THE_SPECIFIED_RESOURCE_DISPLAY_NAME.put(Locale.ITALY, "Redireziona alla risorsa specificata"); - REMOVE_THE_RESOURCE_FROM_PAGE_DISPLAY_NAME.put(Locale.ITALY, "Rimuovi la risorsa dalla pagina"); - } - - private static final LocalizedString DISPLAY_THE_DEFAULT_ERROR_MESSAGE = new LocalizedString(DISPLAY_THE_DEFAULT_ERROR_MESSAGE_DISPLAY_NAME,Locale.getDefault()); - private static final LocalizedString REDIRECT_TO_THE_SPECIFIED_RESOURCE = new LocalizedString(REDIRECT_TO_THE_SPECIFIED_RESOURCE_DISPLAY_NAME,Locale.getDefault()); - private static final LocalizedString REMOVE_THE_RESOURCE_FROM_PAGE = new LocalizedString(REMOVE_THE_RESOURCE_FROM_PAGE_DISPLAY_NAME,Locale.getDefault()); + private static final String DISPLAY_THE_DEFAULT_ERROR_MESSAGE = "Display the default error message"; + private static final String REDIRECT_TO_THE_SPECIFIED_RESOURCE = "Redirect to the specified resource"; + private static final String REMOVE_THE_RESOURCE_FROM_PAGE = "Remove the resource from page"; public ControlPropertiesBean(PortalObjectManagerBean pomgr) { @@ -79,8 +59,8 @@ if (portalSelectItems == null) { portalSelectItems = new ArrayList(); - portalSelectItems.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE, DISPLAY_THE_DEFAULT_ERROR_MESSAGE.getDefaultString())); - portalSelectItems.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE, REDIRECT_TO_THE_SPECIFIED_RESOURCE.getDefaultString())); + portalSelectItems.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE, DISPLAY_THE_DEFAULT_ERROR_MESSAGE)); + portalSelectItems.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE, REDIRECT_TO_THE_SPECIFIED_RESOURCE)); } return portalSelectItems; } @@ -90,9 +70,9 @@ if (pageSelectItems == null) { pageSelectItems = new ArrayList(); - pageSelectItems.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE, DISPLAY_THE_DEFAULT_ERROR_MESSAGE.getDefaultString())); - pageSelectItems.add(new SelectItem(ControlConstants.HIDE_CONTROL_VALUE, REMOVE_THE_RESOURCE_FROM_PAGE.getDefaultString())); - pageSelectItems.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE, REDIRECT_TO_THE_SPECIFIED_RESOURCE.getDefaultString())); + pageSelectItems.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE, DISPLAY_THE_DEFAULT_ERROR_MESSAGE)); + pageSelectItems.add(new SelectItem(ControlConstants.HIDE_CONTROL_VALUE, REMOVE_THE_RESOURCE_FROM_PAGE)); + pageSelectItems.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE, REDIRECT_TO_THE_SPECIFIED_RESOURCE)); } return pageSelectItems; } Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2008-06-02 07:23:17 UTC (rev 10898) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2008-06-02 07:37:18 UTC (rev 10899) @@ -22,24 +22,6 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; - -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; -import javax.faces.model.SelectItem; - -import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.core.admin.ui.actions.AddPageAction; import org.jboss.portal.core.admin.ui.actions.PropertyAction; import org.jboss.portal.core.admin.ui.common.PageManagerBean; @@ -68,6 +50,21 @@ import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.ThemeService; +import javax.faces.application.FacesMessage; +import javax.faces.context.FacesContext; +import javax.faces.event.ActionEvent; +import javax.faces.model.SelectItem; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** The portal object manager bean. */ public class PortalObjectManagerBean implements Serializable, AddPageAction.Listener { @@ -169,14 +166,6 @@ /** . */ private Boolean maximizedStateExists; - - private static Map<Locale,String> NO_BOUND_LISTENER_DISPLAY_NAME = new HashMap<Locale,String>(); - static { - NO_BOUND_LISTENER_DISPLAY_NAME.put(Locale.ENGLISH, "no bound listener"); - NO_BOUND_LISTENER_DISPLAY_NAME.put(Locale.ITALY, "nessun listener"); - } - - private static final LocalizedString NO_BOUND_LISTENER = new LocalizedString(NO_BOUND_LISTENER_DISPLAY_NAME,Locale.getDefault()); // Wired services @@ -883,7 +872,7 @@ { SelectItem[] result = new SelectItem[ids.size() + 1]; int i = 1; - result[0] = new SelectItem("", NO_BOUND_LISTENER.getDisplayName().getDefaultString()); + result[0] = new SelectItem("", "no bound listener"); for (Iterator idsIt = ids.iterator(); idsIt.hasNext();) { result[i++] = new SelectItem(idsIt.next());