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 2003/07/01 11:57:17 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/publication Publication.java DefaultDocument.java
andreas 2003/07/01 02:57:17
Modified: src/java/org/apache/lenya/cms/publication Publication.java
DefaultDocument.java
Log:
added info area to valid areas
Revision Changes Path
1.10 +15 -0 cocoon-lenya/src/java/org/apache/lenya/cms/publication/Publication.java
Index: Publication.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/publication/Publication.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Publication.java 30 Jun 2003 11:52:11 -0000 1.9
+++ Publication.java 1 Jul 2003 09:57:16 -0000 1.10
@@ -58,6 +58,7 @@
import org.apache.lenya.cms.publishing.PublishingEnvironment;
import java.io.File;
+import java.util.Arrays;
/**
@@ -68,6 +69,11 @@
public class Publication {
public static final String AUTHORING_AREA = "authoring";
public static final String LIVE_AREA = "live";
+ public static final String INFO_AREA = "info";
+
+ private final static String[] areas = {
+ AUTHORING_AREA, LIVE_AREA, INFO_AREA
+ };
/** Creates a new instance of Publication */
protected Publication(String id, String servletContextPath) {
@@ -144,5 +150,14 @@
*/
public DocumentIdToPathMapper getPathMapper() {
return mapper;
+ }
+
+ /**
+ * Returns if a given string is a valid area name.
+ * @param area The area string to test.
+ * @return A boolean value.
+ */
+ public static boolean isValidArea(String area) {
+ return area != null && Arrays.asList(areas).contains(area);
}
}
1.8 +1 -2 cocoon-lenya/src/java/org/apache/lenya/cms/publication/DefaultDocument.java
Index: DefaultDocument.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/publication/DefaultDocument.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultDocument.java 30 Jun 2003 11:52:11 -0000 1.7
+++ DefaultDocument.java 1 Jul 2003 09:57:16 -0000 1.8
@@ -165,8 +165,7 @@
* @param area A string.
*/
protected void setArea(String area) {
- assert (area != null) &&
- (area.equals(Publication.AUTHORING_AREA) || area.equals(Publication.LIVE_AREA));
+ assert Publication.isValidArea(area);
this.area = area;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org