[portal-commits] JBoss Portal SVN: r13575 - in branches/Enterprise_Portal_Platform_4_3: core-admin/src/resources/portal-admin-war/WEB-INF/classes and 2 other directories.

Tuesday, 21 July 2009


Author: chris.laprun(a)jboss.com
Date: 2009-07-21 18:08:34 -0400 (Tue, 21 Jul 2009)
New Revision: 13575

Modified:
  
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
  
branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
  
branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java
  
branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java
  
branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java
Log:
- Use bean context to output messages in PortalObjectManagerBean, improving localization.
- Made getErrorSeverity, getInfoSeverity and createLocalizedMessage methods public on
BeanContext.


Modified:
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
---
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java	2009-07-21
22:02:59 UTC (rev 13574)
+++
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java	2009-07-21
22:08:34 UTC (rev 13575)
@@ -58,7 +58,6 @@
 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;
@@ -128,9 +127,6 @@
    private String selectedContentURI;
 
    /** . */
-//   private Map selectedContentParameters = new HashMap();
-
-   /** . */
    private Map<String, String[]> renderParameters;
 
    // Runtime state
@@ -340,16 +336,6 @@
       this.renderParameters = renderParameters;
    }
 
-   /*public Map getSelectedContentParameters()
-   {
-      return selectedContentParameters;
-   }
-
-   public void setSelectedContentParameters(Map selectedContentParameters)
-   {
-      this.selectedContentParameters = selectedContentParameters;
-   }*/
-
    public DomainConfigurator getDomainConfigurator()
    {
       return domainConfigurator;
@@ -480,10 +466,7 @@
             String name = object.getName();
             parent.setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME,
name);
 
-
-            FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO,
"Success",
-               "'" + name + "' " + typeName + " was
successfully set as default " + typeName);
-            FacesContext.getCurrentInstance().addMessage("status", message);
+            beanContext.createLocalizedMessage(BeanContext.STATUS,
"MAKE_DEFAULT_SUCCESS", beanContext.getInfoSeverity(), name, typeName);
          }
       }
 
@@ -619,22 +602,17 @@
             {
                selectObject(object.getParent());
 
-               String stringMessage = object.getName() + " has successfully been
destroyed";
+               String name = object.getName();
 
-               //
-               object.getParent().destroyChild(object.getName());
+               object.getParent().destroyChild(name);
 
-               FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO,
stringMessage, stringMessage);
-               FacesContext.getCurrentInstance().addMessage("status",
message);
+               beanContext.createLocalizedMessage(BeanContext.STATUS,
"DESTROY_SUCCESS", beanContext.getInfoSeverity(), name);
 
                selectedDeletingObject = null;
             }
             else
             {
-               String stringMessage = "Cannot delete this already deleted
object";
-
-               FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR,
stringMessage, stringMessage);
-               FacesContext.getCurrentInstance().addMessage("status",
message);
+               beanContext.createLocalizedMessage(BeanContext.STATUS,
"DESTROY_FAILURE", beanContext.getInfoSeverity(), id);
             }
          }
       }
@@ -784,9 +762,7 @@
 
       public String submit()
       {
-         String stringMessage = "Security has been correctly updated on the
page";
-         FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO,
stringMessage, stringMessage);
-         FacesContext.getCurrentInstance().addMessage("status", message);
+         beanContext.createInfoMessage("SECURITY_UPDATED");
 
          //
          return "objects";

Modified:
branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
---
branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties	2009-07-21
22:02:59 UTC (rev 13574)
+++
branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties	2009-07-21
22:08:34 UTC (rev 13575)
@@ -340,3 +340,8 @@
 PROPERTY_TYPE=property
 PORTAL_OBJECT_TYPE=portal object
 WINDOW_TYPE=window
+
+MAKE_DEFAULT_SUCCESS= ''{0}'' {1} was successfully set as default {1}
+DESTROY_SUCCESS=''{0}'' has successfully been destroyed
+DESTROY_FAILURE=Couldn''t delete inexisting object with id
''{0}''
+SECURITY_UPDATED=Security has been correctly updated on the page

Modified:
branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java
===================================================================
---
branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java	2009-07-21
22:02:59 UTC (rev 13574)
+++
branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java	2009-07-21
22:08:34 UTC (rev 13575)
@@ -85,12 +85,12 @@
          // ignore for tests
       }
 
-      protected Object getErrorSeverity()
+      public Object getErrorSeverity()
       {
          return null;
       }
 
-      protected Object getInfoSeverity()
+      public Object getInfoSeverity()
       {
          return null;
       }

Modified:
branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java
===================================================================
---
branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java	2009-07-21
22:02:59 UTC (rev 13574)
+++
branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java	2009-07-21
22:08:34 UTC (rev 13575)
@@ -74,9 +74,9 @@
     */
    protected abstract void createMessage(String target, String message, Object
severity);
 
-   protected abstract Object getErrorSeverity();
+   public abstract Object getErrorSeverity();
 
-   protected abstract Object getInfoSeverity();
+   public abstract Object getInfoSeverity();
 
    protected abstract Locale getLocale();
 
@@ -99,7 +99,7 @@
     * @param severity           an object representing the severity of the message
(typically FacesMessage.Severity)
     * @param params             additional parameters to be passed to replace tokens in
localized strings
     */
-   protected void createLocalizedMessage(String target, String localizedMessageId, Object
severity, Object... params)
+   public void createLocalizedMessage(String target, String localizedMessageId, Object
severity, Object... params)
    {
       createMessage(target, getMessageFromBundle(localizedMessageId, params), severity);
    }

Modified:
branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java
===================================================================
---
branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java	2009-07-21
22:02:59 UTC (rev 13574)
+++
branches/Enterprise_Portal_Platform_4_3/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java	2009-07-21
22:08:34 UTC (rev 13575)
@@ -85,7 +85,7 @@
       // Get the component id from the target
       FacesContext facesContext = FacesContext.getCurrentInstance();
       target = resolveTargetId(target, facesContext);
-      if(target == null)
+      if (target == null)
       {
          // if we couldn't find the component, default to STATUS
          log.info("Couldn't resolve component target: " + target + ".
Using '" + STATUS + "' instead.");
@@ -120,20 +120,20 @@
 
    public static void outputLocalizedMessage(String target, String localizationKey,
Object severity, String resourceName, Object... params)
    {
-      if(severity == null)
+      if (severity == null)
       {
          severity = FacesMessage.SEVERITY_ERROR;
       }
-      
+
       outputMessage(target, getLocalizedMessage(localizationKey, getRequestLocale(),
resourceName, params), severity);
    }
 
-   protected Object getErrorSeverity()
+   public Object getErrorSeverity()
    {
       return FacesMessage.SEVERITY_ERROR;
    }
 
-   protected Object getInfoSeverity()
+   public Object getInfoSeverity()
    {
       return FacesMessage.SEVERITY_INFO;
    }


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[portal-commits] JBoss Portal SVN: r13575 - in branches/Enterprise_Portal_Platform_4_3: core-admin/src/resources/portal-admin-war/WEB-INF/classes and 2 other directories.