Author: tdraier
Date: Fri Sep 7 15:31:52 2007
New Revision: 18400
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18400&repname=
=3Djahia
Log:
reverted attributes from boolean to string for compatibility
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/usersession/u=
serSettings.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja=
va
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/aes.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/userses=
sion/userSettings.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/ajax/usersession/userSettings.java&rev=3D18=
400&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/usersession/u=
serSettings.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/usersession/u=
serSettings.java Fri Sep 7 15:31:52 2007
@@ -116,12 +116,12 @@
else if (paramName.equalsIgnoreCase("chat")) value =3D Jahia.getSe=
ttings().isChatDisp();
else if (paramName.equalsIgnoreCase("monitor display")) value =3D =
Jahia.getSettings().isPdispDisp();
else if (paramName.equalsIgnoreCase("acl")) value =3D Jahia.getSet=
tings().isAclDisp();
- boolean paramValue =3D getParameter(request, sessionAttributeName,=
String.valueOf(value)).equals("true");
+ String paramValue =3D Boolean.toString(getParameter(request, sessi=
onAttributeName, String.valueOf(value)).equals("true"));
// check if changing some(s) flag(s)
- final Boolean currentSessionAttributeValue =3D (Boolean) session.g=
etAttribute(sessionAttributeName);
- if (currentSessionAttributeValue !=3D null && currentSessionAttrib=
uteValue.booleanValue() !=3D paramValue) {
+ final String currentSessionAttributeValue =3D (String) session.get=
Attribute(sessionAttributeName);
+ if (currentSessionAttributeValue !=3D null && !currentSessionAttri=
buteValue.equals(paramValue)) {
needToPurge =3D true;
- session.setAttribute(sessionAttributeName, Boolean.valueOf(par=
amValue));
+ session.setAttribute(sessionAttributeName, paramValue);
}
logger.debug("found " + paramName + " param: " + paramValue + " ->=
setting the session");
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLTool=
Box.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.java&rev=3D18400&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja=
va (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja=
va Fri Sep 7 15:31:52 2007
@@ -1301,15 +1301,15 @@
Boolean aclDifferenceParam =3D Boolean.valueOf(isDevMode);
if (!Jahia.getSettings().isDevelopmentMode()) {
try {
- displayWorkflowStates =3D (Boolean) therequest.getSession(=
).getAttribute(userSettings.WF_VISU_ENABLED);
+ displayWorkflowStates =3D Boolean.valueOf((String) therequ=
est.getSession().getAttribute(userSettings.WF_VISU_ENABLED));
if (displayWorkflowStates =3D=3D null) {
displayWorkflowStates =3D Boolean.valueOf(Jahia.getSet=
tings().isWflowDisp());
}
- displayTimeBasedPublishing =3D (Boolean) therequest.getSes=
sion().getAttribute(userSettings.TBP_VISU_ENABLED);
+ displayTimeBasedPublishing =3D Boolean.valueOf((String) th=
erequest.getSession().getAttribute(userSettings.TBP_VISU_ENABLED));
if (displayTimeBasedPublishing =3D=3D null) {
displayTimeBasedPublishing =3D Boolean.valueOf(Jahia.g=
etSettings().isTbpDisp());
}
- aclDifferenceParam =3D (Boolean) therequest.getSession().g=
etAttribute(userSettings.ACL_VISU_ENABLED);
+ aclDifferenceParam =3D Boolean.valueOf((String) therequest=
.getSession().getAttribute(userSettings.ACL_VISU_ENABLED));
if (aclDifferenceParam =3D=3D null) {
aclDifferenceParam =3D Boolean.valueOf(Jahia.getSettin=
gs().isAclDisp());
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/aes=
.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/topbar/aes.inc&rev=3D18400&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/aes.inc (=
original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/aes.inc F=
ri Sep 7 15:31:52 2007
@@ -48,29 +48,29 @@
boolean displayACLDifferences =3D settingsBean.isAclDisp();
=
if (session.getAttribute(userSettings.WF_VISU_ENABLED) !=3D null)
- displayWorkFlowStates =3D ((Boolean) session.getAttribute(userSett=
ings.WF_VISU_ENABLED)).booleanValue();
+ displayWorkFlowStates =3D Boolean.parseBoolean((String) session.ge=
tAttribute(userSettings.WF_VISU_ENABLED));
else
- session.setAttribute(userSettings.WF_VISU_ENABLED, Boolean.valueOf=
(displayWorkFlowStates));
+ session.setAttribute(userSettings.WF_VISU_ENABLED, Boolean.toStrin=
g(displayWorkFlowStates));
=
if (session.getAttribute(userSettings.TBP_VISU_ENABLED) !=3D null)
- displayTimeBasedPublishingStates =3D ((Boolean) session.getAttribu=
te(userSettings.TBP_VISU_ENABLED)).booleanValue();
+ displayTimeBasedPublishingStates =3D Boolean.parseBoolean((String)=
session.getAttribute(userSettings.TBP_VISU_ENABLED));
else
- session.setAttribute(userSettings.TBP_VISU_ENABLED, Boolean.valueO=
f(displayTimeBasedPublishingStates));
+ session.setAttribute(userSettings.TBP_VISU_ENABLED, Boolean.toStri=
ng(displayTimeBasedPublishingStates));
=
if (session.getAttribute(userSettings.CHAT_VISU_ENABLED) !=3D null)
- displayChat =3D ((Boolean) session.getAttribute(userSettings.CHAT_=
VISU_ENABLED)).booleanValue();
+ displayChat =3D Boolean.parseBoolean((String) session.getAttribute=
(userSettings.CHAT_VISU_ENABLED));
else
- session.setAttribute(userSettings.CHAT_VISU_ENABLED, Boolean.value=
Of(displayChat));
+ session.setAttribute(userSettings.CHAT_VISU_ENABLED, Boolean.toStr=
ing(displayChat));
=
if (session.getAttribute(userSettings.MONITOR_VISU_ENABLED) !=3D null)
- displayProcessDisplay =3D ((Boolean) session.getAttribute(userSett=
ings.MONITOR_VISU_ENABLED)).booleanValue();
+ displayProcessDisplay =3D Boolean.parseBoolean((String) session.ge=
tAttribute(userSettings.MONITOR_VISU_ENABLED));
else
- session.setAttribute(userSettings.MONITOR_VISU_ENABLED, Boolean.va=
lueOf(displayProcessDisplay));
+ session.setAttribute(userSettings.MONITOR_VISU_ENABLED, Boolean.to=
String(displayProcessDisplay));
=
if (session.getAttribute(userSettings.ACL_VISU_ENABLED) !=3D null)
- displayACLDifferences =3D ((Boolean) session.getAttribute(userSett=
ings.ACL_VISU_ENABLED)).booleanValue();
+ displayACLDifferences =3D Boolean.parseBoolean((String) session.ge=
tAttribute(userSettings.ACL_VISU_ENABLED));
else
- session.setAttribute(userSettings.ACL_VISU_ENABLED, Boolean.valueO=
f(displayACLDifferences));
+ session.setAttribute(userSettings.ACL_VISU_ENABLED, Boolean.toStri=
ng(displayACLDifferences));
=
//template information
String templateName =3D "";
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
