From 1e47ab18a003df93e749211271554981e3af7689 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 07 Apr 2011 17:59:56 -0400
Subject: [PATCH] Localized all strings for translation. Removed old resources.
---
src/com/gitblit/wicket/LinkPanel.java | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/com/gitblit/wicket/LinkPanel.java b/src/com/gitblit/wicket/LinkPanel.java
index afa2647..716ed49 100644
--- a/src/com/gitblit/wicket/LinkPanel.java
+++ b/src/com/gitblit/wicket/LinkPanel.java
@@ -1,13 +1,12 @@
package com.gitblit.wicket;
-import org.apache.wicket.AttributeModifier;
import org.apache.wicket.PageParameters;
+import org.apache.wicket.behavior.SimpleAttributeModifier;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -15,28 +14,24 @@
private static final long serialVersionUID = 1L;
- private IModel<String> labelModel = new Model<String>();
+ private final IModel<String> labelModel;
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public LinkPanel(String wicketId, final String linkCssClass, String label, Class<? extends WebPage> clazz, PageParameters parameters) {
+ public LinkPanel(String wicketId, String linkCssClass, String label, Class<? extends WebPage> clazz, PageParameters parameters) {
+ this(wicketId, linkCssClass, new Model<String>(label), clazz, parameters);
+ }
+
+ public LinkPanel(String wicketId, String linkCssClass, IModel<String> model, Class<? extends WebPage> clazz, PageParameters parameters) {
super(wicketId);
- Link<?> link = null;
+ this.labelModel = model;
+ Link<Void> link = null;
if (parameters == null) {
- link = new BookmarkablePageLink("link", clazz);
+ link = new BookmarkablePageLink<Void>("link", clazz);
} else {
- link = new BookmarkablePageLink("link", clazz, parameters);
+ link = new BookmarkablePageLink<Void>("link", clazz, parameters);
}
if (linkCssClass != null) {
- link.add(new AttributeModifier("class", true, new AbstractReadOnlyModel<String>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getObject() {
- return linkCssClass;
- }
- }));
- }
- labelModel.setObject(label);
+ link.add(new SimpleAttributeModifier("class", linkCssClass));
+ }
link.add(new Label("label", labelModel));
add(link);
}
--
Gitblit v1.9.1