Author: adrianc
Date: Thu Aug 22 18:19:56 2013
New Revision: 1516530
URL: http://svn.apache.org/r1516530
Log:
Removed unused and nonsensical method from MenuStringRenderer.java. The
MenuStringRenderer instance lifecycle is a single request, so it is unlikely
the user login will change in the middle of a request.
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuStringRenderer.java
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java?rev=1516530&r1=1516529&r2=1516530&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
Thu Aug 22 18:19:56 2013
@@ -51,7 +51,6 @@ public class HtmlMenuRenderer extends Ht
HttpServletRequest request;
HttpServletResponse response;
protected String userLoginIdAtPermGrant;
- protected boolean userLoginIdHasChanged = true;
protected String permissionErrorMessage = "";
public static final String module = HtmlMenuRenderer.class.getName();
@@ -234,10 +233,6 @@ public class HtmlMenuRenderer extends Ht
*/
public void renderMenuOpen(Appendable writer, Map<String, Object> context,
ModelMenu modelMenu) throws IOException {
- if (!userLoginIdHasChanged) {
- userLoginIdHasChanged = userLoginIdHasChanged();
- }
-
//Debug.logInfo("in HtmlMenuRenderer, userLoginIdHasChanged:" +
userLoginIdHasChanged,"");
this.widgetCommentsEnabled =
ModelWidget.widgetBoundaryCommentsEnabled(context);
renderBeginningBoundaryComment(writer, "Menu Widget", modelMenu);
@@ -298,7 +293,6 @@ public class HtmlMenuRenderer extends Ht
appendWhitespace(writer);
renderEndingBoundaryComment(writer, "Menu Widget", modelMenu);
- userLoginIdHasChanged = userLoginIdHasChanged();
GenericValue userLogin =
(GenericValue)request.getSession().getAttribute("userLogin");
if (userLogin != null) {
String userLoginId = userLogin.getString("userLoginId");
@@ -374,12 +368,6 @@ public class HtmlMenuRenderer extends Ht
return hasChanged;
}
-
- public void setUserLoginIdHasChanged(boolean b) {
- userLoginIdHasChanged = b;
- }
-
-
public String getTitle(ModelMenuItem menuItem, Map<String, Object>
context) {
String title = null;
title = menuItem.getTitle(context);
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuStringRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuStringRenderer.java?rev=1516530&r1=1516529&r2=1516530&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuStringRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuStringRenderer.java
Thu Aug 22 18:19:56 2013
@@ -32,7 +32,6 @@ public interface MenuStringRenderer {
public void renderFormatSimpleWrapperOpen(Appendable writer, Map<String,
Object> context, ModelMenu menu) throws IOException ;
public void renderFormatSimpleWrapperClose(Appendable writer, Map<String,
Object> context, ModelMenu menu) throws IOException ;
public void renderFormatSimpleWrapperRows(Appendable writer, Map<String,
Object> context, Object menu) throws IOException ;
- public void setUserLoginIdHasChanged(boolean b) throws IOException ;
public void renderLink(Appendable writer, Map<String, Object> context,
ModelMenuItem.Link link) throws IOException ;
public void renderImage(Appendable writer, Map<String, Object> context,
ModelMenuItem.Image image) throws IOException ;
}