cziegeler 2002/06/06 07:28:15
Modified:
src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements
EPStyleRegion.java EPStyles.java Sheet.java
src/java/org/apache/cocoon/components/source
DelayedRefreshSourceWrapper.java SourceFactory.java
URLSource.java
src/java/org/apache/cocoon/components/treeprocessor
AbstractParentProcessingNode.java
src/java/org/apache/cocoon/components/treeprocessor/sitemap
SitemapLanguage.java
src/java/org/apache/cocoon/environment Session.java
src/java/org/apache/cocoon/environment/http HttpSession.java
src/java/org/apache/cocoon/matching HeaderMatcher.java
ParameterMatcher.java RequestAttributeMatcher.java
RequestParameterMatcher.java
SessionAttributeMatcher.java
src/java/org/apache/cocoon/matching/helpers
WildcardHelper.java
src/java/org/apache/cocoon/servlet CocoonServlet.java
src/java/org/apache/cocoon/transformation
AbstractDOMTransformer.java
src/java/org/apache/cocoon/webapps/session/components
SessionManager.java
Log:
Fixing some javadocs
Revision Changes Path
1.2 +17 -17
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyleRegion.java
Index: EPStyleRegion.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyleRegion.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EPStyleRegion.java 6 Mar 2002 16:58:02 -0000 1.1
+++ EPStyleRegion.java 6 Jun 2002 14:28:13 -0000 1.2
@@ -89,18 +89,18 @@
private NumericResult _start_row;
private NumericResult _end_col;
private NumericResult _end_row;
-
+
private HSSFCellStyle _style;
private Hashtable colorhash;
-
+
private boolean invalid;
-
+
//kludge constant to fix gnumeric's love of declaring large stlye regions
//for the blank sections of the sheet w/no apparent purpose that we can
//
private int MAX_AREA = 2001;
-
+
/**
* constructor
*/
@@ -113,7 +113,7 @@
_end_col = null;
_end_row = null;
}
-
+
/**
* Override of Initialize() implementation
*
@@ -130,16 +130,16 @@
throws IOException
{
super.initialize(attributes, parent);
-
+
Region region = new Region(getStartRow(),
(short)getStartCol(),
- getEndRow(),
+ getEndRow(),
(short)getEndCol());
-
+
// if (region.getRowFrom() == 0 &&
// region.getColumnFrom() ==0)
// getLogger().debug("got 0,0");
-
+
getLogger().debug("region area is "+region.getArea());
if(region.getArea() < MAX_AREA) { //protect against stupid mega regions
//of generally NOTHING and no real
@@ -150,10 +150,10 @@
} else {
invalid = true;
}
-
+
colorhash = ((EPStyles)parent).getColorHash();
- }
-
+ }
+
/**
* @return start row
@@ -224,18 +224,18 @@
}
return _end_col.intValue();
}
-
+
/**
- * @returns HSSFCellStyle associated with this style region.
+ * @return HSSFCellStyle associated with this style region.
*/
public HSSFCellStyle getStyle() {
return _style;
}
-
+
/**
* @return instance created in the EPStyles instance from
HSSFColor.getTripletHash();
* @see org.apache.poi.hssf.util.HSSFColor#getTripletHash()
- */
+ */
public Hashtable getColorHash() {
return colorhash;
}
@@ -248,5 +248,5 @@
public boolean isValid () {
return (!invalid);
}
-
+
} // end public class EPStyleRegion
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyles.java
Index: EPStyles.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyles.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EPStyles.java 6 Mar 2002 16:58:02 -0000 1.1
+++ EPStyles.java 6 Jun 2002 14:28:13 -0000 1.2
@@ -80,9 +80,9 @@
super(null);
colors = HSSFColor.getTripletHash();
}
-
+
/**
- * @returns an instance of Hashtable created by HSSFColor.getTripletHash()
+ * @return an instance of Hashtable created by HSSFColor.getTripletHash()
* @see org.apache.poi.hssf.util.HSSFColor#getTripletHash()
*/
public Hashtable getColorHash() {
1.2 +52 -52
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java
Index: Sheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Sheet.java 6 Mar 2002 16:58:02 -0000 1.1
+++ Sheet.java 6 Jun 2002 14:28:13 -0000 1.2
@@ -81,7 +81,7 @@
*/
// package scope
-class Sheet extends AbstractLoggable
+class Sheet extends AbstractLoggable
{
private HSSFSheet _sheet;
private String _name;
@@ -90,16 +90,16 @@
// keys are Shorts (row numbers), values are Row instances
private Map _rows;
-
+
private Map regions;
-
+
//optimization constant
private final static int ROWS_CAPACITY = 200;
-
+
//optimization constant
private final static int REGION_CAPACITY = 20;
-
+
private final static int DEBUG=0;
/**
@@ -278,8 +278,8 @@
return rval;
}
-/* void addStyleRegion(Region region,
- short halign,
+/* void addStyleRegion(Region region,
+ short halign,
short valign,
boolean wrap,
boolean locked,
@@ -287,41 +287,41 @@
short fontcolor,
short fontheight,
String fontname) {
-
- HSSFCellStyle style = _workbook.createStyle(halign,
- valign,
- wrap,
- locked,
- hidden,
- fontcolor,
- fontheight,
+
+ HSSFCellStyle style = _workbook.createStyle(halign,
+ valign,
+ wrap,
+ locked,
+ hidden,
+ fontcolor,
+ fontheight,
fontname);
regions.put(region, style);
-
-
+
+
}*/
-
+
HSSFCellStyle addStyleRegion(Region region) {
-
+
HSSFCellStyle style = _workbook.createStyle();
/*
getLogger().debug("region = "+ region.getRowFrom() +
","+region.getColumnFrom()+
","+region.getRowTo()+","+region.getColumnTo());
*/
regions.put(region, style);
-
+
return style;
- }
-
+ }
+
/**
* returns the HSSFCellStyle for a cell if defined by region
* if there is not a definition it returns null. If you don't
* expect that then your code dies a horrible death.
- * @returns HSSFCellStyle
+ * @return HSSFCellStyle
*/
HSSFCellStyle getCellStyleForRegion(short row, short col) {
- Iterator iregions = regions.keySet().iterator();
-
+ Iterator iregions = regions.keySet().iterator();
+
while (iregions.hasNext()) {
Region region = ((Region) iregions.next());
// if (col == 1)
@@ -334,8 +334,8 @@
//getLogger().debug("returning null for "+row+","+col);
return null;
}
-
-
+
+
private Row createRow(final short rowNo)
{
return new Row(_sheet.createRow(rowNo), this);
@@ -357,77 +357,77 @@
&& (characters <= ((Short.MAX_VALUE + 0.5) / 256)));
}
-
+
/**
* assigns blank cells to regions where no cell is currently allocated.
- * Meaning if there is a sheet with a cell defined at 1,1 and a style region
+ * Meaning if there is a sheet with a cell defined at 1,1 and a style region
* from 0,0-1,1 then cells 0,0;0,1;1,0 will be defined as blank cells pointing
* to the style defined by the style region. If there is not a defined cell
* and no styleregion encompases the area, then no cell is defined.
*/
public void assignBlanksToRegions () {
Iterator iregions = regions.keySet().iterator();
-
-
-
+
+
+
while (iregions.hasNext()) {
Region region = ((Region) iregions.next());
//getLogger().debug("fixing region
"+region.getRowFrom()+","+region.getColumnFrom()+"-"+
// region.getRowTo()+","+region.getColumnTo());
-
+
for (int rownum = region.getRowFrom(); rownum < region.getRowTo() +1;
rownum++) {
-
+
HSSFRow row = _sheet.getRow(rownum);
-
+
for (short colnum = region.getColumnFrom(); colnum <
region.getColumnTo()+1; colnum ++) {
-
+
HSSFCellStyle style = (HSSFCellStyle)regions.get(region);
-
+
if (!isBlank(style)) { //don't waste time with huge blocks of
blankly
//styled cells
-
+
if (row == null) {
- if (rownum > Short.MAX_VALUE)
+ if (rownum > Short.MAX_VALUE)
{ rownum = Short.MAX_VALUE; }
row = _sheet.createRow((short)rownum);
}
HSSFCell cell = row.getCell(colnum);
-
+
if (cell == null) {
//getLogger().debug("creating blank cell at "+rownum +
"," +colnum);
cell = row.createCell(colnum,HSSFCell.CELL_TYPE_BLANK);
- cell.setCellStyle((HSSFCellStyle)regions.get(region));
+ cell.setCellStyle((HSSFCellStyle)regions.get(region));
}
}
-
+
}
}
}
- }
-
-
+ }
+
+
private boolean isBlank(HSSFCellStyle style) {
-
+
HSSFFont font = null;
if (style.getFontIndex() >0)
font =
((HSSFFont)_workbook.getWorkbook().getFontAt(style.getFontIndex()));
-
+
if (style.getBorderBottom() == 0 &&
style.getBorderTop() == 0 &&
style.getBorderRight() == 0 &&
- style.getBorderLeft() == 0 &&
+ style.getBorderLeft() == 0 &&
style.getFillBackgroundColor() == HSSFColor.WHITE.index &&
style.getFillPattern() == 0 &&
- (style.getFontIndex() == 0 ||
- ((font.getFontName().equals("Arial") ||
+ (style.getFontIndex() == 0 ||
+ ((font.getFontName().equals("Arial") ||
font.getFontName().equals("Helvetica")) &&
font.getFontHeightInPoints() > 8 && font.getFontHeightInPoints() <
12)
)) return true;
-
+
return false;
}
-
+
} // end package scope class Sheet
1.6 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/source/DelayedRefreshSourceWrapper.java
Index: DelayedRefreshSourceWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/DelayedRefreshSourceWrapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DelayedRefreshSourceWrapper.java 4 Jun 2002 09:27:20 -0000 1.5
+++ DelayedRefreshSourceWrapper.java 6 Jun 2002 14:28:13 -0000 1.6
@@ -65,9 +65,9 @@
* A wrapper around a <code>Source</code> that reduces the number of calls to
* <code>Source.getLastModified()</code> which can be a costly operation.
*
- * @deprecarted by the Avalon Exalibur Source Resolving
+ * @deprecated by the Avalon Exalibur Source Resolving
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version $Id: DelayedRefreshSourceWrapper.java,v 1.5 2002/06/04 09:27:20
cziegeler Exp $
+ * @version $Id: DelayedRefreshSourceWrapper.java,v 1.6 2002/06/06 14:28:13
cziegeler Exp $
*/
public final class DelayedRefreshSourceWrapper implements Source, ModifiableSource,
XMLizable {
1.5 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceFactory.java
Index: SourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SourceFactory.java 4 Jun 2002 09:27:20 -0000 1.4
+++ SourceFactory.java 6 Jun 2002 14:28:14 -0000 1.5
@@ -60,9 +60,9 @@
import java.net.URL;
/**
- * @deprecarted by the Avalon Exalibur Source Resolving
+ * @deprecated by the Avalon Exalibur Source Resolving
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version $Id: SourceFactory.java,v 1.4 2002/06/04 09:27:20 cziegeler Exp $
+ * @version $Id: SourceFactory.java,v 1.5 2002/06/06 14:28:14 cziegeler Exp $
*/
public interface SourceFactory extends ThreadSafe {
1.19 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/source/URLSource.java
Index: URLSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/URLSource.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- URLSource.java 4 Jun 2002 09:27:21 -0000 1.18
+++ URLSource.java 6 Jun 2002 14:28:14 -0000 1.19
@@ -74,9 +74,9 @@
/**
* Description of a source which is described by an URL.
*
- * @deprecarted by the Avalon Exalibur Source Resolving
+ * @deprecated by the Avalon Exalibur Source Resolving
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: URLSource.java,v 1.18 2002/06/04 09:27:21 cziegeler Exp $
+ * @version CVS $Id: URLSource.java,v 1.19 2002/06/06 14:28:14 cziegeler Exp $
*/
public class URLSource extends AbstractStreamSource {
1.4 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java
Index: AbstractParentProcessingNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractParentProcessingNode.java 29 Apr 2002 14:46:16 -0000 1.3
+++ AbstractParentProcessingNode.java 6 Jun 2002 14:28:14 -0000 1.4
@@ -58,7 +58,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: AbstractParentProcessingNode.java,v 1.3 2002/04/29 14:46:16
cziegeler Exp $
+ * @version CVS $Id: AbstractParentProcessingNode.java,v 1.4 2002/06/06 14:28:14
cziegeler Exp $
*/
public abstract class AbstractParentProcessingNode extends AbstractProcessingNode {
@@ -66,7 +66,7 @@
/**
* Invoke all nodes of a node array in order, until one succeeds.
*
- * @parameter currentMap the <code>Map<code> of parameters produced by this
node,
+ * @param currentMap the <code>Map<code> of parameters produced by this node,
* which is added to <code>listOfMap</code>.
*/
protected final boolean invokeNodes(
1.7 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
Index: SitemapLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SitemapLanguage.java 29 Apr 2002 08:07:36 -0000 1.6
+++ SitemapLanguage.java 6 Jun 2002 14:28:14 -0000 1.7
@@ -82,7 +82,7 @@
* The tree builder for the sitemap language.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: SitemapLanguage.java,v 1.6 2002/04/29 08:07:36 cziegeler Exp $
+ * @version CVS $Id: SitemapLanguage.java,v 1.7 2002/06/06 14:28:14 cziegeler Exp $
*/
public class SitemapLanguage extends DefaultTreeBuilder {
@@ -201,8 +201,8 @@
* Add a view for a label. This is used to register all views that start from
* a given label.
*
- * @parameter label the label (or pseudo-label) for the view
- * @parameter view the view name
+ * @param label the label (or pseudo-label) for the view
+ * @param view the view name
*/
public void addViewForLabel(String label, String view) {
getLogger().debug("views:addViewForLabel(" + label + ", " + view + ")");
1.5 +3 -3 xml-cocoon2/src/java/org/apache/cocoon/environment/Session.java
Index: Session.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/Session.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Session.java 22 Feb 2002 07:03:49 -0000 1.4
+++ Session.java 6 Jun 2002 14:28:14 -0000 1.5
@@ -77,7 +77,7 @@
* will not be directly visible in another.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: Session.java,v 1.4 2002/02/22 07:03:49 cziegeler Exp $
+ * @version CVS $Id: Session.java,v 1.5 2002/06/06 14:28:14 cziegeler Exp $
*
*/
@@ -108,7 +108,7 @@
* @return a string specifying the identifier
* assigned to this session
*
- * @exeption IllegalStateException if this method is called on an
+ * @exception IllegalStateException if this method is called on an
* invalidated session
*
*/
@@ -130,7 +130,7 @@
* with this session, expressed in
* milliseconds since 1/1/1970 GMT
*
- * @exeption IllegalStateException if this method is called on an
+ * @exception IllegalStateException if this method is called on an
* invalidated session
*
*/
1.5 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpSession.java
Index: HttpSession.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpSession.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HttpSession.java 22 Feb 2002 07:03:50 -0000 1.4
+++ HttpSession.java 6 Jun 2002 14:28:14 -0000 1.5
@@ -79,7 +79,7 @@
* will not be directly visible in another.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: HttpSession.java,v 1.4 2002/02/22 07:03:50 cziegeler Exp $
+ * @version CVS $Id: HttpSession.java,v 1.5 2002/06/06 14:28:14 cziegeler Exp $
*
*/
@@ -122,7 +122,7 @@
* @return a string specifying the identifier
* assigned to this session
*
- * @exeption IllegalStateException if this method is called on an
+ * @exception IllegalStateException if this method is called on an
* invalidated session
*
*/
@@ -146,7 +146,7 @@
* with this session, expressed in
* milliseconds since 1/1/1970 GMT
*
- * @exeption IllegalStateException if this method is called on an
+ * @exception IllegalStateException if this method is called on an
* invalidated session
*
*/
1.2 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/matching/HeaderMatcher.java
Index: HeaderMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/HeaderMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HeaderMatcher.java 3 Mar 2002 01:03:48 -0000 1.1
+++ HeaderMatcher.java 6 Jun 2002 14:28:14 -0000 1.2
@@ -60,7 +60,7 @@
/**
* This class allows for matching based on a request header.
- * If the specified request header parameter exists, its value is
+ * If the specified request header parameter exists, its value is
* retrieved for later xpath substitution.
*
* <p><b>Example:</b></p>
@@ -71,7 +71,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: HeaderMatcher.java,v 1.1 2002/03/03 01:03:48 vgritsenko Exp $
+ * @version CVS $Id: HeaderMatcher.java,v 1.2 2002/06/06 14:28:14 cziegeler Exp $
*/
public class HeaderMatcher implements Matcher, ThreadSafe
{
@@ -82,7 +82,7 @@
*
* @param pattern name of request header to find
* @param objectModel environment passed through via cocoon
- * @returns null or map containing value of request header 'pattern'
+ * @return null or map containing value of request header 'pattern'
*/
public Map match(String pattern, Map objectModel, Parameters parameters) {
Request request = ObjectModelHelper.getRequest(objectModel);
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/matching/ParameterMatcher.java
Index: ParameterMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/ParameterMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParameterMatcher.java 3 Mar 2002 01:03:48 -0000 1.1
+++ ParameterMatcher.java 6 Jun 2002 14:28:14 -0000 1.2
@@ -71,7 +71,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: ParameterMatcher.java,v 1.1 2002/03/03 01:03:48 vgritsenko Exp
$
+ * @version CVS $Id: ParameterMatcher.java,v 1.2 2002/06/06 14:28:14 cziegeler Exp $
*/
public class ParameterMatcher implements Matcher, ThreadSafe
{
@@ -82,7 +82,7 @@
*
* @param pattern name of sitemap parameter to find
* @param objectModel environment passed through via cocoon
- * @returns null or map containing value of sitemap parameter 'pattern'
+ * @return null or map containing value of sitemap parameter 'pattern'
*/
public Map match(String pattern, Map objectModel, Parameters parameters) {
1.5 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/matching/RequestAttributeMatcher.java
Index: RequestAttributeMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/RequestAttributeMatcher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestAttributeMatcher.java 22 Feb 2002 07:03:52 -0000 1.4
+++ RequestAttributeMatcher.java 6 Jun 2002 14:28:14 -0000 1.5
@@ -70,7 +70,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: RequestAttributeMatcher.java,v 1.4 2002/02/22 07:03:52
cziegeler Exp $
+ * @version CVS $Id: RequestAttributeMatcher.java,v 1.5 2002/06/06 14:28:14
cziegeler Exp $
*/
public class RequestAttributeMatcher implements Matcher, ThreadSafe
{
@@ -81,7 +81,7 @@
*
* @param pattern name of request attribute to find
* @param objectModel environment passed through via cocoon
- * @returns null or map containing value of request attribute 'pattern'
+ * @return null or map containing value of request attribute 'pattern'
*/
public Map match(String pattern, Map objectModel, Parameters parameters) {
1.6 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/matching/RequestParameterMatcher.java
Index: RequestParameterMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/RequestParameterMatcher.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RequestParameterMatcher.java 22 Feb 2002 07:03:52 -0000 1.5
+++ RequestParameterMatcher.java 6 Jun 2002 14:28:14 -0000 1.6
@@ -72,7 +72,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Marcus Crafter</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: RequestParameterMatcher.java,v 1.5 2002/02/22 07:03:52
cziegeler Exp $
+ * @version CVS $Id: RequestParameterMatcher.java,v 1.6 2002/06/06 14:28:14
cziegeler Exp $
*/
public class RequestParameterMatcher implements Matcher, ThreadSafe
{
@@ -83,7 +83,7 @@
*
* @param pattern name of request parameter to find
* @param objectModel environment passed through via cocoon
- * @returns null or map containing value of request parameter 'pattern'
+ * @return null or map containing value of request parameter 'pattern'
*/
public Map match(String pattern, Map objectModel, Parameters parameters) {
Request request = ObjectModelHelper.getRequest(objectModel);
1.5 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/matching/SessionAttributeMatcher.java
Index: SessionAttributeMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/SessionAttributeMatcher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SessionAttributeMatcher.java 22 Feb 2002 07:03:52 -0000 1.4
+++ SessionAttributeMatcher.java 6 Jun 2002 14:28:14 -0000 1.5
@@ -70,7 +70,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: SessionAttributeMatcher.java,v 1.4 2002/02/22 07:03:52
cziegeler Exp $
+ * @version CVS $Id: SessionAttributeMatcher.java,v 1.5 2002/06/06 14:28:14
cziegeler Exp $
*/
public class SessionAttributeMatcher implements Matcher, ThreadSafe
{
@@ -81,7 +81,7 @@
*
* @param pattern name of session attribute to find
* @param objectModel environment passed through via cocoon
- * @returns null or map containing value of session attribute 'pattern'
+ * @return null or map containing value of session attribute 'pattern'
*/
public Map match(String pattern, Map objectModel, Parameters parameters) {
1.5 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/matching/helpers/WildcardHelper.java
Index: WildcardHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/helpers/WildcardHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WildcardHelper.java 22 Feb 2002 07:03:53 -0000 1.4
+++ WildcardHelper.java 6 Jun 2002 14:28:14 -0000 1.5
@@ -61,7 +61,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Id: WildcardHelper.java,v 1.4 2002/02/22 07:03:53 cziegeler Exp $
+ * @version CVS $Id: WildcardHelper.java,v 1.5 2002/06/06 14:28:14 cziegeler Exp $
*/
public class WildcardHelper {
@@ -105,7 +105,7 @@
* All MATCH* values are less than zero, while normal characters are equal
* or greater.
*
- * @parameter data The string to translate.
+ * @param data The string to translate.
* @return The encoded string as an int array, terminated by the MATCH_END
* value (don't consider the array length).
* @exception NullPointerException If data is null.
1.26 +34 -34
xml-cocoon2/src/java/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- CocoonServlet.java 1 Jun 2002 14:44:42 -0000 1.25
+++ CocoonServlet.java 6 Jun 2002 14:28:14 -0000 1.26
@@ -117,7 +117,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leo Sutic</a>
- * @version CVS $Id: CocoonServlet.java,v 1.25 2002/06/01 14:44:42 nicolaken Exp $
+ * @version CVS $Id: CocoonServlet.java,v 1.26 2002/06/06 14:28:14 cziegeler Exp $
*/
public class CocoonServlet extends HttpServlet {
@@ -424,15 +424,15 @@
log.debug("form-encoding was not set - defaulting to null.");
}
}
-
- value = conf.getInitParameter("manage-exceptions");
+
+ value = conf.getInitParameter("manage-exceptions");
this.manageExceptions = (value == null || value.equalsIgnoreCase("yes") ||
value.equalsIgnoreCase("true"));
if (value == null) {
if (log.isDebugEnabled()) {
log.debug("Parameter manageExceptions was not set - defaulting to
true.");
}
}
-
+
this.createCocoon();
}
@@ -953,9 +953,9 @@
// Check if cocoon was initialized
if (this.cocoon == null) {
- if(manageExceptions){
+ if(manageExceptions){
res.reset();
-
+
SimpleNotifyingBean n = new SimpleNotifyingBean(this);
n.setType("fatal");
n.setTitle("Internal servlet error");
@@ -963,14 +963,14 @@
n.setMessage("Cocoon was not initialized.");
n.setDescription("Cocoon was not initialized. Cannot process request.");
n.addExtraDescription("request-uri", request.getRequestURI());
-
+
res.setContentType("text/html");
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
Notifier.notify(n, res.getOutputStream(), "text/html");
}
else{
res.sendError
- (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
"The Cocoon engine said it failed to process the request for an
unknown reason." );
res.flushBuffer();
return;
@@ -1036,10 +1036,10 @@
} else {
//NKB Should not get here?
log.fatalError("The Cocoon engine said it failed to process the
request for an unknown reason.");
-
- if(manageExceptions){
- res.reset();
-
+
+ if(manageExceptions){
+ res.reset();
+
SimpleNotifyingBean n = new SimpleNotifyingBean(this);
n.setType("error");
n.setTitle("Cocoon confusion");
@@ -1048,28 +1048,28 @@
n.setDescription("The Cocoon engine said it failed to process
the request for an unknown reason.");
n.addExtraDescription("request-uri", request.getRequestURI());
n.addExtraDescription("path-info", uri);
-
+
res.setContentType("text/html");
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
Notifier.notify(n, res.getOutputStream(), "text/html");
}
else{
res.sendError
- (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
"The Cocoon engine said it failed to process the request
for an unknown reason." );
res.flushBuffer();
- return;
+ return;
}
-
+
}
} catch (ResourceNotFoundException rse) {
if (log.isWarnEnabled()) {
log.warn("The resource was not found", rse);
}
-
- if(manageExceptions){
- res.reset();
-
+
+ if(manageExceptions){
+ res.reset();
+
SimpleNotifyingBean n = new SimpleNotifyingBean(this);
n.setType("resource-not-found");
n.setTitle("Resource not found");
@@ -1080,7 +1080,7 @@
+ "\" was not found.");
n.addExtraDescription("request-uri", request.getRequestURI());
n.addExtraDescription("path-info", uri);
-
+
res.setContentType("text/html");
res.setStatus(HttpServletResponse.SC_NOT_FOUND);
Notifier.notify(n, res.getOutputStream(), "text/html");
@@ -1089,9 +1089,9 @@
res.sendError
(HttpServletResponse.SC_NOT_FOUND, "Resource not found." );
res.flushBuffer();
- return;
+ return;
}
-
+
} catch (ConnectionResetException cre) {
if (log.isWarnEnabled()) {
log.warn("The connection was reset", cre);
@@ -1101,10 +1101,10 @@
if (log.isErrorEnabled()) {
log.error("Problem with Cocoon servlet", e);
}
-
- if(manageExceptions){
- res.reset();
-
+
+ if(manageExceptions){
+ res.reset();
+
HashMap extraDescriptions = new HashMap(3);
extraDescriptions.put("request-uri", request.getRequestURI());
extraDescriptions.put("path-info", uri);
@@ -1121,11 +1121,11 @@
}
else{
res.sendError
- (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
"Internal server error.");
res.flushBuffer();
- return;
- }
+ return;
+ }
}
long end = System.currentTimeMillis();
@@ -1154,14 +1154,14 @@
} finally {
if (ctxMap != null) ctxMap.clear();
try{
- ServletOutputStream out = res.getOutputStream();
+ ServletOutputStream out = res.getOutputStream();
out.flush();
out.close();
}
catch(Exception e){
- log.error("Cocoon servlet threw an Exception while trying to close
stream.", e);
+ log.error("Cocoon servlet threw an Exception while trying to close
stream.", e);
}
-
+
}
}
@@ -1316,7 +1316,7 @@
* Gets the current cocoon object. Reload cocoon if configuration
* changed or we are reloading.
*
- * @returns Cocoon
+ * @return Cocoon
*/
private Cocoon getCocoon(final String pathInfo, final String reloadParam)
throws ServletException {
1.7 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java
Index: AbstractDOMTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractDOMTransformer.java 8 Mar 2002 04:28:13 -0000 1.6
+++ AbstractDOMTransformer.java 6 Jun 2002 14:28:15 -0000 1.7
@@ -80,7 +80,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Ross Burton</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Bruce G. Robertson</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: AbstractDOMTransformer.java,v 1.6 2002/03/08 04:28:13
vgritsenko Exp $
+ * @version CVS $Id: AbstractDOMTransformer.java,v 1.7 2002/06/06 14:28:15
cziegeler Exp $
*/
public abstract class AbstractDOMTransformer extends AbstractTransformer
implements Transformer, DOMBuilder.Listener, Composable, Disposable,
Recyclable {
@@ -182,7 +182,7 @@
/**
* Transform the specified DOM, returning a new DOM to stream down the pipeline.
* @param doc The DOM Document representing the SAX stream
- * @returns A DOM Document to stream down the pipeline
+ * @return A DOM Document to stream down the pipeline
*/
protected abstract Document transform(Document doc);
1.3 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/components/SessionManager.java
Index: SessionManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/components/SessionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionManager.java 17 Apr 2002 12:39:19 -0000 1.2
+++ SessionManager.java 6 Jun 2002 14:28:15 -0000 1.3
@@ -106,7 +106,7 @@
* allowed but if one thread wants to write, no other can read or write.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SessionManager.java,v 1.2 2002/04/17 12:39:19 cziegeler Exp $
+ * @version CVS $Id: SessionManager.java,v 1.3 2002/06/06 14:28:15 cziegeler Exp $
*/
public final class SessionManager
extends AbstractLoggable
@@ -366,7 +366,7 @@
* Terminate the current session.
* If the user has a session, this session is terminated and all of its
* data is deleted.
- * @parameter force If this is set to true the session is terminated, if
+ * @param force If this is set to true the session is terminated, if
* it is set to false, the session is only terminated
* if now session context is available.
*/
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
