Author: ivaynberg
Date: Sat Jul 28 09:36:11 2007
New Revision: 560565
URL: http://svn.apache.org/viewvc?view=rev&rev=560565
Log:
fix navigator label off by 1
Modified:
wicket/trunk/archetypes/quickstart/.classpath
wicket/trunk/archetypes/quickstart/.project
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
Modified: wicket/trunk/archetypes/quickstart/.classpath
URL:
http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/.classpath?view=diff&rev=560565&r1=560564&r2=560565
==============================================================================
--- wicket/trunk/archetypes/quickstart/.classpath (original)
+++ wicket/trunk/archetypes/quickstart/.classpath Sat Jul 28 09:36:11 2007
@@ -1,5 +1,10 @@
<classpath>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/main/resources" including="**/*"
excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var"
path="M2_REPO/org/slf4j/slf4j-api/1.4.0/slf4j-api-1.4.0.jar"
sourcepath="M2_REPO/org/slf4j/slf4j-api/1.4.0/slf4j-api-1.4.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"
sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"
sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.0/slf4j-log4j12-1.4.0.jar"
sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.4.0/slf4j-log4j12-1.4.0-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"
sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
</classpath>
Modified: wicket/trunk/archetypes/quickstart/.project
URL:
http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/.project?view=diff&rev=560565&r1=560564&r2=560565
==============================================================================
--- wicket/trunk/archetypes/quickstart/.project (original)
+++ wicket/trunk/archetypes/quickstart/.project Sat Jul 28 09:36:11 2007
@@ -1,6 +1,6 @@
<projectDescription>
- <name>wicket-archetype-template</name>
- <comment/>
+ <name>wicket-archetype-quickstart</name>
+ <comment>Wicket is a Java-based open source component web application
framework.</comment>
<projects/>
<buildSpec>
<buildCommand>
Modified:
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java?view=diff&rev=560565&r1=560564&r2=560565
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
Sat Jul 28 09:36:11 2007
@@ -172,7 +172,7 @@
{
return 0;
}
- return Math.min(getOf(), getFrom() +
table.getRowsPerPage());
+ return Math.min(getOf(), getFrom() +
table.getRowsPerPage()-1);
}
}
