Author: almaw
Date: Tue Jun 12 17:50:23 2007
New Revision: 546689
URL: http://svn.apache.org/viewvc?view=rev&rev=546689
Log:
WICKET-373 - Some components miss localization (NavigatorLabel)
Added:
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.properties
(with props)
Modified:
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
Modified:
incubator/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/incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java?view=diff&rev=546689&r1=546688&r2=546689
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
Tue Jun 12 17:50:23 2007
@@ -21,7 +21,8 @@
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.StringResourceModel;
/**
@@ -125,27 +126,55 @@
private NavigatorLabel(final String id, final PageableComponent table)
{
- super(id, new AbstractReadOnlyModel()
- {
- private static final long serialVersionUID = 1L;
+ super(id);
+ setModel(new StringResourceModel("NavigatorLabel", this, new
Model(new LabelModelObject(table))));
+ }
- public Object getObject()
+ private class LabelModelObject implements Serializable
+ {
+ private static final long serialVersionUID = 1L;
+ private PageableComponent table;
+
+ /**
+ * Construct.
+ * @param table
+ */
+ public LabelModelObject(PageableComponent table)
+ {
+ this.table = table;
+ }
+
+ /**
+ * @return "z" in "Showing x to y of z"
+ */
+ public int getOf()
+ {
+ return table.getRowCount();
+ }
+
+ /**
+ * @return "x" in "Showing x to y of z"
+ */
+ public int getFrom()
+ {
+ if (getOf() == 0)
{
- int of = table.getRowCount();
- int from = table.getCurrentPage() *
table.getRowsPerPage();
- int to = Math.min(of, from +
table.getRowsPerPage());
-
- from++;
-
- if (of == 0)
- {
- from = 0;
- to = 0;
- }
-
- return new String("Showing " + from + " to " +
to + " of " + of);
+ return 0;
}
- });
+ return (table.getCurrentPage() *
table.getRowsPerPage()) + 1;
+ }
+
+ /**
+ * @return "y" in "Showing x to y of z"
+ */
+ public int getTo()
+ {
+ if (getOf() == 0)
+ {
+ return 0;
+ }
+ return Math.min(getOf(), getFrom() +
table.getRowsPerPage());
+ }
+
}
-
}
Added:
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.properties
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.properties?view=auto&rev=546689
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.properties
(added)
+++
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.properties
Tue Jun 12 17:50:23 2007
@@ -0,0 +1 @@
+NavigatorLabel=Showing ${from} to ${to} of ${of}
\ No newline at end of file
Propchange:
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.properties
------------------------------------------------------------------------------
svn:eol-style = native
