Author: xlawrence
Date: Mon Nov 12 10:19:07 2007
New Revision: 19118
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19118&repname=
=3Djahia
Log:
optimize imports
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/html/menus/NavMenuTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/menus/NavMenuTag.java&rev=
=3D19118&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java Mon Nov 12 10:19:07 2007
@@ -17,20 +17,16 @@
*/
package org.jahia.taglibs.html.menus;
=
+import org.apache.log4j.Logger;
import org.jahia.data.JahiaData;
import org.jahia.data.beans.ContainerBean;
import org.jahia.data.beans.ContainerListBean;
-import org.jahia.data.beans.ContentBean;
import org.jahia.data.beans.RequestBean;
import org.jahia.data.containers.JahiaContainer;
import org.jahia.data.containers.JahiaContainerList;
import org.jahia.exceptions.JahiaException;
import org.jahia.gui.GuiBean;
-import org.jahia.gui.HTMLToolBox;
import org.jahia.params.ProcessingContext;
-import org.jahia.registries.ServicesRegistry;
-import org.jahia.services.acl.JahiaACLManagerService;
-import org.jahia.services.acl.JahiaBaseACL;
import org.jahia.services.pages.JahiaPage;
=
import javax.servlet.ServletRequest;
@@ -111,24 +107,22 @@
=
public class NavMenuTag extends BodyTagSupport {
=
- private static final org.apache.log4j.Logger logger =3D
- org.apache.log4j.Logger.getLogger(org.jahia.taglibs.html.menus=
.NavMenuTag.class);
+ private static final Logger logger =3D Logger.getLogger(NavMenuTag.cla=
ss);
=
- private JahiaData jData =3D null ;
+ private JahiaData jData =3D null;
private String containerListName =3D null;
private String pageFieldName =3D null;
- private int startLevel =3D -1 ;
- private int maxDepth =3D -1 ;
- private int dispNumber =3D -1 ;
- private boolean expandOnlyPageInPath =3D true ;
- private boolean onlyTop =3D false ;
+ private int startLevel =3D -1;
+ private int maxDepth =3D -1;
+ private int dispNumber =3D -1;
+ private boolean expandOnlyPageInPath =3D true;
+ private boolean onlyTop =3D false;
private String bundleKey =3D null;
private String containerListNamePostFix =3D null;
private String containerNamePostFix =3D null;
- private String containerListLabel =3D null ;
- private int reqLevel =3D -1 ;
-
- private boolean editMode ;
+ private String containerListLabel =3D null;
+ private int reqLevel =3D -1;
+ private boolean editMode;
=
public NavMenuTag() {
}
@@ -225,54 +219,50 @@
final RequestBean requestBean =3D (RequestBean) pageContext.findAt=
tribute("currentRequest");
ServletRequest request =3D pageContext.getRequest();
jData =3D (JahiaData) request.getAttribute("org.jahia.data.JahiaDa=
ta");
- editMode =3D requestBean.isEditMode() ;
+ editMode =3D requestBean.isEditMode();
try {
defaultSettings(jData.gui());
getPageSubTree(jData, jData.gui().getLevelID(startLevel), star=
tLevel);
} catch (JahiaException e) {
- e.printStackTrace();
+ logger.error("Exception rendering the menu", e);
} catch (IOException e) {
- e.printStackTrace();
+ logger.error("IOException rendering the menu", e);
}
return EVAL_BODY_BUFFERED;
}
=
private void defaultSettings(GuiBean gui) throws JahiaException {
- reqLevel =3D gui.getLevel() ;
+ reqLevel =3D gui.getLevel();
logger.debug("reqLevel =3D " + reqLevel);
// if the startLevel parameter is not specified, try to find a sim=
ilar
// containerList in the parent page
if (startLevel =3D=3D -1) {
if (reqLevel =3D=3D 1) {
- startLevel =3D reqLevel ;
+ startLevel =3D reqLevel;
} else {
- JahiaContainerList linkContainerList =3D jData.containers(=
).getAbsoluteContainerList(containerListName, jData.gui().getLevelID(reqLev=
el-1)) ;
+ JahiaContainerList linkContainerList =3D jData.containers(=
).getAbsoluteContainerList(containerListName, jData.gui().getLevelID(reqLev=
el - 1));
if (linkContainerList !=3D null) {
- startLevel =3D reqLevel - 1 ;
+ startLevel =3D reqLevel - 1;
} else {
- startLevel =3D reqLevel ;
+ startLevel =3D reqLevel;
}
}
}
- /*if (dispNumber =3D=3D -1)
- dispNumber =3D 1 ;
- if (maxDepth =3D=3D -1)
- maxDepth =3D 1 ;*/
}
=
private void getPageSubTree(JahiaData jData, int pageId, int level) th=
rows JahiaException, IOException {
- if (pageId =3D=3D -1) return ; // TODO handle this case better
+ if (pageId =3D=3D -1) return; // TODO handle this case better
=
JspWriter out =3D pageContext.getOut();
=
- ProcessingContext jParams =3D jData.getProcessingContext() ;
- JahiaContainerList linkContainerList =3D jData.containers().getAbs=
oluteContainerList(containerListName, pageId) ;
- =
+ ProcessingContext jParams =3D jData.getProcessingContext();
+ JahiaContainerList linkContainerList =3D jData.containers().getAbs=
oluteContainerList(containerListName, pageId);
+
Enumeration linkContainerEnum =3D linkContainerList.getContainers(=
);
- boolean begin =3D true ;
+ boolean begin =3D true;
=
// don't display the links if they are supposed to be hidden (live=
mode)
- boolean hide =3D (dispNumber !=3D -1 && level !=3D startLevel && =
level !=3D reqLevel && level + dispNumber < reqLevel && !editMode) ;
+ boolean hide =3D (dispNumber !=3D -1 && level !=3D startLevel && l=
evel !=3D reqLevel && level + dispNumber < reqLevel && !editMode);
=
//
if (maxDepth =3D=3D -1 || level <=3D startLevel + maxDepth) {
@@ -282,34 +272,33 @@
JahiaPage link =3D (JahiaPage) linkContainer.getFieldObjec=
t(pageFieldName);
=
=
-
if (link !=3D null) {
if (!hide) {
if (begin) {
out.println("<ul>");
- begin =3D false ;
+ begin =3D false;
}
String cssClass =3D " class=3D'navmenu_standard'";
if (jData.gui().isPageInPath(link.getID()))
- if (level =3D=3D reqLevel-1) {
- cssClass =3D " class=3D'navmenu_selected'"=
;
+ if (level =3D=3D reqLevel - 1) {
+ cssClass =3D " class=3D'navmenu_selected'";
} else {
- cssClass =3D " class=3D'navmenu_inpath'" ;
+ cssClass =3D " class=3D'navmenu_inpath'";
}
- StringBuffer sbf =3D new StringBuffer() ;
+ StringBuffer sbf =3D new StringBuffer();
sbf.append("<li").append(cssClass).append("><a hre=
f=3D'").append(link.getURL(jParams)).append("'");
sbf.append(" title=3D'").append(link.getTitle()).a=
ppend("' >");
sbf.append("<span>").append(link.getHighLightDiffT=
itle(jParams)).append("</span></a>");
- out.println(sbf.toString()) ;
+ out.println(sbf.toString());
if (editMode) {
- jData.gui().html().drawBeginActionMenu(new Con=
tainerBean(linkContainer,jParams),
- null, null, false, "", bundleKey, null, ou=
t);
+ jData.gui().html().drawBeginActionMenu(new Con=
tainerBean(linkContainer, jParams),
+ null, null, false, "", bundleKey, null=
, out);
}
}
=
// displays sub links
if (!onlyTop && (!expandOnlyPageInPath || jData.gui().=
isPageInPath(link.getID()))) {
- getPageSubTree(jData, link.getID(), level+1);
+ getPageSubTree(jData, link.getID(), level + 1);
}
if (!hide) out.println("</li>");
=
@@ -318,12 +307,12 @@
if (editMode) {
if (begin) {
out.println("<ul>");
- begin =3D false ;
+ begin =3D false;
}
out.println("<li>");
out.print("<a href=3D'' class=3D'link" + level + "=
'>n.d.</a>");
- jData.gui().html().drawBeginActionMenu(new Contain=
erBean(linkContainer,jParams),
- null, null, false, containerNamePostFix, bundl=
eKey, "add.navigationLinks", out);
+ jData.gui().html().drawBeginActionMenu(new Contain=
erBean(linkContainer, jParams),
+ null, null, false, containerNamePostFix, b=
undleKey, "add.navigationLinks", out);
out.println("</li>");
}
}
@@ -335,9 +324,9 @@
out.print(new StringBuffer().append("<ul class=3D'nav").ap=
pend((level =3D=3D 1) ? "2edit" : "3").append("'>").toString());
}
out.print("<li>");
- jData.gui().html().drawBeginActionMenu(new ContainerListBean(l=
inkContainerList,jData.params()),
- null, null, false, containerListNamePostFix, bundleKey, co=
ntainerListLabel, out);
- out.println(new StringBuffer("</li>").append((begin?"</ul>":""=
)).toString());
+ jData.gui().html().drawBeginActionMenu(new ContainerListBean(l=
inkContainerList, jData.params()),
+ null, null, false, containerListNamePostFix, bundleKey=
, containerListLabel, out);
+ out.println(new StringBuffer("</li>").append((begin ? "</ul>" =
: "")).toString());
}
=
if (!begin && !hide) {
@@ -345,19 +334,18 @@
}
=
=
-
}
=
public int doEndTag() throws JspException {
// let's reinitialize the tag variables to allow tag object reuse =
in
// pooling.
- expandOnlyPageInPath =3D true ;
- onlyTop =3D false ;
- reqLevel =3D -1 ;
- startLevel =3D -1 ;
- dispNumber =3D -1 ;
- maxDepth =3D -1 ;
- jData =3D null ;
+ expandOnlyPageInPath =3D true;
+ onlyTop =3D false;
+ reqLevel =3D -1;
+ startLevel =3D -1;
+ dispNumber =3D -1;
+ maxDepth =3D -1;
+ jData =3D null;
containerListName =3D null;
pageFieldName =3D null;
bundleKey =3D null;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
