[gatein-commits] gatein SVN: r2358 - portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application.

[do-not-reply at jboss.org]

Author: mpodolin
Date: 2010-03-24 12:22:20 -0400 (Wed, 24 Mar 2010)
New Revision: 2358

Modified:
   portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
   portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
Log:
JBEPP-243: the GTNPORTAL-894 ported to the EPP branch

Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
===================================================================
--- portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java	2010-03-24 14:57:52 UTC (rev 2357)
+++ portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java	2010-03-24 16:22:20 UTC (rev 2358)
@@ -247,7 +247,8 @@
       }
       catch (Throwable ex)
       {
-         portletContent.append("This portlet encountered an error and could not be displayed.");
+         WebuiRequestContext webuiRequest = WebuiRequestContext.getCurrentInstance();
+         portletContent.append(webuiRequest.getApplicationResourceBundle().getString("UIPortlet.message.RuntimeError"));
          log.error("The portlet " + uiPortlet_.getName() + " could not be loaded. Check if properly deployed.",
             ExceptionUtil.getRootCause(ex));
       }

Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
===================================================================
--- portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java	2010-03-24 14:57:52 UTC (rev 2357)
+++ portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java	2010-03-24 16:22:20 UTC (rev 2358)
@@ -292,7 +292,7 @@
                            .getComponentInstanceOfType(PortletExceptionHandleService.class);
                      portletExceptionService.handle(pcException);
 
-                     markup = Text.create("This portlet encountered an error and could not be displayed.");
+                     markup = Text.create(context.getApplicationResourceBundle().getString("UIPortlet.message.RuntimeError"));
                   }
                }
             }
@@ -312,7 +312,7 @@
         	 log.warn("Could not find the PortletExceptionHandleService in the exo container");
          }
 
-         markup = Text.create("This portlet encountered an error and could not be displayed.");
+         markup = Text.create(context.getApplicationResourceBundle().getString("UIPortlet.message.RuntimeError"));
       }
 
       //