You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/08/14 06:45:27 UTC
svn commit: r685770 - in
/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH: ChangeLog
src/com/ecyrd/jspwiki/Release.java
src/com/ecyrd/jspwiki/tags/SetPaginationTag.java
Author: ajaquith
Date: Wed Aug 13 21:45:27 2008
New Revision: 685770
URL: http://svn.apache.org/viewvc?rev=685770&view=rev
Log:
Merged STRIPES_BRANCH with trunk revision 685765.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog?rev=685770&r1=685769&r2=685770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog Wed Aug 13 21:45:27 2008
@@ -1,3 +1,10 @@
+2008-08-14 Andrew Jaquith <ajaquith AT apache DOT org>
+
+ * 2.7.0-alpha-16
+
+ * Fixed invalidateSession() method in WikiSession, which was not quite
+ fully invalidating sessions.
+
2008-08-12 Dirk Frederickx <di...@gmail.com>
* 2.7.0-alpha-15
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=685770&r1=685769&r2=685770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java Wed Aug 13 21:45:27 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "15";
+ public static final String BUILD = "16";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java?rev=685770&r1=685769&r2=685770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java Wed Aug 13 21:45:27 2008
@@ -36,15 +36,25 @@
* <LI> total - total number of items
* <LI> pagesize - total number of items per page
* <LI> maxlinks - number of page links to be generated
- * <LI> fmtkey - pagination prefix of the i18n resource key
+ * <LI> fmtkey - pagination prefix of the i18n resource keys. Following keys are used:
+ * <br>fmtkey="info.pagination"
+ * <UL>
+ * <LI> info.pagination.first=<span class="first">First</span>
+ * <LI> info.pagination.last=<span class="last">Last</span>
+ * <LI> info.pagination.previous=<span class="prev">Previous</span>
+ * <LI> info.pagination.next=<span class="next">Next</span>
+ * <LI> info.pagination.all=<span class="all">all</span>
+ * <LI> info.pagination.total= (Total items: {0} )
+ * <LI> info.pagination.show.title=Show items from {0} to {1}
+ * <LI> info.pagination.showall.title=Show all items
+ * </UL>
* </UL>
- * <P>Following optional attributes can be parameterised with '%s' (item count)</P>
+ * <P>Following optional attributes can be parameterized with '%s' (item count)</P>
* <UL>
* <LI> href - href of each page link. (optional)
* <LI> onclick - onclick of each page link. (optional)
* </UL>
*
- * @author Dirk Frederickx
* @since 2.5.109
*/
public class SetPaginationTag
@@ -53,7 +63,7 @@
private static final long serialVersionUID = 0L;
private static final int ALLITEMS = -1;
- private int m_start;
+ private int m_start;
private int m_total;
private int m_pagesize;
private int m_maxlinks;
@@ -117,7 +127,7 @@
public int doWikiStartTag()
throws IOException
{
- if( m_total < m_pagesize ) return SKIP_BODY;
+ if( m_total <= m_pagesize ) return SKIP_BODY;
StringBuffer pagination = new StringBuffer();
@@ -163,7 +173,7 @@
{
pagination.append( "<span class='cursor'>" );
pagination.append( 1 + cursor/m_pagesize );
- pagination.append( "</span> " );
+ pagination.append( "</span>" );
}
else
{
@@ -261,7 +271,7 @@
sb.append( ">" );
sb.append( text );
- sb.append( "</a> " );
+ sb.append( "</a>" );
}
}
\ No newline at end of file