From 9169d04dd253e68727b26a6b8bf45775f1e5d6c9 Mon Sep 17 00:00:00 2001 From: Martin Spielmann Date: Thu, 28 Jul 2016 17:26:16 +0200 Subject: started resolving compile errors. no functional changes made. onle replacements like PageParameters.put -> PageParameters.add --- src/main/java/com/gitblit/models/Menu.java | 7 +++--- .../java/com/gitblit/wicket/GitBlitWebSession.java | 8 +++---- .../gitblit/wicket/GitblitRedirectException.java | 2 +- .../java/com/gitblit/wicket/Html5DateField.java | 2 +- .../java/com/gitblit/wicket/MarkupProcessor.java | 2 +- .../java/com/gitblit/wicket/SessionlessForm.java | 6 ++--- src/main/java/com/gitblit/wicket/WicketUtils.java | 27 +++++++++++----------- .../com/gitblit/wicket/charting/Flotr2Charts.java | 18 +++++++++------ .../gitblit/wicket/freemarker/FreemarkerPanel.java | 2 +- .../java/com/gitblit/wicket/ng/NgController.java | 9 ++++---- .../com/gitblit/wicket/pages/ActivityPage.java | 4 ++-- .../com/gitblit/wicket/pages/LuceneSearchPage.java | 20 ++++++++-------- .../com/gitblit/wicket/pages/MyTicketsPage.java | 14 +++++------ .../java/com/gitblit/wicket/pages/PatchPage.java | 2 +- .../java/com/gitblit/wicket/pages/RawPage.java | 9 ++++---- .../java/com/gitblit/wicket/pages/RootPage.java | 14 +++++------ .../java/com/gitblit/wicket/pages/SessionPage.java | 4 ++-- .../java/com/gitblit/wicket/pages/TicketPage.java | 2 +- .../java/com/gitblit/wicket/pages/TicketsPage.java | 6 ++--- .../gitblit/wicket/panels/BooleanChoiceOption.java | 2 +- .../gitblit/wicket/panels/ShockWaveComponent.java | 2 +- 21 files changed, 83 insertions(+), 79 deletions(-) diff --git a/src/main/java/com/gitblit/models/Menu.java b/src/main/java/com/gitblit/models/Menu.java index 0f2efa26..7fb46ddc 100644 --- a/src/main/java/com/gitblit/models/Menu.java +++ b/src/main/java/com/gitblit/models/Menu.java @@ -108,8 +108,9 @@ public class Menu { isSelected = false; } else { parameters = new PageParameters(params); - if (parameters.containsKey(parameter)) { - isSelected = params.getString(parameter).equals(value); +// if (parameters.containsKey(parameter)) { + if (!parameters.get(parameter).isEmpty()) { + isSelected = params.get(parameter).toString().equals(value); // set the new selection value setParameter(parameter, value); } else { @@ -125,7 +126,7 @@ public class Menu { if (StringUtils.isEmpty(value)) { this.parameters.remove(parameter); } else { - this.parameters.put(parameter, value); + this.parameters.add(parameter, value); } } } diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebSession.java b/src/main/java/com/gitblit/wicket/GitBlitWebSession.java index 59dfc987..7adbd359 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebSession.java +++ b/src/main/java/com/gitblit/wicket/GitBlitWebSession.java @@ -21,12 +21,12 @@ import java.util.TimeZone; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.wicket.Page; +import org.apache.wicket.request.Request; +import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.RedirectToUrlException; -import org.apache.wicket.Request; import org.apache.wicket.Session; import org.apache.wicket.protocol.http.RequestUtils; -import org.apache.wicket.protocol.http.WebRequestCycle; import org.apache.wicket.protocol.http.WebSession; import org.apache.wicket.protocol.http.request.WebClientInfo; @@ -64,10 +64,10 @@ public final class GitBlitWebSession extends WebSession { */ public void cacheRequest(Class pageClass) { // build absolute url with correctly encoded parameters?! - Request req = WebRequestCycle.get().getRequest(); + Request req = RequestCycle.get().getRequest(); Map params = req.getRequestParameters().getParameters(); PageParameters pageParams = new PageParameters(params); - String relativeUrl = WebRequestCycle.get().urlFor(pageClass, pageParams).toString(); + String relativeUrl = RequestCycle.get().urlFor(pageClass, pageParams).toString(); requestUrl = RequestUtils.toAbsolutePath(relativeUrl); if (isTemporary()) { diff --git a/src/main/java/com/gitblit/wicket/GitblitRedirectException.java b/src/main/java/com/gitblit/wicket/GitblitRedirectException.java index a8f9b29b..23ac7efa 100644 --- a/src/main/java/com/gitblit/wicket/GitblitRedirectException.java +++ b/src/main/java/com/gitblit/wicket/GitblitRedirectException.java @@ -17,8 +17,8 @@ package com.gitblit.wicket; import org.apache.wicket.AbstractRestartResponseException; import org.apache.wicket.Page; +import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.RequestCycle; import org.apache.wicket.protocol.http.RequestUtils; import org.apache.wicket.request.target.basic.RedirectRequestTarget; diff --git a/src/main/java/com/gitblit/wicket/Html5DateField.java b/src/main/java/com/gitblit/wicket/Html5DateField.java index 927ee46e..66b273dd 100644 --- a/src/main/java/com/gitblit/wicket/Html5DateField.java +++ b/src/main/java/com/gitblit/wicket/Html5DateField.java @@ -10,7 +10,7 @@ import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.form.AbstractTextComponent.ITextFormatProvider; import org.apache.wicket.model.IModel; import org.apache.wicket.util.convert.IConverter; -import org.apache.wicket.util.convert.converters.DateConverter; +import org.apache.wicket.util.convert.converter.DateConverter; public class Html5DateField extends TextField implements ITextFormatProvider { diff --git a/src/main/java/com/gitblit/wicket/MarkupProcessor.java b/src/main/java/com/gitblit/wicket/MarkupProcessor.java index b2032049..7826a3b2 100644 --- a/src/main/java/com/gitblit/wicket/MarkupProcessor.java +++ b/src/main/java/com/gitblit/wicket/MarkupProcessor.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import org.apache.wicket.Page; -import org.apache.wicket.RequestCycle; +import org.apache.wicket.request.cycle.RequestCycle; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.mylyn.wikitext.confluence.core.ConfluenceLanguage; diff --git a/src/main/java/com/gitblit/wicket/SessionlessForm.java b/src/main/java/com/gitblit/wicket/SessionlessForm.java index 207513d3..0d66ebe8 100644 --- a/src/main/java/com/gitblit/wicket/SessionlessForm.java +++ b/src/main/java/com/gitblit/wicket/SessionlessForm.java @@ -23,8 +23,8 @@ import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupStream; import org.apache.wicket.markup.html.form.StatelessForm; import org.apache.wicket.protocol.http.RequestUtils; -import org.apache.wicket.protocol.http.WicketURLDecoder; -import org.apache.wicket.protocol.http.request.WebRequestCodingStrategy; +//import org.apache.wicket.protocol.http.WicketURLDecoder; +//import org.apache.wicket.protocol.http.request.WebRequestCodingStrategy; import org.apache.wicket.util.string.AppendingStringBuffer; import org.apache.wicket.util.string.Strings; import org.slf4j.Logger; @@ -100,7 +100,7 @@ public class SessionlessForm extends StatelessForm { * The open tag for the body */ @Override - protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) + public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) { // render the hidden bookmarkable page field AppendingStringBuffer buffer = new AppendingStringBuffer(HIDDEN_DIV_START); diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java index 13d02e60..9a778291 100644 --- a/src/main/java/com/gitblit/wicket/WicketUtils.java +++ b/src/main/java/com/gitblit/wicket/WicketUtils.java @@ -26,19 +26,18 @@ import java.util.TimeZone; import javax.servlet.http.HttpServletRequest; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; +import org.apache.wicket.request.Request; +import org.apache.wicket.request.http.WebRequest; import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.Request; +import org.apache.wicket.request.resource.ContextRelativeResource; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.behavior.HeaderContributor; -import org.apache.wicket.behavior.SimpleAttributeModifier; import org.apache.wicket.markup.html.IHeaderContributor; -import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.image.ContextImage; import org.apache.wicket.model.Model; -import org.apache.wicket.protocol.http.WebRequest; -import org.apache.wicket.resource.ContextRelativeResource; import org.eclipse.jgit.diff.DiffEntry.ChangeType; import com.gitblit.Constants; @@ -56,7 +55,7 @@ import com.gitblit.utils.TimeUtils; public class WicketUtils { public static void setCssClass(Component container, String value) { - container.add(new SimpleAttributeModifier("class", value)); + container.add(new AttributeModifier("class", value)); } public static void addCssClass(Component container, String value) { @@ -64,21 +63,21 @@ public class WicketUtils { } public static void setCssStyle(Component container, String value) { - container.add(new SimpleAttributeModifier("style", value)); + container.add(new AttributeModifier("style", value)); } public static void setCssBackground(Component container, String value) { String background = MessageFormat.format("background-color:{0};", StringUtils.getColor(value)); - container.add(new SimpleAttributeModifier("style", background)); + container.add(new AttributeModifier("style", background)); } public static Component setHtmlTooltip(Component container, String value) { - return container.add(new SimpleAttributeModifier("title", value)); + return container.add(new AttributeModifier("title", value)); } public static void setInputPlaceholder(Component container, String value) { - container.add(new SimpleAttributeModifier("placeholder", value)); + container.add(new AttributeModifier("placeholder", value)); } public static void setChangeTypeCssClass(Component container, ChangeType type) { @@ -506,11 +505,11 @@ public class WicketUtils { } public static String getProjectName(PageParameters params) { - return params.getString("p", ""); + return params.get("p").toString(""); } public static String getRepositoryName(PageParameters params) { - return params.getString("r", ""); + return params.get("r").toString(""); } public static String getObject(PageParameters params) { @@ -540,7 +539,7 @@ public class WicketUtils { public static int getPage(PageParameters params) { // index from 1 - return params.getInt("pg", 1); + return params.get("pg").toInt(1); } public static String getRegEx(PageParameters params) { @@ -576,7 +575,7 @@ public class WicketUtils { } public static String getNameParameter(PageParameters params) { - return params.getString("n", ""); + return params.get("n").toString(""); } public static Label createDateLabel(String wicketId, Date date, TimeZone timeZone, TimeUtils timeUtils) { diff --git a/src/main/java/com/gitblit/wicket/charting/Flotr2Charts.java b/src/main/java/com/gitblit/wicket/charting/Flotr2Charts.java index 7a8adcf2..62bec934 100644 --- a/src/main/java/com/gitblit/wicket/charting/Flotr2Charts.java +++ b/src/main/java/com/gitblit/wicket/charting/Flotr2Charts.java @@ -17,8 +17,12 @@ package com.gitblit.wicket.charting; import javax.servlet.ServletContext; -import org.apache.wicket.markup.html.IHeaderResponse; +import org.apache.wicket.markup.head.IHeaderResponse; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; +import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.protocol.http.WebApplication; +import org.apache.wicket.request.resource.ContextRelativeResource; +import org.apache.wicket.request.resource.ContextRelativeResourceReference; /** * Concrete class for Flotr2 charts @@ -37,14 +41,14 @@ public class Flotr2Charts extends Charts { ServletContext servletContext = WebApplication.get().getServletContext(); String contextPath = servletContext.getContextPath(); - response.renderJavascriptReference(contextPath + "/bootstrap/js/jquery.js"); - response.renderJavascriptReference(contextPath + "/flotr2/flotr2.min.js"); - response.renderCSSReference(contextPath + "/flotr2/flotr2.custom.css"); + response.render(JavaScriptHeaderItem.forReference(new ContextRelativeResourceReference(contextPath + "/bootstrap/js/jquery.js", false))); + response.render(JavaScriptHeaderItem.forReference(new ContextRelativeResourceReference(contextPath + "/flotr2/flotr2.min.js", false))); + response.render(JavaScriptHeaderItem.forReference(new ContextRelativeResourceReference(contextPath + "/flotr2/flotr2.custom.css", false))); // prepare draw chart function StringBuilder sb = new StringBuilder(); - line(sb, "$( document ).ready(function() {"); +// line(sb, "$( document ).ready(function() {"); line(sb, "try {"); // add charts to header for (Chart chart : charts) { @@ -57,8 +61,8 @@ public class Flotr2Charts extends Charts { line(sb, " }"); line(sb, "}"); // end draw chart function - line(sb, "});"); - response.renderJavascript(sb.toString(), null); +// line(sb, "});"); + response.render(OnDomReadyHeaderItem.forScript(sb.toString())); } @Override diff --git a/src/main/java/com/gitblit/wicket/freemarker/FreemarkerPanel.java b/src/main/java/com/gitblit/wicket/freemarker/FreemarkerPanel.java index aaf1a135..f5d1726d 100644 --- a/src/main/java/com/gitblit/wicket/freemarker/FreemarkerPanel.java +++ b/src/main/java/com/gitblit/wicket/freemarker/FreemarkerPanel.java @@ -120,7 +120,7 @@ public class FreemarkerPanel extends Panel * MarkupStream, org.apache.wicket.markup.ComponentTag) */ @Override - protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) + public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) { if (!Strings.isEmpty(stackTraceAsString)) { diff --git a/src/main/java/com/gitblit/wicket/ng/NgController.java b/src/main/java/com/gitblit/wicket/ng/NgController.java index 19e419a0..ea15dcf2 100644 --- a/src/main/java/com/gitblit/wicket/ng/NgController.java +++ b/src/main/java/com/gitblit/wicket/ng/NgController.java @@ -19,9 +19,10 @@ import java.text.MessageFormat; import java.util.HashMap; import java.util.Map; -import org.apache.wicket.ResourceReference; +import org.apache.wicket.markup.head.IHeaderResponse; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.html.IHeaderContributor; -import org.apache.wicket.markup.html.IHeaderResponse; +import org.apache.wicket.request.resource.PackageResourceReference; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -54,7 +55,7 @@ public class NgController implements IHeaderContributor { @Override public void renderHead(IHeaderResponse response) { // add Google AngularJS reference - response.renderJavascriptReference(new ResourceReference(NgController.class, "angular.js")); + response.render(JavaScriptHeaderItem.forReference(new PackageResourceReference(NgController.class, "angular.js"))); Gson gson = new GsonBuilder().create(); @@ -69,7 +70,7 @@ public class NgController implements IHeaderContributor { } line(sb, "}"); - response.renderJavascript(sb.toString(), null); + response.render(JavaScriptHeaderItem.forScript(sb.toString(), "angularController")); } private void line(StringBuilder sb, String line) { diff --git a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java index 3e71e4d2..af4e39f7 100644 --- a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java +++ b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java @@ -141,8 +141,8 @@ public class ActivityPage extends RootPage { PageParameters currentParameters = getPageParameters(); int daysBack = app().settings().getInteger(Keys.web.activityDuration, 7); - if (currentParameters != null && !currentParameters.containsKey("db")) { - currentParameters.put("db", daysBack); + if (currentParameters != null && currentParameters.get("db").isEmpty()) { + currentParameters.add("db", daysBack); } // preserve time filter options on repository choices diff --git a/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java index 90661a6c..357b5036 100644 --- a/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java +++ b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java @@ -88,19 +88,19 @@ public class LuceneSearchPage extends RootPage { page = WicketUtils.getPage(params); - if (params.containsKey("repositories")) { - String value = params.getString("repositories", ""); + if (!params.get("repositories").isEmpty()) { + String value = params.get("repositories").toString(""); List list = StringUtils.getStringsFromValue(value); repositories.addAll(list); } - allRepos = params.getAsBoolean("allrepos", false); + allRepos = params.get("allrepos").toBoolean(false); if (allRepos) { repositories.addAll(availableRepositories); } - if (params.containsKey("query")) { - query = params.getString("query", ""); + if (!params.get("query").isEmpty()) { + query = params.get("query").toString(""); } else { String value = WicketUtils.getSearchString(params); String type = WicketUtils.getSearchType(params); @@ -153,9 +153,9 @@ public class LuceneSearchPage extends RootPage { return; } PageParameters params = new PageParameters(); - params.put("repositories", StringUtils.flattenStrings(repositoriesModel.getObject())); - params.put("query", queryModel.getObject()); - params.put("allrepos", allreposModel.getObject()); + params.add("repositories", StringUtils.flattenStrings(repositoriesModel.getObject())); + params.add("query", queryModel.getObject()); + params.add("allrepos", allreposModel.getObject()); LuceneSearchPage page = new LuceneSearchPage(params); setResponsePage(page); } @@ -249,8 +249,8 @@ public class LuceneSearchPage extends RootPage { add(resultsView.setVisible(results.size() > 0)); PageParameters pagerParams = new PageParameters(); - pagerParams.put("repositories", StringUtils.flattenStrings(repositoriesModel.getObject())); - pagerParams.put("query", queryModel.getObject()); + pagerParams.add("repositories", StringUtils.flattenStrings(repositoriesModel.getObject())); + pagerParams.add("query", queryModel.getObject()); boolean showPager = false; int totalPages = 0; diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index f9940cc5..a8fcb8a6 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -74,13 +74,13 @@ public class MyTicketsPage extends RootPage { final String username = currentUser.getName(); final String[] statiiParam = (params == null) ? TicketsUI.openStatii : params.getStringArray(Lucene.status.name()); - final String assignedToParam = (params == null) ? "" : params.getString(Lucene.responsible.name(), null); - final String milestoneParam = (params == null) ? "" : params.getString(Lucene.milestone.name(), null); - final String queryParam = (params == null) ? null : params.getString("q", null); - final String searchParam = (params == null) ? "" : params.getString("s", null); - final String sortBy = (params == null) ? "" : Lucene.fromString(params.getString("sort", Lucene.created.name())).name(); - final String repositoryId = (params == null) ? "" : params.getString(Lucene.rid.name(), null); - final boolean desc = (params == null) ? true : !"asc".equals(params.getString("direction", "desc")); + final String assignedToParam = (params == null) ? "" : params.get(Lucene.responsible.name()).toString(); + final String milestoneParam = (params == null) ? "" : params.get(Lucene.milestone.name()).toString(); + final String queryParam = (params == null) ? null : params.get("q").toString(); + final String searchParam = (params == null) ? "" : params.get("s").toString(); + final String sortBy = (params == null) ? "" : Lucene.fromString(params.get("sort").toString(Lucene.created.name())).name(); + final String repositoryId = (params == null) ? "" : params.get(Lucene.rid.name()).toString(); + final boolean desc = (params == null) ? true : !"asc".equals(params.get("direction").toString("desc")); // add the user title panel diff --git a/src/main/java/com/gitblit/wicket/pages/PatchPage.java b/src/main/java/com/gitblit/wicket/pages/PatchPage.java index 05a5c952..384885ad 100644 --- a/src/main/java/com/gitblit/wicket/pages/PatchPage.java +++ b/src/main/java/com/gitblit/wicket/pages/PatchPage.java @@ -36,7 +36,7 @@ public class PatchPage extends SessionPage { public PatchPage(final PageParameters params) { super(params); - if (!params.containsKey("r")) { + if (params.get("r").isEmpty()) { error(getString("gb.repositoryNotSpecified")); redirectToInterceptPage(new RepositoriesPage()); } diff --git a/src/main/java/com/gitblit/wicket/pages/RawPage.java b/src/main/java/com/gitblit/wicket/pages/RawPage.java index ebbf4b12..2faa4185 100644 --- a/src/main/java/com/gitblit/wicket/pages/RawPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RawPage.java @@ -24,11 +24,10 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; -import org.apache.wicket.IRequestTarget; +import org.apache.wicket.request.cycle.RequestCycle; +import org.apache.wicket.request.http.WebRequest; +import org.apache.wicket.request.http.WebResponse; import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.RequestCycle; -import org.apache.wicket.protocol.http.WebRequest; -import org.apache.wicket.protocol.http.WebResponse; import org.apache.wicket.protocol.http.servlet.AbortWithWebErrorCodeException; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; @@ -52,7 +51,7 @@ public class RawPage extends SessionPage { public RawPage(final PageParameters params) { super(params); - if (!params.containsKey("r")) { + if (params.get("r").isEmpty()) { error(getString("gb.repositoryNotSpecified")); redirectToInterceptPage(new RepositoriesPage()); } diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java index 480ecf83..9a28a1f7 100644 --- a/src/main/java/com/gitblit/wicket/pages/RootPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java @@ -35,11 +35,13 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.wicket.MarkupContainer; +import org.apache.wicket.request.cycle.RequestCycle; +import org.apache.wicket.request.http.WebRequest; +import org.apache.wicket.request.http.WebResponse; import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.RequestCycle; import org.apache.wicket.behavior.HeaderContributor; +import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.IHeaderContributor; -import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.link.BookmarkablePageLink; @@ -49,8 +51,6 @@ import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import org.apache.wicket.protocol.http.WebRequest; -import org.apache.wicket.protocol.http.WebResponse; import com.gitblit.Constants; import com.gitblit.Constants.AuthenticationType; @@ -393,8 +393,8 @@ public abstract class RootPage extends BasePage { clonedParams = new PageParameters(params); } - if (!clonedParams.containsKey("db")) { - clonedParams.put("db", daysBack); + if (clonedParams.get("db").isEmpty()) { + clonedParams.add("db", daysBack); } List items = new ArrayList(); @@ -434,7 +434,7 @@ public abstract class RootPage extends BasePage { String set = WicketUtils.getSet(params); String regex = WicketUtils.getRegEx(params); String team = WicketUtils.getTeam(params); - int daysBack = params.getInt("db", 0); + int daysBack = params.get("db").toInt(0); int maxDaysBack = app().settings().getInteger(Keys.web.activityDurationMaximum, 30); List availableModels = getRepositoryModels(); diff --git a/src/main/java/com/gitblit/wicket/pages/SessionPage.java b/src/main/java/com/gitblit/wicket/pages/SessionPage.java index 7dd0d06d..b4cf0db3 100644 --- a/src/main/java/com/gitblit/wicket/pages/SessionPage.java +++ b/src/main/java/com/gitblit/wicket/pages/SessionPage.java @@ -18,10 +18,10 @@ package com.gitblit.wicket.pages; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.wicket.request.http.WebRequest; +import org.apache.wicket.request.http.WebResponse; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.protocol.http.WebRequest; -import org.apache.wicket.protocol.http.WebResponse; import com.gitblit.Constants; import com.gitblit.Constants.AuthenticationType; diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java index c1e1cd89..9de3100d 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java +++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java @@ -265,7 +265,7 @@ public class TicketPage extends RepositoryPage { } else { milestoneParameters = WicketUtils.newRepositoryParameter(repositoryName); } - milestoneParameters.put(Lucene.milestone.name(), ticket.milestone); + milestoneParameters.add(Lucene.milestone.name(), ticket.milestone); int progress = 0; int open = 0; int closed = 0; diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java index bc4009be..f99464af 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java @@ -24,9 +24,9 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.behavior.SimpleAttributeModifier; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.html.panel.Fragment; @@ -367,7 +367,7 @@ public class TicketsPage extends RepositoryPage { tq.color = StringUtils.getColor(tq.name); } String background = MessageFormat.format("background-color:{0};", tq.color); - swatch.add(new SimpleAttributeModifier("style", background)); + swatch.add(new AttributeModifier("style", background)); item.add(swatch); if (activeQuery.contains(tq.query)) { // selected @@ -377,7 +377,7 @@ public class TicketsPage extends RepositoryPage { Label checked = new Label("checked"); WicketUtils.setCssClass(checked, "iconic-o-x"); item.add(checked); - item.add(new SimpleAttributeModifier("style", background)); + item.add(new AttributeModifier("style", background)); } else { // unselected String q = QueryBuilder.q(queryParam).toSubquery().and(tq.query).build(); diff --git a/src/main/java/com/gitblit/wicket/panels/BooleanChoiceOption.java b/src/main/java/com/gitblit/wicket/panels/BooleanChoiceOption.java index 98a700b7..9de3aa17 100644 --- a/src/main/java/com/gitblit/wicket/panels/BooleanChoiceOption.java +++ b/src/main/java/com/gitblit/wicket/panels/BooleanChoiceOption.java @@ -68,7 +68,7 @@ public class BooleanChoiceOption extends BasePanel { @Override protected void onUpdate(AjaxRequestTarget target) { choice.setEnabled(checkbox.getModelObject()); - target.addComponent(choice); + target.add(choice); if (!choice.isEnabled()) { choice.setModelObject(null); } diff --git a/src/main/java/com/gitblit/wicket/panels/ShockWaveComponent.java b/src/main/java/com/gitblit/wicket/panels/ShockWaveComponent.java index 78822c6d..416337f4 100644 --- a/src/main/java/com/gitblit/wicket/panels/ShockWaveComponent.java +++ b/src/main/java/com/gitblit/wicket/panels/ShockWaveComponent.java @@ -22,9 +22,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.wicket.Response; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupStream; +import org.apache.wicket.request.Response; import org.apache.wicket.util.value.IValueMap; /** -- cgit v1.2.3