Author: sshyrkov
Date: Fri Nov 9 10:36:19 2007
New Revision: 19092
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19092&repname=
=3Djahia
Log:
[trunk r19044] added maxSize attribute to JahiaContainerList so that we can=
request loading of only the first X filtered/sorted or notcontainers.
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/JahiaContainerList.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/JahiaContainerListPagination.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/conta=
iner/AbsoluteContainerListTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/conta=
iner/ContainerListTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/conta=
iner/RelativeContainerListTag.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/co=
ntainers/JahiaContainerList.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/data/containers/JahiaContainerList.jav=
a&rev=3D19092&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/data/containe=
rs/JahiaContainerList.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/JahiaContainerList.java Fri Nov 9 10:36:19 2007
@@ -58,6 +58,8 @@
private int aclID;
private int fullDataSize =3D 0;
=
+ private int maxSize =3D Integer.MAX_VALUE;
+
private boolean isContainersLoaded =3D false; // by default the contai=
ner list is loaded without its containers.
=
private Properties ctnListProperties =3D new Properties();
@@ -506,6 +508,24 @@
return contentContainerList;
}
=
+ /**
+ * Returns the max size allowed
+ *
+ * @return
+ */
+ public int getMaxSize() {
+ return maxSize;
+ }
+
+ /**
+ * Set the max size allowed
+ * =
+ * @param maxSize
+ */
+ public void setMaxSize(int maxSize) {
+ this.maxSize =3D maxSize;
+ }
+
//--------------------------------------------------------------------=
-----
/**
* Clone
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/co=
ntainers/JahiaContainerListPagination.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/data/containers/JahiaContainerListPagi=
nation.java&rev=3D19092&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/data/containe=
rs/JahiaContainerListPagination.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/JahiaContainerListPagination.java Fri Nov 9 10:36:19 2007
@@ -218,6 +218,9 @@
}
=
this.size =3D theContainerList.getFullSize();
+ if ( this.size> theContainerList.getMaxSize() ){
+ this.size =3D theContainerList.getMaxSize();
+ }
this.windowSize =3D windowSize;
this.windowOffset =3D windowOffset;
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/container/AbsoluteContainerListTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/container/AbsoluteContainerLis=
tTag.java&rev=3D19092&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/conta=
iner/AbsoluteContainerListTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/conta=
iner/AbsoluteContainerListTag.java Fri Nov 9 10:36:19 2007
@@ -149,7 +149,11 @@
if ((this.pageId =3D=3D -1) && (this.pageLevel !=3D -1)) {
this.pageId =3D jData.gui().getLevelID(this.pageLevel);
}
- return jData.containers().getAbsoluteContainerList( listName, this=
.pageId );
+ JahiaContainerList containerList =3D jData.containers().getAbsolut=
eContainerList( listName, this.pageId );
+ if ( containerList !=3D null ){
+ containerList.setMaxSize(this.getMaxSize());
+ }
+ return containerList;
}
=
public int doEndTag() throws JspException {
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/container/ContainerListTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/container/ContainerListTag.jav=
a&rev=3D19092&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/conta=
iner/ContainerListTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/conta=
iner/ContainerListTag.java Fri Nov 9 10:36:19 2007
@@ -86,6 +86,7 @@
// JavaBeans design pattern.
private int intWindowSize =3D -1; // -1 means functionality is deactiv=
ated by default
private int intWindowOffset =3D -1;
+ private int maxSize =3D Integer.MAX_VALUE;
=
private String windowSize;
private String windowOffset;
@@ -270,6 +271,7 @@
// list.
try {
this.containerList =3D getContainerList(jData, getName=
());
+ this.containerList.setMaxSize(maxSize);
if (this.containerList =3D=3D null) {
logger.debug("ContainerList is null: " + getName()=
);
return SKIP_BODY;
@@ -333,6 +335,9 @@
jData.getProcessingContext().getPageID(), parentContain=
er.getID());
}
if ( this.containerList !=3D null ){
+ this.containerList.setMaxSize(maxSize);
+ }
+ if ( this.containerList !=3D null ){
JahiaContainerListPagination pagination =3D this.containerList=
.getCtnListPagination();
if ( (pagination =3D=3D null || !pagination.isValid() || pagin=
ation.getWindowSize()
!=3D this.intWindowSize ) && this.intWindowSize>0 ){
@@ -387,4 +392,18 @@
return EVAL_PAGE;
}
=
+ public int getMaxSize() {
+ return maxSize;
+ }
+
+ /**
+ * @jsp:attribute name=3D"maxSize" required=3D"false" rtexprvalue=3D"t=
rue"
+ * description=3D"The max size.
+ * <p><attriInfo>This attribute can be used to set the maximum size of=
the container list ( the max containers to load ).
+ * The default value is Integer.MAX_VALUE
+ * </attriInfo>"
+ */
+ public void setMaxSize(int maxSize) {
+ this.maxSize =3D maxSize;
+ }
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/container/RelativeContainerListTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/container/RelativeContainerLis=
tTag.java&rev=3D19092&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/conta=
iner/RelativeContainerListTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/conta=
iner/RelativeContainerListTag.java Fri Nov 9 10:36:19 2007
@@ -126,7 +126,11 @@
=
// reads the container list from a container set
protected JahiaContainerList getContainerList( JahiaData jData, String=
listName ) throws JahiaException {
- return jData.containers().getRelativeContainerList(listName, this.=
levelNb);
+ JahiaContainerList containerList =3D jData.containers().getRelativ=
eContainerList(listName, this.levelNb);
+ if ( containerList !=3D null ){
+ containerList.setMaxSize(getMaxSize());
+ }
+ return containerList;
}
=
public int doEndTag() throws JspException {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
