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/09/02 15:15:54 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/components/modules/input PageEnvelopeModule.java
andreas 2003/09/02 06:15:54
Modified: src/java/org/apache/lenya/cms/cocoon/components/modules/input
PageEnvelopeModule.java
Log:
re-formatting
Revision Changes Path
1.25 +13 -25 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
Index: PageEnvelopeModule.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- PageEnvelopeModule.java 21 Aug 2003 14:03:19 -0000 1.24
+++ PageEnvelopeModule.java 2 Sep 2003 13:15:54 -0000 1.25
@@ -84,29 +84,22 @@
*
* @throws ConfigurationException if the page envelope could not be instantiated.
*/
- protected PageEnvelope getEnvelope(Map objectModel)
- throws ConfigurationException {
+ protected PageEnvelope getEnvelope(Map objectModel) throws ConfigurationException {
PageEnvelope envelope = null;
try {
- envelope =
- PageEnvelopeFactory.getInstance().getPageEnvelope(objectModel);
+ envelope = PageEnvelopeFactory.getInstance().getPageEnvelope(objectModel);
} catch (Exception e) {
- throw new ConfigurationException(
- "Resolving page envelope failed: ",
- e);
+ throw new ConfigurationException("Resolving page envelope failed: ", e);
}
return envelope;
}
- /** (non-Javadoc)
+ /**
* @see org.apache.cocoon.components.modules.input.InputModule#getAttribute(java.lang.String, org.apache.avalon.framework.configuration.Configuration, java.util.Map)
*/
- public Object getAttribute(
- String name,
- Configuration modeConf,
- Map objectModel)
+ public Object getAttribute(String name, Configuration modeConf, Map objectModel)
throws ConfigurationException {
PageEnvelope envelope = getEnvelope(objectModel);
Object value = null;
@@ -134,12 +127,12 @@
value = envelope.getDocument().getFile();
} else if (name.equals(PageEnvelope.DOCUMENT_EXTENSION)) {
value = envelope.getDocument().getExtension();
- } else if (name.equals(PageEnvelope.DEFAULT_LANGUAGE)) {
- value = envelope.getPublication().getDefaultLanguage();
+ } else if (name.equals(PageEnvelope.DEFAULT_LANGUAGE)) {
+ value = envelope.getPublication().getDefaultLanguage();
} else if (name.equals(PageEnvelope.DOCUMENT_LANGUAGE)) {
value = envelope.getDocument().getLanguage();
- } else if (name.equals(PageEnvelope.DOCUMENT_LANGUAGES)) {
- value = envelope.getDocument().getLanguages();
+ } else if (name.equals(PageEnvelope.DOCUMENT_LANGUAGES)) {
+ value = envelope.getDocument().getLanguages();
} else if (name.equals(PageEnvelope.DOCUMENT_LANGUAGES_CSV)) {
String[] languages = envelope.getDocument().getLanguages();
String csv = "";
@@ -166,8 +159,8 @@
value = envelope.getDocument().getDublinCore().getDateCreated();
} else if (name.equals(PageEnvelope.DOCUMENT_LASTMODIFIED)) {
value = envelope.getDocument().getLastModified();
- } else if (name.equals(PageEnvelope.BREADCRUMB_PREFIX)) {
- value = envelope.getPublication().getBreadcrumbPrefix();
+ } else if (name.equals(PageEnvelope.BREADCRUMB_PREFIX)) {
+ value = envelope.getPublication().getBreadcrumbPrefix();
}
} catch (Exception e) {
throw new ConfigurationException(
@@ -178,7 +171,6 @@
}
/**
- * (non-Javadoc)
* @see org.apache.cocoon.components.modules.input.InputModule#getAttributeNames(org.apache.avalon.framework.configuration.Configuration, java.util.Map)
*/
public Iterator getAttributeNames(Configuration modeConf, Map objectModel)
@@ -187,13 +179,9 @@
}
/**
- * (non-Javadoc)
* @see org.apache.cocoon.components.modules.input.InputModule#getAttributeValues(java.lang.String, org.apache.avalon.framework.configuration.Configuration, java.util.Map)
*/
- public Object[] getAttributeValues(
- String name,
- Configuration modeConf,
- Map objectModel)
+ public Object[] getAttributeValues(String name, Configuration modeConf, Map objectModel)
throws ConfigurationException {
Object[] objects = { getAttribute(name, modeConf, objectModel)};
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org