knguyen 2005/05/03 11:58:51 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/data/containers ContainerValidatorBase.java
Log:
- fix problems in getting the languages for a PAGE field.
- Improvement (or bugfix) to allow a combination of standard and "Jahia
multilanguage" checks.
Revision Changes Path
1.1.2.6 +25 -20
jahia/src/java/org/jahia/data/containers/ContainerValidatorBase.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/containers/ContainerValidatorBase.java.diff?r1=1.1.2.5&r2=1.1.2.6&f=h
Index: ContainerValidatorBase.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/data/containers/Attic/ContainerValidatorBase.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ContainerValidatorBase.java 15 Mar 2005 10:57:42 -0000 1.1.2.5
+++ ContainerValidatorBase.java 3 May 2005 09:58:51 -0000 1.1.2.6
@@ -133,15 +133,15 @@
.get(newJf.getDefinition().getName());
field = "";
- if (pageBean != null){
- if ("shared".equals(newJf.getLanguageCode())) {
- if (pageBean.getTitles().size() > 0)
- field = (String)pageBean.getTitles()
- .values().iterator().next();
- } else
- field = pageBean.getTitle(newJf.getLanguageCode());
- } else if (newJf.getObject() != null) {
- field = ((JahiaPage)newJf.getObject()).getTitle();
+ Map titles =
+ (pageBean != null
+ ? pageBean.getTitles()
+ : ((JahiaPage)newJf.getObject())
+ .getContentPage()
+ .getTitles(
+ true));
+ if (titles != null){
+ field = (String)titles.get(languageCode);
}
break;
@@ -230,18 +230,23 @@
JahiaPageEngineTempBean pageBean = (JahiaPageEngineTempBean)
pageBeans.get(newJf.getDefinition().getName());
- String title = "";
- if (pageBean != null){
- if ("shared".equals(newJf.getLanguageCode())) {
- if (pageBean.getTitles().size() > 0)
- title = (String)pageBean.getTitles()
- .values().iterator().next();
- } else
- title = pageBean.getTitle(newJf.getLanguageCode());
- } else if (newJf.getObject() != null) {
- title = ((JahiaPage)newJf.getObject()).getTitle();
+ Map titles =
+ (pageBean != null
+ ? pageBean.getTitles()
+ : ((JahiaPage)newJf.getObject())
+ .getContentPage()
+ .getTitles(
+ true));
+ if (titles != null){
+ for (Iterator titlesIt = titles.entrySet().iterator();
+ titlesIt.hasNext(); ) {
+ Map.Entry entry = (Map.Entry)titlesIt.next();
+
+ field.addMltItem(
+ (String)entry.getKey(),
+ (String)entry.getValue());
+ }
}
- field.addMltItem(newJf.getLanguageCode(), title);
break;
case FieldTypes.BIGTEXT:
