Author: xlawrence
Date: Fri Jan 25 12:05:16 2008
New Revision: 19579
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19579&repname=
=3Djahia
Log:
set up Alias names for container list =
use static variables for alias names
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/AbstractDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/FilesDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/GroupsDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/LastNewsDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/LinksDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/MainContentDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/NewsDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/PagesDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/UsersDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/WebAppsDefaultBox.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/AbstractDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/AbstractDefau=
ltBox.java&rev=3D19579&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/decla=
rations/box/AbstractDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/AbstractDefaultBox.java Fri Jan 25 12:05:16 2008
@@ -39,7 +39,7 @@
org.apache.log4j.Logger.getLogger(AbstractDefaultBox.class);
=
public abstract void declare(final String fullListName,
- final String bundleKey );
+ final String bundleKey);
=
public abstract String getType();
=
@@ -55,7 +55,8 @@
=
protected void checkDeclaration(final String listName,
final String title,
- final Vector children) throws JahiaExc=
eption {
+ final Vector children,
+ final String[] aliasNames) throws Jahi=
aException {
logger.debug("Declaring container list with name " + listName + " =
& title " + title);
final Properties containerDefinitionProperties =3D new Properties(=
);
containerDefinitionProperties.setProperty(DeclareBoxTag.VIEW_JSP_F=
ILE, getView());
@@ -66,7 +67,29 @@
-1,
null,
null,
+ aliasNames,
+ JahiaContainerDefinition.STANDARD_TYPE,
+ containerDefinitionProperties);
+ logger.debug("End declareContainer call with name " + listName);
+ }
+
+ protected void checkDeclaration(final String listName,
+ final String title,
+ final Vector children,
+ final String[] aliasNames,
+ final int windowSize,
+ final int windowOffset) throws JahiaEx=
ception {
+ logger.debug("Declaring container list with name " + listName + " =
& title " + title);
+ final Properties containerDefinitionProperties =3D new Properties(=
);
+ containerDefinitionProperties.setProperty(DeclareBoxTag.VIEW_JSP_F=
ILE, getView());
+ jData.containers().declareContainer(listName,
+ title,
+ children,
+ windowSize,
+ windowOffset,
+ null,
null,
+ aliasNames,
JahiaContainerDefinition.STANDARD_TYPE,
containerDefinitionProperties);
logger.debug("End declareContainer call with name " + listName);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/FilesDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/FilesDefaultB=
ox.java&rev=3D19579&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/decla=
rations/box/FilesDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/FilesDefaultBox.java Fri Jan 25 12:05:16 2008
@@ -30,6 +30,11 @@
=
public static final String VIEW_FILE =3D "common/box/filesBoxDisplay.j=
sp";
public static final String TITLE_KEY =3D "boxContainer.filesContainer";
+ public static final String[] ALIAS_FILE =3D new String[]{"file"};
+ public static final String[] ALIAS_DESCR =3D new String[]{"fileDescrip=
tion"};
+ public static final String[] ALIAS_DISPLAY_DETAILS =3D new String[]{"f=
ileDisplayDetails"};
+ public static final String[] ALIAS_LIST =3D new String[]{"fileList"};
+
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(FilesDefaultBox.class);
@@ -86,19 +91,19 @@
=
children.add("@f boxFile");
jData.containers().declareField(fullListName, "boxFile", resol=
veTitle("File", bundleKey,
- "boxContainer.filesContainer.file"), FieldTypes.FILE, =
null, new String[]{"boxFile"}, 0, true, false);
+ "boxContainer.filesContainer.file"), FieldTypes.FILE, =
null, ALIAS_FILE, 0, true, false);
=
children.add("@f boxFileDesc");
jData.containers().declareField(fullListName, "boxFileDesc", r=
esolveTitle("Description", bundleKey,
- "boxContainer.filesContainer.description"), FieldTypes=
.BIGTEXT, null, new String[]{"boxFileDesc"},
+ "boxContainer.filesContainer.description"), FieldTypes=
.BIGTEXT, null, ALIAS_DESCR,
0, true, false);
=
children.add("@f boxFileDisplayDetails");
jData.containers().declareField(fullListName, "boxFileDisplayD=
etails", resolveTitle("Display Details", bundleKey,
- "boxContainer.filesContainer.displayDetails"), FieldTy=
pes.BOOLEAN, null, new String[]{"boxFileDisplayDetails"},
+ "boxContainer.filesContainer.displayDetails"), FieldTy=
pes.BOOLEAN, null, ALIAS_DISPLAY_DETAILS,
0, true, false);
=
- checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children, ALIAS_LIST);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/GroupsDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/GroupsDefault=
Box.java&rev=3D19579&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/decla=
rations/box/GroupsDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/GroupsDefaultBox.java Fri Jan 25 12:05:16 2008
@@ -30,6 +30,9 @@
=
public static final String VIEW_FILE =3D "common/box/groupsBoxDisplay.=
jsp";
public static final String TITLE_KEY =3D "boxContainer.groupsContainer=
";
+ public static final String[] ALIAS_QUERY =3D new String[]{"groupQuery"=
};
+ public static final String[] ALIAS_DISPLAY_LIMIT =3D new String[]{"gro=
upDisplayLimit"};
+ public static final String[] ALIAS_LIST =3D new String[]{"groupList"};
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(GroupsDefaultBox.class);
@@ -75,15 +78,15 @@
=
children.add("@f boxGroupDisplayLimit");
jData.containers().declareField(fullListName, "boxGroupDisplay=
Limit", resolveTitle("Group Display Limit", bundleKey,
- "boxContainer.groupsContainer.displayLimit"), FieldTyp=
es.SMALLTEXT_SHARED_LANG, "5", new String[]{"boxGroupDisplayLimit"},
+ "boxContainer.groupsContainer.displayLimit"), FieldTyp=
es.SMALLTEXT_SHARED_LANG, "5", ALIAS_DISPLAY_LIMIT,
0, true, false);
=
children.add("@f boxGroupQuery");
jData.containers().declareField(fullListName, "boxGroupQuery",=
resolveTitle("Group Query", bundleKey,
- "boxContainer.groupsContainer.query"), FieldTypes.SMAL=
LTEXT_SHARED_LANG, "*", new String[]{"boxGroupQuery"},
+ "boxContainer.groupsContainer.query"), FieldTypes.SMAL=
LTEXT_SHARED_LANG, "*", ALIAS_QUERY,
0, true, false);
=
- checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children, ALIAS_LIST);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/LastNewsDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/LastNewsDefau=
ltBox.java&rev=3D19579&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/decla=
rations/box/LastNewsDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/LastNewsDefaultBox.java Fri Jan 25 12:05:16 2008
@@ -30,6 +30,8 @@
=
public static final String VIEW_FILE =3D "common/box/lastNewsBoxDispla=
y.jsp";
public static final String TITLE_KEY =3D "boxContainer.lastNewsContain=
er";
+ public static final String[] ALIAS_MAX_NEWS =3D new String[]{"maxNews"=
};
+ public static final String[] ALIAS_LIST =3D new String[]{"maxNewsList"=
};
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(LastNewsDefaultBox.class);
@@ -69,10 +71,10 @@
=
children.add("@f boxMaxNews");
jData.containers().declareField(fullListName, "boxMaxNews", re=
solveTitle("Max News", bundleKey,
- "boxContainer.lastNewsContainer.maxNews"), FieldTypes.=
INTEGER, "10", new String[]{"boxMaxNews"}, =
+ "boxContainer.lastNewsContainer.maxNews"), FieldTypes.=
INTEGER, "10", ALIAS_MAX_NEWS,
0, true, false);
=
- checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children, ALIAS_LIST, 10, -1);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/LinksDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/LinksDefaultB=
ox.java&rev=3D19579&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/decla=
rations/box/LinksDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/LinksDefaultBox.java Fri Jan 25 12:05:16 2008
@@ -30,6 +30,9 @@
=
public static final String VIEW_FILE =3D "common/box/linksBoxDisplay.j=
sp";
public static final String TITLE_KEY =3D "boxContainer.linksContainer";
+ public static final String[] ALIAS_LINK =3D new String[]{"link"};
+ public static final String[] ALIAS_LINK_DESCR =3D new String[]{"linkDe=
scription"};
+ public static final String[] ALIAS_LIST =3D new String[]{"linkList"};
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(LinksDefaultBox.class);
@@ -80,15 +83,15 @@
=
children.add("@f boxLink");
jData.containers().declareField(fullListName, "boxLink", resol=
veTitle("Link", bundleKey,
- "boxContainer.linksContainer.link"), FieldTypes.PAGE, =
"<jahia_linkonly>", new String[]{"boxLink"},
+ "boxContainer.linksContainer.link"), FieldTypes.PAGE, =
"<jahia_linkonly>", ALIAS_LINK,
0, true, false);
=
children.add("@f boxLinkDesc");
jData.containers().declareField(fullListName, "boxLinkDesc", r=
esolveTitle("Description", bundleKey,
- "boxContainer.linksContainer.description"), FieldTypes=
.BIGTEXT, null, new String[]{"boxLinkDesc"},
+ "boxContainer.linksContainer.description"), FieldTypes=
.BIGTEXT, null, ALIAS_LINK_DESCR,
0, true, false);
=
- checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children, ALIAS_LIST);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/MainContentDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/MainContentDe=
faultBox.java&rev=3D19579&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/decla=
rations/box/MainContentDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/MainContentDefaultBox.java Fri Jan 25 12:05:16 2008
@@ -30,6 +30,11 @@
=
public static final String VIEW_FILE =3D "common/box/maincontentsBoxDi=
splay.jsp";
public static final String TITLE_KEY =3D "boxContainer.mainContentsCon=
tainer";
+ public static final String[] ALIAS_TITLE =3D new String[]{"mainContent=
Title"};
+ public static final String[] ALIAS_CONTENT =3D new String[]{"mainConte=
ntContent"};
+ public static final String[] ALIAS_IMAGE =3D new String[]{"mainContent=
Image"};
+ public static final String[] ALIAS_ALIGN =3D new String[]{"mainContent=
Align"};
+ public static final String[] ALIAS_LIST =3D new String[]{"mainContentL=
ist"};
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(MainContentDefaultBox.class);
@@ -83,25 +88,25 @@
=
children.add("@f boxMainContentTitle");
jData.containers().declareField(fullListName, "boxMainContentT=
itle", resolveTitle("Title", bundleKey,
- "boxContainer.mainContentsContainer.title"), FieldType=
s.SMALLTEXT, null, new String[]{"boxMainContentTitle"},
+ "boxContainer.mainContentsContainer.title"), FieldType=
s.SMALLTEXT, null, ALIAS_TITLE,
0, true, false);
=
children.add("@f boxMainContentContent");
jData.containers().declareField(fullListName, "boxMainContentC=
ontent", resolveTitle("Content", bundleKey,
- "boxContainer.mainContentsContainer.content"), FieldTy=
pes.BIGTEXT, null, new String[]{"boxMainContentContent"},
+ "boxContainer.mainContentsContainer.content"), FieldTy=
pes.BIGTEXT, null, ALIAS_CONTENT,
0, true, false);
=
children.add("@f boxMainContentImage");
jData.containers().declareField(fullListName, "boxMainContentI=
mage", resolveTitle("Image", bundleKey,
- "boxContainer.mainContentsContainer.image"), FieldType=
s.FILE, null, new String[]{"boxMainContentImage"},
+ "boxContainer.mainContentsContainer.image"), FieldType=
s.FILE, null, ALIAS_IMAGE,
0, true, false);
=
children.add("@f boxMainContentAlign");
jData.containers().declareField(fullListName, "boxMainContentA=
lign", resolveTitle("Align", bundleKey,
"boxContainer.mainContentsContainer.align"), FieldType=
s.SMALLTEXT_SHARED_LANG,
- "<jahia_multivalue[left:right:default]>left", new Stri=
ng[]{"boxMainContentAlign"}, 0, true, false);
+ "<jahia_multivalue[left:right:default]>left", ALIAS_AL=
IGN, 0, true, false);
=
- checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children, ALIAS_LIST);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/NewsDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/NewsDefaultBo=
x.java&rev=3D19579&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/decla=
rations/box/NewsDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/NewsDefaultBox.java Fri Jan 25 12:05:16 2008
@@ -30,6 +30,11 @@
=
public static final String VIEW_FILE =3D "common/box/newsBoxDisplay.js=
p";
public static final String TITLE_KEY =3D "boxContainer.newsContainer";
+ public static final String[] ALIAS_TITLE =3D new String[]{"newsTitle"};
+ public static final String[] ALIAS_DESCR =3D new String[]{"newsDescrip=
tion"};
+ public static final String[] ALIAS_LINK =3D new String[]{"newsLink"};
+ public static final String[] ALIAS_DATE =3D new String[]{"newsDate"};
+ public static final String[] ALIAS_LIST =3D new String[]{"newsList"};
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(NewsDefaultBox.class);
@@ -77,25 +82,25 @@
=
children.add("@f boxNewsTitle");
jData.containers().declareField(fullListName, "boxNewsTitle", =
resolveTitle("Title", bundleKey,
- "boxContainer.newsContainer.title"), FieldTypes.SMALLT=
EXT, null, new String[]{"boxNewsTitle"},
+ "boxContainer.newsContainer.title"), FieldTypes.SMALLT=
EXT, null, ALIAS_TITLE,
0, true, false);
=
children.add("@f boxNewsDesc");
jData.containers().declareField(fullListName, "boxNewsDesc", r=
esolveTitle("Description", bundleKey,
- "boxContainer.newsContainer.description"), FieldTypes.=
BIGTEXT, null, new String[]{"boxNewsDesc"},
+ "boxContainer.newsContainer.description"), FieldTypes.=
BIGTEXT, null, ALIAS_DESCR,
0, true, false);
=
children.add("@f boxNewsLink");
jData.containers().declareField(fullListName, "boxNewsLink", r=
esolveTitle("Link", bundleKey,
- "boxContainer.newsContainer.link"), FieldTypes.PAGE, "=
<jahia_linkonly>",
- new String[]{"boxNewsLink"}, 0, true, false);
+ "boxContainer.newsContainer.link"), FieldTypes.PAGE, "=
<jahia_linkonly>", ALIAS_LINK,
+ 0, true, false);
=
children.add("@f boxNewsDate");
jData.containers().declareField(fullListName, "boxNewsDate", r=
esolveTitle("Date", bundleKey,
"boxContainer.newsContainer.date"), FieldTypes.DATE, "=
<jahia_calendar[dd.MM.yyyy / hh:mm]>now",
- new String[]{"boxNewsDate"}, 0, true, false);
+ ALIAS_DATE, 0, true, false);
=
- checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children, ALIAS_LIST);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/PagesDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/PagesDefaultB=
ox.java&rev=3D19579&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/decla=
rations/box/PagesDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/PagesDefaultBox.java Fri Jan 25 12:05:16 2008
@@ -30,6 +30,8 @@
=
public static final String VIEW_FILE =3D "common/box/pagesBoxDisplay.j=
sp";
public static final String TITLE_KEY =3D "boxContainer.pagesContainer";
+ public static final String[] ALIAS_PAGE =3D new String[]{"page"};
+ public static final String[] ALIAS_LIST =3D new String[]{"pageList"};
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(PagesDefaultBox.class);
@@ -68,10 +70,10 @@
=
children.add("@f boxPage");
jData.containers().declareField(fullListName, "boxPage", resol=
veTitle("Page", bundleKey,
- "boxContainer.pagesContainer.page"), FieldTypes.PAGE, =
null, new String[]{"boxPage"},
+ "boxContainer.pagesContainer.page"), FieldTypes.PAGE, =
null, ALIAS_PAGE,
0, true, false);
=
- checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children, ALIAS_LIST);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/UsersDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/UsersDefaultB=
ox.java&rev=3D19579&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/decla=
rations/box/UsersDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/UsersDefaultBox.java Fri Jan 25 12:05:16 2008
@@ -30,6 +30,9 @@
=
public static final String VIEW_FILE =3D "common/box/usersBoxDisplay.j=
sp";
public static final String TITLE_KEY =3D "boxContainer.usersContainer";
+ public static final String[] ALIAS_QUERY =3D new String[]{"userQuery"};
+ public static final String[] ALIAS_DISPLAY_LIMIT =3D new String[]{"use=
rDisplayLimit"};
+ public static final String[] ALIAS_LIST =3D new String[]{"userList"};
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(UsersDefaultBox.class);
@@ -74,15 +77,15 @@
=
children.add("@f boxUserDisplayLimit");
jData.containers().declareField(fullListName, "boxUserDisplayL=
imit", resolveTitle("User Display Limit", bundleKey,
- "boxContainer.usersContainer.displayLimit"), FieldType=
s.SMALLTEXT_SHARED_LANG, "5", new String[]{"boxUserDisplayLimit"},
+ "boxContainer.usersContainer.displayLimit"), FieldType=
s.SMALLTEXT_SHARED_LANG, "5", ALIAS_DISPLAY_LIMIT,
0, true, false);
=
children.add("@f boxUserQuery");
jData.containers().declareField(fullListName, "boxUserQuery", =
resolveTitle("User Query", bundleKey,
- "boxContainer.usersContainer.query"), FieldTypes.SMALL=
TEXT_SHARED_LANG, "*", new String[]{"boxUserQuery"},
+ "boxContainer.usersContainer.query"), FieldTypes.SMALL=
TEXT_SHARED_LANG, "*", ALIAS_QUERY,
0, true, false);
=
- checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children, ALIAS_LIST);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/WebAppsDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/WebAppsDefaul=
tBox.java&rev=3D19579&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/decla=
rations/box/WebAppsDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/WebAppsDefaultBox.java Fri Jan 25 12:05:16 2008
@@ -30,6 +30,8 @@
=
public static final String VIEW_FILE =3D "common/box/webappsBoxDisplay=
.jsp";
public static final String TITLE_KEY =3D "boxContainer.webappsContaine=
r";
+ public static final String[] ALIAS_APPLICATION =3D new String[]{"webAp=
p"};
+ public static final String[] ALIAS_LIST =3D new String[]{"webAppList"};
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(WebAppsDefaultBox.class);
@@ -68,10 +70,10 @@
=
children.add("@f boxWebapp");
jData.containers().declareField(fullListName, "boxWebapp", res=
olveTitle("WebApp", bundleKey,
- "boxContainer.webappsContainer.webapp"), FieldTypes.AP=
PLICATION, null, new String[]{"boxWebapp"},
+ "boxContainer.webappsContainer.webapp"), FieldTypes.AP=
PLICATION, null, ALIAS_APPLICATION,
0, true, false);
=
- checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children, ALIAS_LIST);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
