You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by eg...@apache.org on 2003/09/03 14:07:04 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting LanguageExistsAction.java
egli 2003/09/03 05:07:04
Modified: src/java/org/apache/lenya/cms/cocoon/acting
LanguageExistsAction.java
Added: src/java/org/apache/lenya/cms/publication
DocumentDoesNotExistException.java
Log:
If the document does not exist throw a DocumentDoesNotExist
exception instead of just returning null.
Revision Changes Path
1.1 cocoon-lenya/src/java/org/apache/lenya/cms/publication/DocumentDoesNotExistException.java
Index: DocumentDoesNotExistException.java
===================================================================
/*
$Id: DocumentDoesNotExistException.java,v 1.1 2003/09/03 12:07:03 egli Exp $
<License>
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Apache Lenya" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
Michael Wechner <mi...@apache.org>. For more information on the Apache Soft-
ware Foundation, please see <http://www.apache.org/>.
Lenya includes software developed by the Apache Software Foundation, W3C,
DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
</License>
*/
package org.apache.lenya.cms.publication;
/**
*
* @author egli
*
*/
public class DocumentDoesNotExistException extends DocumentException {
/**
* Creates a new DocumentDoesNotExistException
*
*/
public DocumentDoesNotExistException() {
super();
}
/**
* Creates a new DocumentDoesNotExistException
*
* @param message the exception message
*/
public DocumentDoesNotExistException(String message) {
super(message);
}
/**
* Creates a new DocumentDoesNotExistException
*
* @param message the exception message
* @param cause the cause of the exception
*/
public DocumentDoesNotExistException(String message, Throwable cause) {
super(message, cause);
}
/**
* Creates a new DocumentDoesNotExistException
*
* @param cause the cause of the exception
*/
public DocumentDoesNotExistException(Throwable cause) {
super(cause);
}
}
1.2 +14 -8 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/LanguageExistsAction.java
Index: LanguageExistsAction.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/LanguageExistsAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LanguageExistsAction.java 29 Aug 2003 12:29:03 -0000 1.1
+++ LanguageExistsAction.java 3 Sep 2003 12:07:03 -0000 1.2
@@ -60,7 +60,10 @@
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.lenya.cms.publication.Document;
+import org.apache.lenya.cms.publication.DocumentDoesNotExistException;
+import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.PageEnvelope;
+import org.apache.lenya.cms.publication.PageEnvelopeException;
import org.apache.lenya.cms.publication.PageEnvelopeFactory;
import java.util.Arrays;
@@ -92,7 +95,9 @@
* @return an empty <code>Map</code> if there is a version of this
* document for the current language, null otherwiese
*
- * @exception Exception if an error occurs
+ * @exception DocumentDoesNotExistException if there is no document with the specified document-id.
+ * @exception PageEnvelopeException if the PageEnvelope could not be created.
+ * @exception DocumentException if the language information could not be fetched from the document.
*/
public Map act(
Redirector redirector,
@@ -100,7 +105,7 @@
Map objectModel,
String source,
Parameters parameters)
- throws Exception {
+ throws PageEnvelopeException, DocumentDoesNotExistException, DocumentException {
PageEnvelope pageEnvelope =
PageEnvelopeFactory.getInstance().getPageEnvelope(objectModel);
@@ -108,12 +113,13 @@
Document doc = pageEnvelope.getDocument();
String language = doc.getLanguage();
- if (doc.existsInAnyLanguage()) {
- List availableLanguages = Arrays.asList(doc.getLanguages());
+ if (!doc.existsInAnyLanguage()) {
+ throw new DocumentDoesNotExistException("Document " + doc.getId() + " does not exist");
+ }
+ List availableLanguages = Arrays.asList(doc.getLanguages());
- if (availableLanguages.contains(language)) {
- return Collections.unmodifiableMap(Collections.EMPTY_MAP);
- }
+ if (availableLanguages.contains(language)) {
+ return Collections.unmodifiableMap(Collections.EMPTY_MAP);
}
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org