Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2796] change the way web user preferences are gathered in the function tag library;
|
From: <jma...@rh...> - 2009-01-28 17:38:03
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [2796] change the way web user preferences are gathered in the function tag library; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2796</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-01-28 11:38:01 -0600 (Wed, 28 Jan 2009)</dd> </dl> <h3>Log Message</h3> <pre>change the way web user preferences are gathered in the function tag library; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguicommontagFunctionTagLibraryjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguicommontagFunctionTagLibraryjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java (2795 => 2796)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java 2009-01-28 17:36:36 UTC (rev 2795) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java 2009-01-28 17:38:01 UTC (rev 2796) </span><span class="lines">@@ -176,7 +176,8 @@ </span><span class="cx"> String formatString = RequestUtils.message(FacesContextUtility.getRequest(), key); DateFormatter.DateSpecifics specs = new DateFormatter.DateSpecifics(); specs.setDateFormat(new SimpleDateFormat(formatString)); </span><span class="rem">- FormattedNumber fmtd = UnitsFormat.format(new UnitNumber(timestamp, unit, ScaleConstants.SCALE_MILLI), FacesContextUtility.getRequest().getLocale(), specs); </span><span class="add">+ FormattedNumber fmtd = UnitsFormat.format(new UnitNumber(timestamp, unit, ScaleConstants.SCALE_MILLI), + FacesContextUtility.getRequest().getLocale(), specs); </span><span class="cx"> return fmtd.toString(); } </span><span class="lines">@@ -195,7 +196,7 @@ </span><span class="cx"> } public static WebUserPreferences getWebUserPreferences() { </span><span class="rem">- return new WebUserPreferences(EnterpriseFacesContextUtility.getSubject()); </span><span class="add">+ return EnterpriseFacesContextUtility.getWebUser().getWebPreferences(); </span><span class="cx"> } public static String contextFragmentURL() { </span><span class="lines">@@ -206,8 +207,8 @@ </span><span class="cx"> case ResourceGroup: return ParamConstants.GROUP_ID_PARAM + "=" + String.valueOf(context.groupId); case AutoGroup: </span><span class="rem">- return ParamConstants.PARENT_RESOURCE_ID_PARAM + "=" + String.valueOf(context.parentResourceId) + "&" + ParamConstants.RESOURCE_TYPE_ID_PARAM + "=" - + String.valueOf(context.resourceTypeId); </span><span class="add">+ return ParamConstants.PARENT_RESOURCE_ID_PARAM + "=" + String.valueOf(context.parentResourceId) + "&" + + ParamConstants.RESOURCE_TYPE_ID_PARAM + "=" + String.valueOf(context.resourceTypeId); </span><span class="cx"> default: throw new IllegalArgumentException(context.getUnknownContextMessage()); } </span><span class="lines">@@ -233,7 +234,8 @@ </span><span class="cx"> if (alert.getRecoveryId() != 0) { Integer recoveryAlertId = alert.getRecoveryId(); AlertDefinitionManagerLocal alertDefinitionManagerLocal = LookupUtil.getAlertDefinitionManager(); </span><span class="rem">- AlertDefinition recoveryAlertDefinition = alertDefinitionManagerLocal.getAlertDefinitionById(subject, recoveryAlertId); </span><span class="add">+ AlertDefinition recoveryAlertDefinition = alertDefinitionManagerLocal.getAlertDefinitionById(subject, + recoveryAlertId); </span><span class="cx"> return recoveryAlertDefinition.getName(); } </span> </pre> </div> </div> </body> </html> |