You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/01/10 14:11:01 UTC
svn commit: r494806 -
/lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java
Author: andreas
Date: Wed Jan 10 05:11:01 2007
New Revision: 494806
URL: http://svn.apache.org/viewvc?view=rev&rev=494806
Log:
Use direct methods instead of SiteUtil convenience methods
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java?view=diff&rev=494806&r1=494805&r2=494806
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java Wed Jan 10 05:11:01 2007
@@ -29,6 +29,7 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.lenya.cms.publication.Document;
+import org.apache.lenya.cms.publication.DocumentBuildException;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.publication.DocumentLocator;
import org.apache.lenya.cms.publication.DocumentUtil;
@@ -36,8 +37,6 @@
import org.apache.lenya.cms.publication.PublicationUtil;
import org.apache.lenya.cms.repository.RepositoryUtil;
import org.apache.lenya.cms.repository.Session;
-import org.apache.lenya.cms.site.SiteException;
-import org.apache.lenya.cms.site.SiteUtil;
import org.apache.lenya.util.ServletHelper;
/**
@@ -80,13 +79,11 @@
* @throws ProcessingException if an error occurs.
*/
public String getLanguage() throws ProcessingException {
- DocumentLocator locator;
try {
- locator = SiteUtil.getLocator(this.manager, this.factory, url);
- } catch (SiteException e) {
+ return getLocator().getLanguage();
+ } catch (DocumentBuildException e) {
throw new ProcessingException(e);
}
- return locator.getLanguage();
}
/**
@@ -98,8 +95,7 @@
List availableLanguages = new ArrayList();
try {
- DocumentLocator locator = SiteUtil.getLocator(this.manager, this.factory, url);
-
+ DocumentLocator locator = getLocator();
String[] languages = pub.getLanguages();
for (int i = 0; i < languages.length; i++) {
DocumentLocator version = locator.getLanguageVersion(languages[i]);
@@ -135,12 +131,17 @@
protected Document getDocument(String language) throws ProcessingException {
Document document;
try {
- DocumentLocator locator = SiteUtil.getLocator(this.manager, this.factory, url);
+ DocumentLocator locator = getLocator();
DocumentLocator version = locator.getLanguageVersion(language);
document = this.factory.get(version);
} catch (Exception e) {
throw new ProcessingException(e);
}
return document;
+ }
+
+ protected DocumentLocator getLocator() throws DocumentBuildException {
+ DocumentLocator locator = this.pub.getDocumentBuilder().getLocator(this.factory, this.url);
+ return locator;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org