diff --git a/.travis.yml b/.travis.yml index 5e65bfdea5..80971ed468 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ cache: install: true before_script: - - echo "MAVEN_OPTS='-Xmx2g -XX:MaxPermSize=512m'" > ~/.mavenrc + - echo "MAVEN_OPTS='-Xmx2g'" > ~/.mavenrc script: - "DEPLOY_OR_TEST=install" diff --git a/async-tasks-parent/async-tasks-demo/src/main/java/org/wicketstuff/async/demo/DemoPage.java b/async-tasks-parent/async-tasks-demo/src/main/java/org/wicketstuff/async/demo/DemoPage.java index b99961638a..8266b016c3 100644 --- a/async-tasks-parent/async-tasks-demo/src/main/java/org/wicketstuff/async/demo/DemoPage.java +++ b/async-tasks-parent/async-tasks-demo/src/main/java/org/wicketstuff/async/demo/DemoPage.java @@ -1,18 +1,23 @@ package org.wicketstuff.async.demo; +import java.util.concurrent.TimeUnit; + import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.Model; import org.apache.wicket.util.time.Duration; -import org.wicketstuff.async.components.*; +import org.wicketstuff.async.components.IRunnableFactory; +import org.wicketstuff.async.components.InteractionState; +import org.wicketstuff.async.components.ProgressBar; +import org.wicketstuff.async.components.ProgressButton; +import org.wicketstuff.async.components.TaskState; import org.wicketstuff.async.task.AbstractTaskContainer; import org.wicketstuff.async.task.DefaultTaskManager; -import java.util.concurrent.TimeUnit; - public class DemoPage extends WebPage implements IRunnableFactory { + private static final long serialVersionUID = 1L; - public DemoPage() { + public DemoPage() { // Create form Form form = new Form("form"); diff --git a/async-tasks-parent/async-tasks-impl/src/main/java/org/wicketstuff/async/components/ProgressBar.java b/async-tasks-parent/async-tasks-impl/src/main/java/org/wicketstuff/async/components/ProgressBar.java index 194e1d0e2c..4a892152b7 100644 --- a/async-tasks-parent/async-tasks-impl/src/main/java/org/wicketstuff/async/components/ProgressBar.java +++ b/async-tasks-parent/async-tasks-impl/src/main/java/org/wicketstuff/async/components/ProgressBar.java @@ -1,22 +1,22 @@ package org.wicketstuff.async.components; +import java.util.HashMap; +import java.util.Map; + import org.apache.wicket.Component; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; 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; import org.wicketstuff.async.task.AbstractTaskContainer; -import java.util.HashMap; -import java.util.Map; - /** * This component renders a progress bar to an existent task which is controlled by a progress button. */ public class ProgressBar extends Panel { + private static final long serialVersionUID = 1L; private final ProgressButton progressButton; @@ -34,8 +34,8 @@ public ProgressBar(String id, ProgressButton progressButton) { wrapper.add(bar); wrapper.add(new Label("message", new TaskProgressMessageModel())); - stateCssClasses = new HashMap>(); - this.add(new AttributeAppender("class", progressButton.new StateDispatcherModel(new Model(), stateCssClasses), " ")); + stateCssClasses = new HashMap<>(); + this.add(new AttributeAppender("class", progressButton.new StateDispatcherModel<>(new Model(), stateCssClasses), " ")); progressButton.addRefreshDependant(this); @@ -73,7 +73,9 @@ protected double getDefaultWidth() { return 0d; } - private class TaskProgressMessageModel extends AbstractReadOnlyModel { + private class TaskProgressMessageModel implements IModel { + private static final long serialVersionUID = 1L; + @Override public String getObject() { Double progress = getTaskContainer().getProgress(); @@ -91,7 +93,9 @@ public String getObject() { } } - private class TaskProgressPercentageStyleModel extends AbstractReadOnlyModel { + private class TaskProgressPercentageStyleModel implements IModel { + private static final long serialVersionUID = 1L; + @Override public String getObject() { int percentProgress = getPercentProgress(); diff --git a/async-tasks-parent/async-tasks-impl/src/main/java/org/wicketstuff/async/components/ProgressButton.java b/async-tasks-parent/async-tasks-impl/src/main/java/org/wicketstuff/async/components/ProgressButton.java index db762d25b1..1f99927f92 100644 --- a/async-tasks-parent/async-tasks-impl/src/main/java/org/wicketstuff/async/components/ProgressButton.java +++ b/async-tasks-parent/async-tasks-impl/src/main/java/org/wicketstuff/async/components/ProgressButton.java @@ -1,5 +1,11 @@ package org.wicketstuff.async.components; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Optional; + import org.apache.wicket.Component; import org.apache.wicket.Page; import org.apache.wicket.ajax.AbstractAjaxTimerBehavior; @@ -7,25 +13,18 @@ import org.apache.wicket.ajax.markup.html.form.AjaxFallbackButton; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.time.Duration; import org.wicketstuff.async.task.AbstractTaskContainer; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Optional; - /** * A progress button which allows to control a {@link Runnable}. Each such button will refresh itself as given by * by the {@link Duration} with which it was constructed. It represents a runnable by a {@link AbstractTaskContainer}. * In order to create tasks, the button needs to be provided a {@link IRunnableFactory}. */ public class ProgressButton extends AjaxFallbackButton { - + private static final long serialVersionUID = 1L; private final Map> stateTextModels; private final Map> stateCssClasses; @@ -54,24 +53,24 @@ public ProgressButton(String id, IModel model, Form form, IModel(); + this.refreshDependants = new HashSet<>(); this.refreshBehavior = new RefreshBehavior(duration); if (getTaskContainer().isRunning()) { add(refreshBehavior); } - this.stateTextModels = new HashMap>(); - this.setModel(new StateDispatcherModel(getDefaultTextModel(model), stateTextModels)); + this.stateTextModels = new HashMap<>(); + this.setModel(new StateDispatcherModel<>(getDefaultTextModel(model), stateTextModels)); - this.stateCssClasses = new HashMap>(); - this.add(new AttributeAppender("class", new StateDispatcherModel(new Model(), stateCssClasses), " ")); + this.stateCssClasses = new HashMap<>(); + this.add(new AttributeAppender("class", new StateDispatcherModel<>(new Model(), stateCssClasses), " ")); this.setOutputMarkupId(true); } - private IModel getDefaultTextModel(IModel userModel) { + private static IModel getDefaultTextModel(IModel userModel) { if (userModel == null) { - return new Model(); + return new Model<>(); } else { return userModel; } @@ -169,7 +168,7 @@ protected void refresh(AjaxRequestTarget target) { private void concludeIfApplicable(Optional targetOptional) { if (!getTaskContainer().isRunning()) { - targetOptional.ifPresent(target -> { + targetOptional.ifPresent(target -> { refreshBehavior.stop(target); }); if (getTaskContainer().isFailed()) { @@ -195,6 +194,8 @@ public boolean isEnabled() { } private class RefreshBehavior extends AbstractAjaxTimerBehavior { + private static final long serialVersionUID = 1L; + public RefreshBehavior(Duration updateInterval) { super(updateInterval); } @@ -299,7 +300,8 @@ public void registerCssClassModel(IModel textModel, InteractionState... } } - class StateDispatcherModel extends AbstractReadOnlyModel { + class StateDispatcherModel implements IModel { + private static final long serialVersionUID = 1L; private final IModel defaultValue; diff --git a/async-tasks-parent/async-tasks-impl/src/main/java/org/wicketstuff/async/components/StateDescription.java b/async-tasks-parent/async-tasks-impl/src/main/java/org/wicketstuff/async/components/StateDescription.java index 21e75367e5..1da02affe9 100644 --- a/async-tasks-parent/async-tasks-impl/src/main/java/org/wicketstuff/async/components/StateDescription.java +++ b/async-tasks-parent/async-tasks-impl/src/main/java/org/wicketstuff/async/components/StateDescription.java @@ -3,7 +3,7 @@ import java.io.Serializable; class StateDescription implements Serializable { - + private static final long serialVersionUID = 1L; private final TaskState taskState; private final InteractionState interactionState; diff --git a/closure-compiler/src/main/java/org/wicketstuff/closurecompiler/ClosureCompilerJavaScriptCompressor.java b/closure-compiler/src/main/java/org/wicketstuff/closurecompiler/ClosureCompilerJavaScriptCompressor.java index bc34a91163..b0d979dcbb 100644 --- a/closure-compiler/src/main/java/org/wicketstuff/closurecompiler/ClosureCompilerJavaScriptCompressor.java +++ b/closure-compiler/src/main/java/org/wicketstuff/closurecompiler/ClosureCompilerJavaScriptCompressor.java @@ -4,7 +4,6 @@ import java.util.Arrays; import java.util.List; -import com.google.javascript.jscomp.SourceFile; import org.apache.wicket.javascript.IJavaScriptCompressor; import org.apache.wicket.util.lang.Args; import org.slf4j.Logger; @@ -14,8 +13,8 @@ import com.google.javascript.jscomp.CompilationLevel; import com.google.javascript.jscomp.Compiler; import com.google.javascript.jscomp.CompilerOptions; -import com.google.javascript.jscomp.JSSourceFile; import com.google.javascript.jscomp.Result; +import com.google.javascript.jscomp.SourceFile; /** *

@@ -23,7 +22,7 @@ *

* due to the amount of cpu used by closure compiler the generated javascript should definitely be * cached, e.g. using resource caching in wicket 1.5. - * + * * @author Peter Ertl */ public class ClosureCompilerJavaScriptCompressor implements IJavaScriptCompressor @@ -47,6 +46,7 @@ public void setLevel(CompilationLevel level) this.level = Args.notNull(level, "level"); } + @Override public String compress(String uncompressed) { try @@ -84,8 +84,8 @@ public final String compressSource(String uncompressed) throws Exception // TODO integrate logging into slf4j // input sources - final List inputs = new ArrayList(); - inputs.add(JSSourceFile.fromCode("custom", uncompressed)); + final List inputs = new ArrayList<>(); + inputs.add(SourceFile.fromCode("custom", uncompressed)); // compile input final Result result = compiler.compile(externs, inputs, options); diff --git a/console-parent/console-engine/pom.xml b/console-parent/console-engine/pom.xml index cae5fd444e..14ca52e788 100644 --- a/console-parent/console-engine/pom.xml +++ b/console-parent/console-engine/pom.xml @@ -63,7 +63,6 @@ -Xmx1024m - -XX:MaxPermSize=256m -target:jvm-1.5 diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/pom.xml b/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/pom.xml index 88858a4917..74fe1c4d07 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/pom.xml +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/pom.xml @@ -25,8 +25,12 @@ com.googlecode.wicked-charts - wicked-charts-wicket6 + wicked-charts-wicket7 ${wickedCharts.version} + + com.fasterxml.jackson.core + jackson-databind + diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/HighChartsWidget.java b/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/HighChartsWidget.java index af4a602379..9939476bb5 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/HighChartsWidget.java +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/HighChartsWidget.java @@ -12,9 +12,8 @@ */ package org.wicketstuff.dashboard.widgets.charts; -import com.googlecode.wickedcharts.highcharts.options.Options; -import com.googlecode.wickedcharts.highcharts.options.SeriesType; -import com.googlecode.wickedcharts.wicket6.highcharts.Chart; +import java.util.Map; + import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.Model; import org.wicketstuff.dashboard.AbstractWidget; @@ -24,7 +23,9 @@ import org.wicketstuff.dashboard.widgets.charts.settings.HighChartsSettingsPanel; import org.wicketstuff.dashboard.widgets.charts.settings.Settings; -import java.util.Map; +import com.googlecode.wickedcharts.highcharts.options.Options; +import com.googlecode.wickedcharts.highcharts.options.SeriesType; +import com.googlecode.wickedcharts.wicket7.highcharts.Chart; /** * @author Paul Bors @@ -78,9 +79,10 @@ public boolean hasSettings() { @Override public Panel createSettingsPanel(String settingsPanelId) { - return new HighChartsSettingsPanel(settingsPanelId, new Model(this)); + return new HighChartsSettingsPanel(settingsPanelId, new Model<>(this)); } + @Override public WidgetView createView(String viewId) { return new HighChartsWidgetView(viewId, new Model(this)); } diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/options/BasicAreaOptions.java b/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/options/BasicAreaOptions.java index 43b0dbf86c..be2e4cd26f 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/options/BasicAreaOptions.java +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/options/BasicAreaOptions.java @@ -12,6 +12,8 @@ */ package org.wicketstuff.dashboard.widgets.charts.options; +import java.util.Arrays; + import com.googlecode.wickedcharts.highcharts.options.Axis; import com.googlecode.wickedcharts.highcharts.options.ChartOptions; import com.googlecode.wickedcharts.highcharts.options.CssStyle; @@ -19,17 +21,15 @@ import com.googlecode.wickedcharts.highcharts.options.Marker; import com.googlecode.wickedcharts.highcharts.options.PlotOptions; import com.googlecode.wickedcharts.highcharts.options.PlotOptionsChoice; +import com.googlecode.wickedcharts.highcharts.options.PlotOptionsState; +import com.googlecode.wickedcharts.highcharts.options.PlotOptionsStateChoice; import com.googlecode.wickedcharts.highcharts.options.SeriesType; -import com.googlecode.wickedcharts.highcharts.options.State; -import com.googlecode.wickedcharts.highcharts.options.StatesChoice; import com.googlecode.wickedcharts.highcharts.options.Symbol; import com.googlecode.wickedcharts.highcharts.options.Title; import com.googlecode.wickedcharts.highcharts.options.Tooltip; import com.googlecode.wickedcharts.highcharts.options.series.Series; import com.googlecode.wickedcharts.highcharts.options.series.SimpleSeries; -import java.util.Arrays; - /** * @author Paul Bors */ @@ -63,10 +63,10 @@ public BasicAreaOptions() { setTooltip(new Tooltip()); - State hoverState = new State(); + PlotOptionsState hoverState = new PlotOptionsState(); hoverState.setEnabled(Boolean.TRUE); - StatesChoice statesChoice = new StatesChoice(); + PlotOptionsStateChoice statesChoice = new PlotOptionsStateChoice(); statesChoice.setHover(hoverState); Marker marker = new Marker(); diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/options/ScatterPlotOptions.java b/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/options/ScatterPlotOptions.java index 74a368fd10..b51256859b 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/options/ScatterPlotOptions.java +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/options/ScatterPlotOptions.java @@ -12,6 +12,9 @@ */ package org.wicketstuff.dashboard.widgets.charts.options; +import java.util.ArrayList; +import java.util.List; + import com.googlecode.wickedcharts.highcharts.options.Axis; import com.googlecode.wickedcharts.highcharts.options.ChartOptions; import com.googlecode.wickedcharts.highcharts.options.CssStyle; @@ -23,9 +26,9 @@ import com.googlecode.wickedcharts.highcharts.options.Marker; import com.googlecode.wickedcharts.highcharts.options.PlotOptions; import com.googlecode.wickedcharts.highcharts.options.PlotOptionsChoice; +import com.googlecode.wickedcharts.highcharts.options.PlotOptionsState; +import com.googlecode.wickedcharts.highcharts.options.PlotOptionsStateChoice; import com.googlecode.wickedcharts.highcharts.options.SeriesType; -import com.googlecode.wickedcharts.highcharts.options.State; -import com.googlecode.wickedcharts.highcharts.options.StatesChoice; import com.googlecode.wickedcharts.highcharts.options.Title; import com.googlecode.wickedcharts.highcharts.options.Tooltip; import com.googlecode.wickedcharts.highcharts.options.VerticalAlignment; @@ -35,9 +38,6 @@ import com.googlecode.wickedcharts.highcharts.options.series.Coordinate; import com.googlecode.wickedcharts.highcharts.options.series.CoordinatesSeries; -import java.util.ArrayList; -import java.util.List; - /** * @author Paul Bors */ @@ -48,7 +48,7 @@ public class ScatterPlotOptions extends ShowcaseOptions { private static final String MALE_DATA = "[[174.0,65.6],[175.3,71.8],[193.5,80.7],[186.5,72.6],[187.2,78.8],[181.5,74.8],[184.0,86.4],[184.5,78.4],[175.0,62.0],[184.0,81.6],[180.0,76.6],[177.8,83.6],[192.0,90.0],[176.0,74.6],[174.0,71.0],[184.0,79.6],[192.7,93.8],[171.5,70.0],[173.0,72.4],[176.0,85.9],[176.0,78.8],[180.5,77.8],[172.7,66.2],[176.0,86.4],[173.5,81.8],[178.0,89.6],[180.3,82.8],[180.3,76.4],[164.5,63.2],[173.0,60.9],[183.5,74.8],[175.5,70.0],[188.0,72.4],[189.2,84.1],[172.8,69.1],[170.0,59.5],[182.0,67.2],[170.0,61.3],[177.8,68.6],[184.2,80.1],[186.7,87.8],[171.4,84.7],[172.7,73.4],[175.3,72.1],[180.3,82.6],[182.9,88.7],[188.0,84.1],[177.2,94.1],[172.1,74.9],[167.0,59.1],[169.5,75.6],[174.0,86.2],[172.7,75.3],[182.2,87.1],[164.1,55.2],[163.0,57.0],[171.5,61.4],[184.2,76.8],[174.0,86.8],[174.0,72.2],[177.0,71.6],[186.0,84.8],[167.0,68.2],[171.8,66.1],[182.0,72.0],[167.0,64.6],[177.8,74.8],[164.5,70.0],[192.0,101.6],[175.5,63.2],[171.2,79.1],[181.6,78.9],[167.4,67.7],[181.1,66.0],[177.0,68.2],[174.5,63.9],[177.5,72.0],[170.5,56.8],[182.4,74.5],[197.1,90.9],[180.1,93.0],[175.5,80.9],[180.6,72.7],[184.4,68.0],[175.5,70.9],[180.6,72.5],[177.0,72.5],[177.1,83.4],[181.6,75.5],[176.5,73.0],[175.0,70.2],[174.0,73.4],[165.1,70.5],[177.0,68.9],[192.0,102.3],[176.5,68.4],[169.4,65.9],[182.1,75.7],[179.8,84.5],[175.3,87.7],[184.9,86.4],[177.3,73.2],[167.4,53.9],[178.1,72.0],[168.9,55.5],[157.2,58.4],[180.3,83.2],[170.2,72.7],[177.8,64.1],[172.7,72.3],[165.1,65.0],[186.7,86.4],[165.1,65.0],[174.0,88.6],[175.3,84.1],[185.4,66.8],[177.8,75.5],[180.3,93.2],[180.3,82.7],[177.8,58.0],[177.8,79.5],[177.8,78.6],[177.8,71.8],[177.8,116.4],[163.8,72.2],[188.0,83.6],[198.1,85.5],[175.3,90.9],[166.4,85.9],[190.5,89.1],[166.4,75.0],[177.8,77.7],[179.7,86.4],[172.7,90.9],[190.5,73.6],[185.4,76.4],[168.9,69.1],[167.6,84.5],[175.3,64.5],[170.2,69.1],[190.5,108.6],[177.8,86.4],[190.5,80.9],[177.8,87.7],[184.2,94.5],[176.5,80.2],[177.8,72.0],[180.3,71.4],[171.4,72.7],[172.7,84.1],[172.7,76.8],[177.8,63.6],[177.8,80.9],[182.9,80.9],[170.2,85.5],[167.6,68.6],[175.3,67.7],[165.1,66.4],[185.4,102.3],[181.6,70.5],[172.7,95.9],[190.5,84.1],[179.1,87.3],[175.3,71.8],[170.2,65.9],[193.0,95.9],[171.4,91.4],[177.8,81.8],[177.8,96.8],[167.6,69.1],[167.6,82.7],[180.3,75.5],[182.9,79.5],[176.5,73.6],[186.7,91.8],[188.0,84.1],[188.0,85.9],[177.8,81.8],[174.0,82.5],[177.8,80.5],[171.4,70.0],[185.4,81.8],[185.4,84.1],[188.0,90.5],[188.0,91.4],[182.9,89.1],[176.5,85.0],[175.3,69.1],[175.3,73.6],[188.0,80.5],[188.0,82.7],[175.3,86.4],[170.5,67.7],[179.1,92.7],[177.8,93.6],[175.3,70.9],[182.9,75.0],[170.8,93.2],[188.0,93.2],[180.3,77.7],[177.8,61.4],[185.4,94.1],[168.9,75.0],[185.4,83.6],[180.3,85.5],[174.0,73.9],[167.6,66.8],[182.9,87.3],[160.0,72.3],[180.3,88.6],[167.6,75.5],[186.7,101.4],[175.3,91.1],[175.3,67.3],[175.9,77.7],[175.3,81.8],[179.1,75.5],[181.6,84.5],[177.8,76.6],[182.9,85.0],[177.8,102.5],[184.2,77.3],[179.1,71.8],[176.5,87.9],[188.0,94.3],[174.0,70.9],[167.6,64.5],[170.2,77.3],[167.6,72.3],[188.0,87.3],[174.0,80.0],[176.5,82.3],[180.3,73.6],[167.6,74.1],[188.0,85.9],[180.3,73.2],[167.6,76.3],[183.0,65.9],[183.0,90.9],[179.1,89.1],[170.2,62.3],[177.8,82.7],[179.1,79.1],[190.5,98.2],[177.8,84.1],[180.3,83.2],[180.3,83.2]]"; private static List> fromJSON(String jsonArray) { - List> seriesData = new ArrayList>(); + List> seriesData = new ArrayList<>(); // reformat into xValue,yValue;xValue,yValue String data = jsonArray @@ -109,17 +109,17 @@ public ScatterPlotOptions() { legend.setBorderWidth(1); setLegend(legend); - State markerState = new State(); + PlotOptionsState markerState = new PlotOptionsState(); markerState.setEnabled(Boolean.TRUE); - StatesChoice markerStatesChoice = new StatesChoice(); + PlotOptionsStateChoice markerStatesChoice = new PlotOptionsStateChoice(); markerStatesChoice.setHover(markerState); - State hoverState = new State(); + PlotOptionsState hoverState = new PlotOptionsState(); hoverState.setEnabled(Boolean.TRUE); hoverState.setLineColor(new RgbaColor(100, 100, 100)); - StatesChoice statesChoice = new StatesChoice(); + PlotOptionsStateChoice statesChoice = new PlotOptionsStateChoice(); statesChoice.setHover(hoverState); Marker marker = new Marker(); diff --git a/dashboard-parent/dashboard-widgets/pom.xml b/dashboard-parent/dashboard-widgets/pom.xml index a86fa75f1c..0862cc7785 100644 --- a/dashboard-parent/dashboard-widgets/pom.xml +++ b/dashboard-parent/dashboard-widgets/pom.xml @@ -19,7 +19,7 @@ ${project.version} 1.0 1.0.1 - 1.5.0 + 2.0.1 diff --git a/dashboard-parent/pom.xml b/dashboard-parent/pom.xml index a5b9996dbe..595a358c18 100644 --- a/dashboard-parent/pom.xml +++ b/dashboard-parent/pom.xml @@ -31,8 +31,6 @@ UTF-8 - 1.7.21 - 1.2.17 diff --git a/datastores-parent/datastore-cassandra/pom.xml b/datastores-parent/datastore-cassandra/pom.xml index f64f1dc3f2..543c289fbe 100644 --- a/datastores-parent/datastore-cassandra/pom.xml +++ b/datastores-parent/datastore-cassandra/pom.xml @@ -31,8 +31,7 @@ com.datastax.cassandra cassandra-driver-core - - 1.0.5 + 3.3.0 - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - com.fasterxml.jackson.core jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - javax.servlet diff --git a/jasperreports-parent/jasperreports/pom.xml b/jasperreports-parent/jasperreports/pom.xml index a7f35208a5..06c59eec3d 100644 --- a/jasperreports-parent/jasperreports/pom.xml +++ b/jasperreports-parent/jasperreports/pom.xml @@ -33,7 +33,6 @@ net.sf.jasperreports jasperreports - 5.5.0 diff --git a/jee-web-parent/jee-web-examples/src/main/webapp/TestPage.jsp b/jee-web-parent/jee-web-examples/src/main/webapp/TestPage.jsp index 17204459b7..58119f1b73 100644 --- a/jee-web-parent/jee-web-examples/src/main/webapp/TestPage.jsp +++ b/jee-web-parent/jee-web-examples/src/main/webapp/TestPage.jsp @@ -41,10 +41,10 @@ var urlWithPrerenderedArgs = '${wicket:ajaxCallbackUrlWithQuery("param=value")}'; - setTimeout(function(){ + setTimeout(function(){ var url = '${wicket:ajaxCallbackUrl()}'; - console.log(url); - var url = Wicket.Ajax.applyGetParameters(url,{"param":"This is the changed text."}); + console.log(url); + var url = Wicket.Ajax.applyGetParameters(url,{"param":"This is the changed text."}); Wicket.Ajax.wrapget(url); },3000); } diff --git a/jee-web-parent/jee-web/src/main/java/org/wicketstuff/jeeweb/JEEWebResolver.java b/jee-web-parent/jee-web/src/main/java/org/wicketstuff/jeeweb/JEEWebResolver.java index 26a3fbfbf7..a6acf1a94e 100644 --- a/jee-web-parent/jee-web/src/main/java/org/wicketstuff/jeeweb/JEEWebResolver.java +++ b/jee-web-parent/jee-web/src/main/java/org/wicketstuff/jeeweb/JEEWebResolver.java @@ -28,6 +28,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.ServletRegistration; import javax.servlet.ServletRequest; +import javax.servlet.WriteListener; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; @@ -68,9 +69,9 @@ * https://cwiki.apache.org/confluence/display/WICKET/Including+JSP+files+in+ HTML+templates
* http://apache-wicket.1842946.n4.nabble.com/Wicket-1-5-and-JSP-servlet- wrapping-td4407174.html
*
- * + * * @see org.apache.wicket.protocol.http.WebApplication.init() - * + * * @author Tobias Soloschenko */ public class JEEWebResolver implements IComponentResolver @@ -199,7 +200,7 @@ public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) /** * Handles missing files. - * + * * @param context * the servlet context * @throws WicketRuntimeException @@ -252,7 +253,7 @@ private void handleMissingResource(ServletContext context) throws WicketRuntimeE /** * This method throws an exception if wicket is configured to throw an exception for missing * resources, or gives a warning message through the logging mechanism. - * + * * @param context * the context to be printed. * @param type @@ -277,7 +278,7 @@ private void promptMissingResource(ServletContext context, Type type) /** * Checks if an exception should be thrown, if a resource file is missing. - * + * * @return if an exception should be thrown */ private boolean shouldThrowExceptionForMissingFile() @@ -303,6 +304,15 @@ public void write(int param) throws IOException { baos.write(param); } + + @Override + public boolean isReady() { + return true; + } + + @Override + public void setWriteListener(WriteListener writeListener) { + } } /** diff --git a/jqplot-parent/jqplot-examples/pom.xml b/jqplot-parent/jqplot-examples/pom.xml index cd77bebcca..710e2a98cb 100644 --- a/jqplot-parent/jqplot-examples/pom.xml +++ b/jqplot-parent/jqplot-examples/pom.xml @@ -29,12 +29,12 @@ - + ${project.groupId} jqplot ${project.version} - + org.slf4j slf4j-api diff --git a/jqplot-parent/jqplot-examples/src/main/java/org/wicketstuff/jqplot/examples/HomePage.java b/jqplot-parent/jqplot-examples/src/main/java/org/wicketstuff/jqplot/examples/HomePage.java index cfb98cf399..135358ce5d 100644 --- a/jqplot-parent/jqplot-examples/src/main/java/org/wicketstuff/jqplot/examples/HomePage.java +++ b/jqplot-parent/jqplot-examples/src/main/java/org/wicketstuff/jqplot/examples/HomePage.java @@ -53,7 +53,7 @@ public HomePage(final PageParameters parameters) { } private void addChartWithImage() { - PieChart pieChart = new PieChart("Pizza Chart Custom Legend"); + PieChart pieChart = new PieChart<>("Pizza Chart Custom Legend"); pieChart.addValue("Drops", 10f); pieChart.addValue("Chocolate", 20f); pieChart.addValue("Jujuba", 5f); @@ -98,7 +98,7 @@ public void onClick(AjaxRequestTarget target) { public AreaChart areaChart1() { - AreaChart areaChart = new AreaChart("Area chart Example"); + AreaChart areaChart = new AreaChart<>("Area chart Example"); areaChart.addValue(Arrays.asList(11, 9, 5, 12, 14)); areaChart.addValue(Arrays.asList(4, 8, 5, 3, 6)); areaChart.addValue(Arrays.asList(12, 6, 13, 11, 2)); @@ -113,7 +113,7 @@ public AreaChart areaChart1() { public AreaChart areaChart2() { - AreaChart areaChart = new AreaChart("Area chart Example"); + AreaChart areaChart = new AreaChart<>("Area chart Example"); areaChart.addValue(Arrays.asList(11, 9, 5, 12, 14, 8, 7, 9, 6, 11, 9, 3, 4)); areaChart.addValue(Arrays.asList(4, 8, 5, 3, 6, 5, 3, 2, 6, 7, 4, 3, 2)); areaChart.addValue(Arrays.asList(12, 6, 13, 11, 2, 3, 4, 2, 1, 5, 7, 4, 8)); @@ -122,7 +122,7 @@ public AreaChart areaChart2() { .xAxisInstance() .setTicks(new String[]{"Dec 10", "Jan 11", "Feb 11", "Mar 11", "Apr 11", "May 11", "Jun 11", "Jul 11", "Aug 11", "Sep 11", "Oct 11", "Nov 11", "Dec 11"}); - Collection series = new ArrayList(); + Collection series = new ArrayList<>(); series.add(new Serie("Beans")); series.add(new Serie("Orange")); series.add(new Serie("Crackers")); @@ -144,8 +144,8 @@ public AreaChart areaChart2() { return areaChart; } - private PieChart pieChart2() { - PieChart pieChart = new PieChart("Pizza Chart Custom Legend"); + private static PieChart pieChart2() { + PieChart pieChart = new PieChart<>("Pizza Chart Custom Legend"); pieChart.addValue("Drops", 10f); pieChart.addValue("Chocolate", 20f); pieChart.addValue("Jujuba", 5f); @@ -167,27 +167,27 @@ private PieChart pieChart2() { } private void addTestLineChartWithTicks() { - List> cosPoints = new ArrayList>(); + List> cosPoints = new ArrayList<>(); for (double i = 0; i < 2 * Math.PI; i++) { - cosPoints.add(new LineSeriesItem(i, Math.cos(i))); + cosPoints.add(new LineSeriesItem<>(i, Math.cos(i))); } - List> sinPoints = new ArrayList>(); + List> sinPoints = new ArrayList<>(); for (double i = 0; i < 2 * Math.PI; i += 0.4) { - sinPoints.add(new LineSeriesItem(i, 2 * Math.sin(i - .8))); + sinPoints.add(new LineSeriesItem<>(i, 2 * Math.sin(i - .8))); } - List> powPoints1 = new ArrayList>(); + List> powPoints1 = new ArrayList<>(); for (double i = 0; i < 2 * Math.PI; i++) { - powPoints1.add(new LineSeriesItem(i, 2.5 + Math.pow(i / 4, 2))); + powPoints1.add(new LineSeriesItem<>(i, 2.5 + Math.pow(i / 4, 2))); } - List> powPoints2 = new ArrayList>(); + List> powPoints2 = new ArrayList<>(); for (double i = 0; i < 2 * Math.PI; i++) { - powPoints2.add(new LineSeriesItem(i, -2.5 - Math.pow(i / 4, 2))); + powPoints2.add(new LineSeriesItem<>(i, -2.5 - Math.pow(i / 4, 2))); } - LineSeriesChart lineChart = new LineSeriesChart( + LineSeriesChart lineChart = new LineSeriesChart<>( "Line Style Options"); lineChart.addValue(cosPoints); lineChart.addValue(sinPoints); @@ -210,28 +210,28 @@ private void addTestLineChartWithTicks() { } - private LineSeriesChart lineSeries() { - List> cosPoints = new ArrayList>(); + private static LineSeriesChart lineSeries() { + List> cosPoints = new ArrayList<>(); for (double i = 0; i < 2 * Math.PI; i++) { - cosPoints.add(new LineSeriesItem(i, Math.cos(i))); + cosPoints.add(new LineSeriesItem<>(i, Math.cos(i))); } - List> sinPoints = new ArrayList>(); + List> sinPoints = new ArrayList<>(); for (double i = 0; i < 2 * Math.PI; i += 0.4) { - sinPoints.add(new LineSeriesItem(i, 2 * Math.sin(i - .8))); + sinPoints.add(new LineSeriesItem<>(i, 2 * Math.sin(i - .8))); } - List> powPoints1 = new ArrayList>(); + List> powPoints1 = new ArrayList<>(); for (double i = 0; i < 2 * Math.PI; i++) { - powPoints1.add(new LineSeriesItem(i, 2.5 + Math.pow(i / 4, 2))); + powPoints1.add(new LineSeriesItem<>(i, 2.5 + Math.pow(i / 4, 2))); } - List> powPoints2 = new ArrayList>(); + List> powPoints2 = new ArrayList<>(); for (double i = 0; i < 2 * Math.PI; i++) { - powPoints2.add(new LineSeriesItem(i, -2.5 - Math.pow(i / 4, 2))); + powPoints2.add(new LineSeriesItem<>(i, -2.5 - Math.pow(i / 4, 2))); } - LineSeriesChart lineChart = new LineSeriesChart( + LineSeriesChart lineChart = new LineSeriesChart<>( "Line Style Options"); lineChart.addValue(cosPoints); lineChart.addValue(sinPoints); @@ -253,8 +253,8 @@ private LineSeriesChart lineSeries() { return lineChart; } - private BarChart barChart2() { - BarChart barChart2 = new BarChart("Bar Chart with Custom Colors"); + private static BarChart barChart2() { + BarChart barChart2 = new BarChart<>("Bar Chart with Custom Colors"); barChart2 .getChartConfiguration() .xAxisInstance() @@ -266,8 +266,8 @@ private BarChart barChart2() { return barChart2; } - private BarChart barChart1() { - BarChart barChart1 = new BarChart("Bar Chart"); + private static BarChart barChart1() { + BarChart barChart1 = new BarChart<>("Bar Chart"); Legend legend = new Legend(); legend.setShow(true); legend.setPlacement("outsideGrid"); @@ -287,18 +287,18 @@ private BarChart barChart1() { return barChart1; } - private LabeledLineChart lineChart2() { - LabeledLineChart chart2 = new LabeledLineChart("Labeled Line Charts", + private static LabeledLineChart lineChart2() { + LabeledLineChart chart2 = new LabeledLineChart<>("Labeled Line Charts", "Incliment Occurrance", "Incliment Factor", 15); - chart2.addValue(new LabeledItem("1/1/2008", 42)); - chart2.addValue(new LabeledItem("2/14/2008", 56)); - chart2.addValue(new LabeledItem("3/7/2008", 39)); - chart2.addValue(new LabeledItem("4/22/2008", 81)); + chart2.addValue(new LabeledItem<>("1/1/2008", 42)); + chart2.addValue(new LabeledItem<>("2/14/2008", 56)); + chart2.addValue(new LabeledItem<>("3/7/2008", 39)); + chart2.addValue(new LabeledItem<>("4/22/2008", 81)); return chart2; } - private LineChart lineChart1() { - LineChart lineChart = new LineChart("Line Charts"); + private static LineChart lineChart1() { + LineChart lineChart = new LineChart<>("Line Charts"); lineChart.addValue(1); lineChart.addValue(2); lineChart.addValue(3); @@ -307,7 +307,7 @@ private LineChart lineChart1() { } public PieChart pieChart1() { - PieChart pieChart1 = new PieChart("Pie Charts"); + PieChart pieChart1 = new PieChart<>("Pie Charts"); pieChart1.addValue("Banana", 10f); pieChart1.addValue("Chocolate", 20f); pieChart1.addValue("Peperone", 5f); diff --git a/jqplot-parent/jqplot/pom.xml b/jqplot-parent/jqplot/pom.xml index 179030dffb..af3db8290c 100644 --- a/jqplot-parent/jqplot/pom.xml +++ b/jqplot-parent/jqplot/pom.xml @@ -15,7 +15,7 @@ JqPlot Plugin Integration for Apache Wicket - 1.4.9 + 1.4.10 diff --git a/minis-parent/minis/src/test/java/org/wicketstuff/minis/behavior/apanel/TestRenderers.java b/minis-parent/minis/src/test/java/org/wicketstuff/minis/behavior/apanel/TestRenderers.java index 7a411bff83..248870cfa2 100644 --- a/minis-parent/minis/src/test/java/org/wicketstuff/minis/behavior/apanel/TestRenderers.java +++ b/minis-parent/minis/src/test/java/org/wicketstuff/minis/behavior/apanel/TestRenderers.java @@ -78,6 +78,7 @@ public TestPanel(final String id) super(id); } + @Override public IResourceStream getMarkupResourceStream(final MarkupContainer container, final Class containerClass) { @@ -116,7 +117,7 @@ public void testLabel() @Test public void testLink() { - final Link link = new Link("link") + final Link link = new Link("link") { private static final long serialVersionUID = 1L; diff --git a/openlayers3-parent/openlayers3-examples/src/main/java/org/wicketstuff/openlayers3/examples/base/BasePage.java b/openlayers3-parent/openlayers3-examples/src/main/java/org/wicketstuff/openlayers3/examples/base/BasePage.java index c5b3a5282c..532dc4756a 100644 --- a/openlayers3-parent/openlayers3-examples/src/main/java/org/wicketstuff/openlayers3/examples/base/BasePage.java +++ b/openlayers3-parent/openlayers3-examples/src/main/java/org/wicketstuff/openlayers3/examples/base/BasePage.java @@ -16,7 +16,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.html.HtmlTag; import de.agilecoders.wicket.core.markup.html.bootstrap.html.IeEdgeMetaTag; import de.agilecoders.wicket.core.markup.html.bootstrap.html.MetaTag; -import de.agilecoders.wicket.core.markup.html.bootstrap.html.OptimizedMobileViewportMetaTag; +import de.agilecoders.wicket.core.markup.html.bootstrap.html.MobileViewportMetaTag; import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.Navbar; /** @@ -60,7 +60,7 @@ protected void onInitialize() { // add Bootstrap add(new BootstrapBaseBehavior()); - add(new OptimizedMobileViewportMetaTag("viewport")); + add(new MobileViewportMetaTag("viewport")); add(new IeEdgeMetaTag("chrome-frame")); add(new MetaTag("description", Model.of("description"), getPageDescriptionModel())); add(new MetaTag("author", Model.of("author"), getPageAuthorModel())); diff --git a/phonebook/pom.xml b/phonebook/pom.xml index e86e61184e..dc5610d4c3 100644 --- a/phonebook/pom.xml +++ b/phonebook/pom.xml @@ -140,7 +140,6 @@ org.apache.maven.plugins maven-site-plugin - 2.1.1 ${basedir}/src/site/template/ diff --git a/pom.xml b/pom.xml index caf2747837..521f418814 100644 --- a/pom.xml +++ b/pom.xml @@ -257,19 +257,20 @@ false false - 4.3.11.Final - 3.20.0-GA - 9.3.10.v20160621 - 2.0.1 - 1.2.6 - 1.7.22 - 1.1.10 + 5.2.10.Final + 3.21.0-GA + 9.4.6.v20170531 + 2.1.1 + 1.4.0 + 1.7.25 + 1.2.3 1.2.17 - 4.3.1.RELEASE - 3.2.4 - 2.5 - 2.12.1 - 2.8.5 + 4.3.10.RELEASE + 3.2.5 + 2.6 + 2.12.3 + 2.9.0 + 3.16 @@ -358,9 +359,9 @@ wicket-foundation dashboard-parent jamon-parent - wicketstuff-rest-lambda - wicketstuff-lambda-components - + wicketstuff-rest-lambda + wicketstuff-lambda-components + @@ -448,7 +449,7 @@ commons-logging commons-logging - 1.1.3 + 1.2 true runtime @@ -496,7 +497,7 @@ javax.servlet javax.servlet-api - 3.0.1 + 3.1.0 provided @@ -508,13 +509,13 @@ org.easymock easymock - 3.2 + 3.4 test org.mockito mockito-core - 2.2.22 + 2.8.47 test @@ -533,7 +534,7 @@ org.testng testng - 6.8.8 + 6.11 test @@ -541,12 +542,12 @@ commons-beanutils commons-beanutils - 1.8.3 + 1.9.3 org.apache.commons commons-collections4 - 4.0 + 4.1 org.apache.commons @@ -556,7 +557,7 @@ org.apache.commons commons-lang3 - 3.3.2 + 3.6 @@ -585,7 +586,7 @@ javax.validation validation-api - 1.1.0.Final + 2.0.0.Final org.javassist @@ -611,7 +612,7 @@ org.hibernate hibernate-validator - 5.1.0.Final + 6.0.1.Final @@ -684,7 +685,7 @@ com.google.javascript closure-compiler - v20131014 + v20170626 com.ibatis @@ -697,29 +698,29 @@ 1.13 - com.google.code.gson - gson - 2.8.0 + com.google.code.gson + gson + 2.8.1 - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} - de.agilecoders.wicket - wicket-bootstrap-core - 0.10.0 + de.agilecoders.wicket + wicket-bootstrap-core + 0.10.16 net.sf.jasperreports jasperreports - 5.5.1 + 6.4.1 joda-time joda-time - 2.8.1 + 2.9.9 net.sf.ehcache @@ -745,22 +746,22 @@ org.apache.poi poi - 3.10-FINAL + ${poi.version} org.apache.poi poi-ooxml - 3.12 + ${poi.version} org.clojure clojure - 1.6.0 + 1.8.0 org.codehaus.groovy groovy - 2.4.3 + 2.4.12 org.osgi @@ -777,7 +778,7 @@ org.python jython-standalone - 2.7.0 + 2.7.1 org.scala-lang @@ -814,7 +815,7 @@ org.hsqldb hsqldb - 2.3.2 + 2.4.0 runtime @@ -887,7 +888,6 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.1 ${deployment.disabled} @@ -895,7 +895,6 @@ org.apache.maven.plugins maven-source-plugin - 2.4 ${sources.disabled} @@ -930,7 +929,6 @@ org.apache.felix maven-bundle-plugin - 2.5.3 true true diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java index e41f0d0545..3b1229d6e7 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java @@ -31,7 +31,7 @@ /** * Page to demo the inplace edit label {@link AjaxEditableLabel} - * + * * @author Igor Vaynberg (ivaynberg) */ public class EditableLabelPage extends BasePage @@ -67,7 +67,7 @@ public String getObject() } })); - form.add(new Link("refresh-link") + form.add(new Link("refresh-link") { @Override public void onClick() diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java index e25f2743d4..de3a3cb32f 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java @@ -33,7 +33,7 @@ /** * Home page for the roles example. - * + * * @author Eelco Hillenius */ public class Index extends BasePage @@ -50,7 +50,7 @@ public Index() protected void populateItem(ListItem item) { final User user = item.getModelObject(); - item.add(new Link("selectUserLink") + item.add(new Link("selectUserLink") { @Override public void onClick() @@ -64,7 +64,7 @@ public void onClick() // pages that are protected using wicket meta data add(new BookmarkablePageLink<>("adminBookmarkableLink", AdminBookmarkablePage.class)); - add(new Link("adminInternalLink") + add(new Link("adminInternalLink") { @Override public void onClick() @@ -77,7 +77,7 @@ public void onClick() // pages that are protected using annotations add(new BookmarkablePageLink("adminAnnotBookmarkableLink", AdminAnnotationsBookmarkablePage.class)); - add(new Link("adminAnnotInternalLink") + add(new Link("adminAnnotInternalLink") { @Override public void onClick() diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.java index 66e68c5ddb..9b2c0af1bd 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.java @@ -25,7 +25,7 @@ /** * Page with examples on {@link org.apache.wicket.markup.html.link.Link}. - * + * * @author Eelco Hillenius */ public class LinkPage extends WicketExamplePage @@ -42,7 +42,7 @@ public LinkPage() // add a link which, when clicked, increases our counter when a link is clicked, its onClick // method is called - Link link1 = new Link("link1") + Link link1 = new Link("link1") { @Override public void onClick() @@ -67,7 +67,7 @@ public String getObject() // because of this, and pressing the back button and clicking the link again would revert to // the older value. The same thing could have been achieved by using setModelObject, // which implicitly registers a state change (of type ComponentModelChange). - Link linkWithStateChange = new Link("linkWithStateChange") + Link linkWithStateChange = new Link("linkWithStateChange") { @Override public void onClick() @@ -85,13 +85,13 @@ public void onClick() // it is of course possible to - instead of the above approach - hide as much of the // component as possible within a class. - class CustomLink extends Link + class CustomLink extends Link { final Count count2; /** * Construct. - * + * * @param id */ public CustomLink(String id) @@ -111,13 +111,13 @@ public void onClick() // and if we know we are going to attach it to a ("link1") { @Override public void onClick() diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/compref/NonBookmarkablePage.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/compref/NonBookmarkablePage.java index 6e4d606f99..6348257d3a 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/compref/NonBookmarkablePage.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/compref/NonBookmarkablePage.java @@ -22,14 +22,14 @@ /** * Example page that cannot be bookmarked. A page is bookmarkable when it has a public default * constructor and/or a constructor with a {@link org.apache.wicket.request.mapper.parameter.PageParameters} argument. - * + * * @author Eelco Hillenius */ public class NonBookmarkablePage extends WebPage { /** * Constructor. - * + * * @param referer * the refering page */ @@ -45,7 +45,7 @@ public NonBookmarkablePage(final WebPage referer) // constructor with the Page instance argument, because we allready have // a page instance // at our disposal - add(new Link("navigateBackLink") + add(new Link("navigateBackLink") { @Override public void onClick() diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java index 7c521b016d..1ce4f29caa 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java @@ -76,7 +76,7 @@ private final class LocaleDropDownChoice extends DropDownChoice { /** * Construct. - * + * * @param id * component id */ @@ -135,7 +135,7 @@ public DatesPage() selectedLocale = Session.get().getLocale(); Form localeForm = new Form<>("localeForm"); localeForm.add(new LocaleDropDownChoice("localeSelect")); - localeForm.add(new Link("localeUSLink") + localeForm.add(new Link("localeUSLink") { @Override public void onClick() diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java index b177e73cf0..29a5f4d9a0 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java @@ -28,7 +28,7 @@ * {@link org.apache.wicket.examples.frames.BodyFrame} and hold in the same page map as index. It * uses the frameTarget object as a shared model; this page updates that model, and as the Index * uses that to set the frame tag, any changes to it should be reflected with the next render. - * + * * @author Eelco Hillenius */ public class LeftFrame extends WebPage @@ -40,7 +40,7 @@ public class LeftFrame extends WebPage * Tags that use this link should have a target="_parent" attribute, so that the * top frame will be refreshed. */ - private static final class ChangeFramePageLink extends Link + private static final class ChangeFramePageLink extends Link { private static final long serialVersionUID = 1L; @@ -52,9 +52,9 @@ private static final class ChangeFramePageLink extends Link /** * Construct. - * + * * @param - * + * * @param id * @param bodyFrame * @param pageClass @@ -85,7 +85,7 @@ public void onClick() /** * Constructor - * + * * @param index * parent frame class */ @@ -99,7 +99,7 @@ public LeftFrame(BodyFrame index) /** * No need for versioning this frame. - * + * * @see org.apache.wicket.Component#isVersioned() */ @Override diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java index 5db265376a..2b51dd9220 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java @@ -41,7 +41,6 @@ import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.request.mapper.parameter.INamedParameters; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.SharedResourceReference; import org.apache.wicket.util.file.Files; @@ -50,7 +49,7 @@ /** * Demonstrates different flavors of hyperlinks. - * + * * @author Jonathan Locke */ public class Home extends WicketExamplePage @@ -67,7 +66,7 @@ public class Home extends WicketExamplePage public Home() { // Action link counts link clicks - final Link actionLink = new Link("actionLink") + final Link actionLink = new Link("actionLink") { @Override public void onClick() @@ -80,7 +79,7 @@ public void onClick() add(actionLink); // Action link counts link clicks on works with onclick handler - final Link actionOnClickLink = new Link("actionOnClickLink") + final Link actionOnClickLink = new Link("actionOnClickLink") { @Override public void onClick() @@ -184,7 +183,7 @@ public File getObject() add(feedbackPanel); add(new RedirectForm("redirectForm")); - Link linkToAnchor = new Link("linkToAnchor") + Link linkToAnchor = new Link("linkToAnchor") { @Override public void onClick() @@ -192,7 +191,7 @@ public void onClick() } }; add(linkToAnchor); - Link anotherlinkToAnchor = new Link("anotherlinkToAnchor") + Link anotherlinkToAnchor = new Link("anotherlinkToAnchor") { @Override public void onClick() @@ -227,7 +226,7 @@ private final class RedirectForm extends Form /** * Construct. - * + * * @param id * component id */ @@ -249,7 +248,7 @@ protected void onSubmit() /** * Gets the redirectUrl. - * + * * @return redirectUrl */ public String getRedirectUrl() @@ -259,7 +258,7 @@ public String getRedirectUrl() /** * Sets the redirectUrl. - * + * * @param redirectUrl * redirectUrl */ @@ -288,7 +287,7 @@ public void setLinkClickCount(final int linkClickCount) /** * Gets onClickLinkClickCount. - * + * * @return onClickLinkClickCount */ public int getOnClickLinkClickCount() @@ -298,7 +297,7 @@ public int getOnClickLinkClickCount() /** * Sets onClickLinkClickCount. - * + * * @param onClickLinkClickCount * onClickLinkClickCount */ diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/pub/Home.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/pub/Home.java index ee35e611b0..aa684ee45f 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/pub/Home.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/pub/Home.java @@ -31,7 +31,7 @@ /** * Demonstrates localization. - * + * * @author Jonathan Locke * @author Eelco Hillenius */ @@ -39,7 +39,7 @@ public final class Home extends WicketExamplePage { /** * Constructor - * + * * @param parameters * Page parameters (ignored since this is the home page) */ @@ -66,7 +66,7 @@ public Home(final PageParameters parameters) // Add a couple of links to be able to play around with the session // locale - add(new Link("goCanadian") + add(new Link("goCanadian") { @Override public void onClick() @@ -74,7 +74,7 @@ public void onClick() getSession().setLocale(Locale.CANADA); } }); - add(new Link("goUS") + add(new Link("goUS") { @Override public void onClick() @@ -82,7 +82,7 @@ public void onClick() getSession().setLocale(Locale.US); } }); - add(new Link("goDutch") + add(new Link("goDutch") { @Override public void onClick() @@ -90,7 +90,7 @@ public void onClick() getSession().setLocale(new Locale("nl", "NL")); } }); - add(new Link("goGerman") + add(new Link("goGerman") { @Override public void onClick() @@ -98,7 +98,7 @@ public void onClick() getSession().setLocale(new Locale("de", "DE")); } }); - add(new Link("goChinese") + add(new Link("goChinese") { @Override public void onClick() @@ -106,7 +106,7 @@ public void onClick() getSession().setLocale(new Locale("zh", "CN")); } }); - add(new Link("goDanish") + add(new Link("goDanish") { @Override public void onClick() @@ -114,7 +114,7 @@ public void onClick() getSession().setLocale(new Locale("da", "DK")); } }); - add(new Link("goKorean") + add(new Link("goKorean") { @Override public void onClick() @@ -122,7 +122,7 @@ public void onClick() getSession().setLocale(new Locale("ko", "KR")); } }); - add(new Link("goHungarian") + add(new Link("goHungarian") { @Override public void onClick() diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java index c65460fd1a..973c08a669 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java @@ -29,7 +29,7 @@ /** * Demonstrates localization. - * + * * @author Jonathan Locke * @author Eelco Hillenius */ @@ -37,7 +37,7 @@ public final class Home extends WicketExamplePage { /** * Constructor - * + * * @param parameters * Page parameters (ignored since this is the home page) */ @@ -62,7 +62,7 @@ public Home(final PageParameters parameters) // Add a couple of links to be able to play around with the session // locale - add(new Link("goCanadian") + add(new Link("goCanadian") { @Override public void onClick() @@ -70,7 +70,7 @@ public void onClick() getSession().setLocale(Locale.CANADA); } }); - add(new Link("goUS") + add(new Link("goUS") { @Override public void onClick() @@ -78,7 +78,7 @@ public void onClick() getSession().setLocale(Locale.US); } }); - add(new Link("goDutch") + add(new Link("goDutch") { @Override public void onClick() @@ -86,7 +86,7 @@ public void onClick() getSession().setLocale(new Locale("nl", "NL")); } }); - add(new Link("goGerman") + add(new Link("goGerman") { @Override public void onClick() @@ -94,7 +94,7 @@ public void onClick() getSession().setLocale(new Locale("de", "DE")); } }); - add(new Link("goChinese") + add(new Link("goChinese") { @Override public void onClick() @@ -102,7 +102,7 @@ public void onClick() getSession().setLocale(new Locale("zh", "CN")); } }); - add(new Link("goDanish") + add(new Link("goDanish") { @Override public void onClick() @@ -110,7 +110,7 @@ public void onClick() getSession().setLocale(new Locale("da", "DK")); } }); - add(new Link("goKorean") + add(new Link("goKorean") { @Override public void onClick() @@ -118,7 +118,7 @@ public void onClick() getSession().setLocale(new Locale("ko", "KR")); } }); - add(new Link("goHungarian") + add(new Link("goHungarian") { @Override public void onClick() diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java index f6a663edba..cd733f7fd6 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java @@ -25,7 +25,7 @@ /** * Base page for component demo pages. - * + * * @author igor */ public class BasePage extends ExamplePage @@ -57,7 +57,7 @@ public String getSelectedContactLabel() } /** - * + * */ class ActionPanel extends Panel { @@ -70,7 +70,7 @@ class ActionPanel extends Panel public ActionPanel(String id, IModel model) { super(id, model); - add(new Link("select") + add(new Link("select") { @Override public void onClick() @@ -91,7 +91,7 @@ public Contact getSelected() /** * sets selected contact - * + * * @param selected */ public void setSelected(Contact selected) diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java index 58dcdfeac1..66baca7787 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java @@ -125,7 +125,7 @@ private class ActionPanel extends Panel public ActionPanel(String id, IModel model) { super(id, model); - add(new Link("select") + add(new Link("select") { @Override public void onClick() diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java index 0dc1d61afb..d9096bdd3e 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java @@ -28,13 +28,13 @@ /** * Another page of the stateless example. - * + * * @author Eelco Hillenius */ public class StatefulPage extends WicketExamplePage { /** - * + * */ private static final long serialVersionUID = 1L; @@ -50,7 +50,7 @@ public StatefulPage() add(new BookmarkablePageLink<>("indexLink", Index.class)); // Action link counts link clicks - final Link actionLink = new Link("actionLink") + final Link actionLink = new Link("actionLink") { @Override public void onClick() @@ -83,7 +83,7 @@ protected void onSubmit() /** * Gets linkClickCount. - * + * * @return linkClickCount */ public int getLinkClickCount() @@ -93,7 +93,7 @@ public int getLinkClickCount() /** * Sets linkClickCount. - * + * * @param linkClickCount * linkClickCount */ diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java index 0e8c961b06..228008007b 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java @@ -25,7 +25,7 @@ /** * Border that holds layout elements that can be reused by pages. - * + * * @author Eelco Hillenius */ public class TemplateBorder extends Border @@ -35,14 +35,14 @@ public class TemplateBorder extends Border /** * Constructor - * + * * @param id */ public TemplateBorder(String id) { super(id); addToBorder(currentBanner = new Banner1("ad")); - addToBorder(new Link("changeAdLink") + addToBorder(new Link("changeAdLink") { /** * @see org.apache.wicket.markup.html.link.Link#onClick() diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java index 485386d989..ec62587892 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java @@ -28,7 +28,7 @@ /** * Base page that serves as a template for pages that inherit from it. Doesn't have to be abstract, * but was made abstract here to stress the fact that this page is not meant for direct use. - * + * * @author Eelco Hillenius */ public abstract class TemplatePage extends WicketExamplePage @@ -46,7 +46,7 @@ public TemplatePage() { add(new Label("title", new PropertyModel<>(this, "pageTitle"))); add(currentBanner = new Banner1("ad")); - add(new Link("changeAdLink") + add(new Link("changeAdLink") { /** * @see org.apache.wicket.markup.html.link.Link#onClick() @@ -70,7 +70,7 @@ public void onClick() /** * Gets the title. - * + * * @return title */ public final String getPageTitle() @@ -80,7 +80,7 @@ public final String getPageTitle() /** * Sets the title. - * + * * @param title * title */ diff --git a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java index ff301119d0..a215dc0bb0 100644 --- a/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java +++ b/portlet-parent/wicketstuff-portlet-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java @@ -23,7 +23,7 @@ /** * Index page for the wizard example. - * + * * @author Eelco Hillenius */ public class Index extends WicketExamplePage @@ -36,15 +36,15 @@ public class Index extends WicketExamplePage * wizard, there is still the first access to the wizard. But if you link to the page that * renders it using and internal link, you'll circumvent that. */ - private static final class WizardLink extends Link + private static final class WizardLink extends Link { private final Class wizardClass; /** * Construct. - * + * * @param - * + * * @param id * Component id * @param wizardClass diff --git a/portlet-parent/wicketstuff-portlet/pom.xml b/portlet-parent/wicketstuff-portlet/pom.xml index 7a4f0d5b84..6170d5884a 100644 --- a/portlet-parent/wicketstuff-portlet/pom.xml +++ b/portlet-parent/wicketstuff-portlet/pom.xml @@ -23,7 +23,6 @@ org.apache.wicket wicket-core - ${wicket.version} diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/ResponseState.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/ResponseState.java index dd51000197..061a42fa70 100644 --- a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/ResponseState.java +++ b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/ResponseState.java @@ -47,13 +47,14 @@ import javax.portlet.ResourceResponse; import javax.servlet.ServletContext; import javax.servlet.ServletOutputStream; +import javax.servlet.WriteListener; import javax.servlet.http.Cookie; /** * Temporarily holds the current state of a Wicket response when invoked from * WicketPortlet: buffer, headers, state and the redirect location to be * processed afterwards within WicketPortlet - * + * * @author Ate Douma * @author Peter Pastrnak */ @@ -94,10 +95,10 @@ public class ResponseState { /** * FIXME javadoc - * + * * Stores the effective wicket url which is used by {@link WicketPortlet} in * the view phase to request a render from wicket core. - * + * * @see IRequestCycleSettings#REDIRECT_TO_RENDER * @see WicketFilterPortletHelper#initFilter */ @@ -160,7 +161,7 @@ public boolean isStateAwareResponse() { /* * (non-Javadoc) - * + * * @see * javax.servlet.http.HttpServletResponseWrapper#addCookie(javax.servlet * .http.Cookie) @@ -176,7 +177,7 @@ public void addCookie(Cookie cookie) { /* * (non-Javadoc) - * + * * @see * javax.servlet.http.HttpServletResponseWrapper#addDateHeader(java.lang * .String, long) @@ -187,7 +188,7 @@ public void addDateHeader(String name, long date) { /* * (non-Javadoc) - * + * * @see * javax.servlet.http.HttpServletResponseWrapper#addHeader(java.lang.String, * java.lang.String) @@ -201,7 +202,7 @@ public void addHeader(String name, String value) { /* * (non-Javadoc) - * + * * @see * javax.servlet.http.HttpServletResponseWrapper#addIntHeader(java.lang. * String, int) @@ -212,7 +213,7 @@ public void addIntHeader(String name, int value) { /* * (non-Javadoc) - * + * * @see * javax.servlet.http.HttpServletResponseWrapper#containsHeader(java.lang * .String) @@ -224,7 +225,7 @@ public boolean containsHeader(String name) { /* * (non-Javadoc) - * + * * @see javax.servlet.http.HttpServletResponseWrapper#sendError(int, * java.lang.String) */ @@ -237,7 +238,7 @@ public void sendError(int errorCode, String errorMessage) throws IOException { /* * (non-Javadoc) - * + * * @see javax.servlet.http.HttpServletResponseWrapper#sendError(int) */ public void sendError(int errorCode) throws IOException { @@ -246,7 +247,7 @@ public void sendError(int errorCode) throws IOException { /* * (non-Javadoc) - * + * * @see * javax.servlet.http.HttpServletResponseWrapper#sendRedirect(java.lang. * String) @@ -271,7 +272,7 @@ public String getAjaxRedirectLocation() { /* * (non-Javadoc) - * + * * @see * javax.servlet.http.HttpServletResponseWrapper#setDateHeader(java.lang * .String, long) @@ -282,7 +283,7 @@ public void setDateHeader(String name, long date) { /* * (non-Javadoc) - * + * * @see * javax.servlet.http.HttpServletResponseWrapper#setHeader(java.lang.String, * java.lang.String) @@ -301,7 +302,7 @@ public void setHeader(String name, String value) { /* * (non-Javadoc) - * + * * @see * javax.servlet.http.HttpServletResponseWrapper#setIntHeader(java.lang. * String, int) @@ -312,7 +313,7 @@ public void setIntHeader(String name, int value) { /* * (non-Javadoc) - * + * * @see javax.servlet.http.HttpServletResponseWrapper#setStatus(int, * java.lang.String) */ @@ -322,7 +323,7 @@ public void setStatus(int statusCode, String message) { /* * (non-Javadoc) - * + * * @see javax.servlet.http.HttpServletResponseWrapper#setStatus(int) */ public void setStatus(int statusCode) { @@ -335,7 +336,7 @@ public void setStatus(int statusCode) { /* * (non-Javadoc) - * + * * @see javax.servlet.ServletResponseWrapper#flushBuffer() */ public void flushBuffer() throws IOException { @@ -346,7 +347,7 @@ public void flushBuffer() throws IOException { /* * (non-Javadoc) - * + * * @see javax.servlet.ServletResponseWrapper#getBufferSize() */ public int getBufferSize() { @@ -355,7 +356,7 @@ public int getBufferSize() { /* * (non-Javadoc) - * + * * @see javax.servlet.ServletResponseWrapper#getCharacterEncoding() */ public String getCharacterEncoding() { @@ -364,7 +365,7 @@ public String getCharacterEncoding() { /* * (non-Javadoc) - * + * * @see javax.servlet.ServletResponseWrapper#getContentType() */ public String getContentType() { @@ -373,7 +374,7 @@ public String getContentType() { /* * (non-Javadoc) - * + * * @see javax.servlet.ServletResponseWrapper#getLocale() */ public Locale getLocale() { @@ -382,7 +383,7 @@ public Locale getLocale() { /* * (non-Javadoc) - * + * * @see javax.servlet.ServletResponseWrapper#getOutputStream() */ public ServletOutputStream getOutputStream() throws IOException { @@ -409,6 +410,15 @@ public void write(int b) throws IOException { } } } + + @Override + public boolean isReady() { + return true; + } + + @Override + public void setWriteListener(WriteListener writeListener) { + } }; } return outputStream; @@ -416,7 +426,7 @@ public void write(int b) throws IOException { /* * (non-Javadoc) - * + * * @see javax.servlet.ServletResponseWrapper#getWriter() */ public PrintWriter getWriter() throws IOException { @@ -439,7 +449,7 @@ public PrintWriter getWriter() throws IOException { /* * (non-Javadoc) - * + * * @see javax.servlet.ServletResponseWrapper#isCommitted() */ public boolean isCommitted() { @@ -448,7 +458,7 @@ public boolean isCommitted() { /* * (non-Javadoc) - * + * * @see javax.servlet.ServletResponseWrapper#reset() */ public void reset() { @@ -466,7 +476,7 @@ public void reset() { /* * (non-Javadoc) - * + * * @see javax.servlet.ServletResponseWrapper#resetBuffer() */ public void resetBuffer() { @@ -487,7 +497,7 @@ else if (printWriter != null) { /* * (non-Javadoc) - * + * * @see javax.servlet.ServletResponseWrapper#setBufferSize(int) */ public void setBufferSize(int size) { @@ -495,7 +505,7 @@ public void setBufferSize(int size) { /* * (non-Javadoc) - * + * * @see * javax.servlet.ServletResponseWrapper#setCharacterEncoding(java.lang.String * ) @@ -510,7 +520,7 @@ public void setCharacterEncoding(String charset) { /* * (non-Javadoc) - * + * * @see javax.servlet.ServletResponseWrapper#setContentLength(int) */ public void setContentLength(int len) { @@ -535,7 +545,7 @@ public void setContentLength(int len) { /* * (non-Javadoc) - * + * * @see * javax.servlet.ServletResponseWrapper#setContentType(java.lang.String) */ @@ -554,7 +564,7 @@ public void setContentType(String type) { /* * (non-Javadoc) - * + * * @see javax.servlet.ServletResponseWrapper#setLocale(java.util.Locale) */ public void setLocale(Locale locale) { @@ -851,7 +861,7 @@ public void reset() { } } } - + @Override protected void finalize() throws Throwable { reset(); @@ -973,7 +983,7 @@ public void reset() { } } } - + @Override protected void finalize() throws Throwable { reset(); diff --git a/scala-extensions-parent/pom.xml b/scala-extensions-parent/pom.xml index f4b0d87f18..4da7b17e5b 100644 --- a/scala-extensions-parent/pom.xml +++ b/scala-extensions-parent/pom.xml @@ -114,7 +114,6 @@ -Xmx512m - -XX:MaxPermSize=128m -target:jvm-1.8 diff --git a/scala-extensions-parent/wicket-scala-archetype/src/main/resources/archetype-resources/pom.xml b/scala-extensions-parent/wicket-scala-archetype/src/main/resources/archetype-resources/pom.xml index d6219545d2..1a5ce9ae8f 100644 --- a/scala-extensions-parent/wicket-scala-archetype/src/main/resources/archetype-resources/pom.xml +++ b/scala-extensions-parent/wicket-scala-archetype/src/main/resources/archetype-resources/pom.xml @@ -116,7 +116,6 @@ false -Xmx1024m - -XX:MaxPermSize=256m -target:jvm-1.6 diff --git a/simile-timeline-parent/simile-timeline/pom.xml b/simile-timeline-parent/simile-timeline/pom.xml index 712e1680f2..01b90babdf 100644 --- a/simile-timeline-parent/simile-timeline/pom.xml +++ b/simile-timeline-parent/simile-timeline/pom.xml @@ -32,8 +32,7 @@ net.sf.json-lib json-lib - 2.4 - jdk15 + jdk15 diff --git a/sitemap-xml-parent/sitemap-xml/pom.xml b/sitemap-xml-parent/sitemap-xml/pom.xml index 56ba2eb956..0dbcfa197f 100644 --- a/sitemap-xml-parent/sitemap-xml/pom.xml +++ b/sitemap-xml-parent/sitemap-xml/pom.xml @@ -14,9 +14,8 @@ slf4j-api - commons-lang - commons-lang - 2.4 + org.apache.commons + commons-lang3 javax.servlet diff --git a/sitemap-xml-parent/sitemap-xml/src/main/java/org/apache/wicket/extensions/sitemap/SiteMapFeed.java b/sitemap-xml-parent/sitemap-xml/src/main/java/org/apache/wicket/extensions/sitemap/SiteMapFeed.java index 660b475c4f..15a2229120 100644 --- a/sitemap-xml-parent/sitemap-xml/src/main/java/org/apache/wicket/extensions/sitemap/SiteMapFeed.java +++ b/sitemap-xml-parent/sitemap-xml/src/main/java/org/apache/wicket/extensions/sitemap/SiteMapFeed.java @@ -6,7 +6,7 @@ import java.util.Date; import java.util.Observable; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.wicket.request.cycle.RequestCycle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sitemap-xml-parent/sitemap-xml/src/main/java/org/apache/wicket/extensions/sitemap/SiteMapIndex.java b/sitemap-xml-parent/sitemap-xml/src/main/java/org/apache/wicket/extensions/sitemap/SiteMapIndex.java index 18bb542f46..f9d6b2f4a4 100644 --- a/sitemap-xml-parent/sitemap-xml/src/main/java/org/apache/wicket/extensions/sitemap/SiteMapIndex.java +++ b/sitemap-xml-parent/sitemap-xml/src/main/java/org/apache/wicket/extensions/sitemap/SiteMapIndex.java @@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.request.Request; import org.apache.wicket.request.cycle.RequestCycle; @@ -54,6 +54,7 @@ public String getDomain() { return domain; } + @Override public void update(Observable o, Object arg) { // todo feedback loop to adjust block sizes if (o instanceof SiteMapFeed) { @@ -84,6 +85,7 @@ public void writeData(final Attributes attributes) { if (index != null && sourceIndex != null) { SiteMapFeed feed = new SiteMapFeed(new IOffsetSiteMapEntryIterable.SiteMapIterable() { + @Override public IOffsetSiteMapEntryIterable.SiteMapIterator iterator() { return getDataSources()[sourceIndex].getIterator(index); } diff --git a/tinymce3-parent/tinymce3/src/main/java/wicket/contrib/tinymce/InPlaceEditComponent.java b/tinymce3-parent/tinymce3/src/main/java/wicket/contrib/tinymce/InPlaceEditComponent.java index 977e949040..e0e75016a3 100644 --- a/tinymce3-parent/tinymce3/src/main/java/wicket/contrib/tinymce/InPlaceEditComponent.java +++ b/tinymce3-parent/tinymce3/src/main/java/wicket/contrib/tinymce/InPlaceEditComponent.java @@ -29,34 +29,34 @@ License, or (at your option) any later version. import wicket.contrib.tinymce.settings.TinyMCESettings.Theme; import wicket.contrib.tinymce.settings.WicketSavePlugin; -public class InPlaceEditComponent extends AbstractTextComponent +public class InPlaceEditComponent extends AbstractTextComponent { private static final long serialVersionUID = 1L; - + private InPlaceSaveBehavior inPlaceSaveBehavior; private InPlaceEditBehavior inPlaceEditBehavior; - + private final Component triggerComponent; private final TinyMCESettings settings; - public InPlaceEditComponent(String id, IModel model) + public InPlaceEditComponent(String id, IModel model) { this(id, model, null, null); } - public InPlaceEditComponent(String id, IModel model, + public InPlaceEditComponent(String id, IModel model, Component triggerComponent) { this(id, model, triggerComponent, null); } - public InPlaceEditComponent(String id, IModel model, + public InPlaceEditComponent(String id, IModel model, TinyMCESettings settings) { this(id, model, null, settings); } - public InPlaceEditComponent(String id, IModel model, + public InPlaceEditComponent(String id, IModel model, Component triggerComponent, TinyMCESettings settings) { super(id, model); @@ -66,24 +66,24 @@ public InPlaceEditComponent(String id, IModel model, public InPlaceEditComponent(String id, String text) { - this(id, new Model(text)); + this(id, new Model<>(text)); } public InPlaceEditComponent(String id, String text, Component triggerComponent) { - this(id, new Model(text), triggerComponent, null); + this(id, new Model<>(text), triggerComponent, null); } public InPlaceEditComponent(String id, String text, TinyMCESettings settings) { - this(id, new Model(text), settings); + this(id, new Model<>(text), settings); } public InPlaceEditComponent(String id, String text, Component triggerComponent, TinyMCESettings settings) { - this(id, new Model(text), triggerComponent, settings); + this(id, new Model<>(text), triggerComponent, settings); } @Override diff --git a/wicket-mount-parent/wicket-mount-example/pom.xml b/wicket-mount-parent/wicket-mount-example/pom.xml index 4a62f879ca..8567943958 100644 --- a/wicket-mount-parent/wicket-mount-example/pom.xml +++ b/wicket-mount-parent/wicket-mount-example/pom.xml @@ -8,7 +8,6 @@ 8.0.0-SNAPSHOT - org.wicketstuff wicket-mount-example war diff --git a/wicket-mount-parent/wicket-mount-example/src/main/java/org/wicketstuff/wicket/mount/example/ui/HomePage.java b/wicket-mount-parent/wicket-mount-example/src/main/java/org/wicketstuff/wicket/mount/example/ui/HomePage.java index 3aa78cccdf..9f1f60cd91 100644 --- a/wicket-mount-parent/wicket-mount-example/src/main/java/org/wicketstuff/wicket/mount/example/ui/HomePage.java +++ b/wicket-mount-parent/wicket-mount-example/src/main/java/org/wicketstuff/wicket/mount/example/ui/HomePage.java @@ -32,7 +32,6 @@ @MountPath("index.html") public class HomePage extends WebPage { - private static final long serialVersionUID = 1L; public HomePage(final PageParameters parameters) @@ -43,8 +42,9 @@ public HomePage(final PageParameters parameters) add(new Label("message", "The relative url should be set to " + mp)); - add(new Link("pg1-bookmark") + add(new Link("pg1-bookmark") { + private static final long serialVersionUID = 1L; @Override public void onClick() @@ -52,8 +52,9 @@ public void onClick() setResponsePage(PackageMountPage1.class); } }); - add(new Link("pg2-nonbookmark") + add(new Link("pg2-nonbookmark") { + private static final long serialVersionUID = 1L; @Override public void onClick() @@ -63,8 +64,9 @@ public void onClick() }); final String random = UUID.randomUUID().toString(); - add(new Link("url-param") + add(new Link("url-param") { + private static final long serialVersionUID = 1L; @Override public void onClick() @@ -72,6 +74,6 @@ public void onClick() setResponsePage(ParamTestPage.class, new PageParameters().add("testParam", random)); } }.add(new Label("randomParam", "Goto mounted page with pageparameter mounted as part of url. Parameter = " + random))); - + } } diff --git a/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml b/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml index edd74e8dd0..189a8de1d7 100644 --- a/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml +++ b/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml @@ -86,7 +86,6 @@ org.apache.maven.plugins maven-war-plugin - 2.4 false diff --git a/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/HomePage.java b/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/HomePage.java index f1333b9ca6..f65b49e8bb 100644 --- a/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/HomePage.java +++ b/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/HomePage.java @@ -27,15 +27,15 @@ public HomePage(final PageParameters parameters) // Add the simplest type of label add(new Label("message", "If you see this message wicket is properly configured and running")); - add(new StatelessLink("secureExample") + add(new StatelessLink("secureExample") { + private static final long serialVersionUID = 1L; @Override public void onClick() { throw new RedirectToUrlException("/cms/index.html"); } - }); } diff --git a/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/BasePage.java b/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/BasePage.java index 0f6f333812..6d360bc004 100644 --- a/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/BasePage.java +++ b/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/BasePage.java @@ -31,6 +31,7 @@ */ public class BasePage extends WebPage { + private static final long serialVersionUID = 1L; public BasePage() { @@ -41,8 +42,9 @@ public BasePage(PageParameters parameters) { super(parameters); add(new UserInfoPanel("userInfo")); - add(new StatelessLink("home") + add(new StatelessLink("home") { + private static final long serialVersionUID = 1L; @Override public void onClick() @@ -53,6 +55,7 @@ public void onClick() add(new AdminLink("admin") { + private static final long serialVersionUID = 1L; @Override public void onClick() @@ -63,6 +66,7 @@ public void onClick() }.setVisible(this.getClass() != AdminPage.class)); add(new SecureLink("invalidate") { + private static final long serialVersionUID = 1L; @Override public void onClick() @@ -73,6 +77,7 @@ public void onClick() }); add(new SecureLink("logout") { + private static final long serialVersionUID = 1L; @Override public void onClick() diff --git a/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/HomePage.java b/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/HomePage.java index 9c42f51b0b..8d2ea94bbd 100644 --- a/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/HomePage.java +++ b/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/HomePage.java @@ -35,6 +35,7 @@ @MountPath("index.html") public class HomePage extends BasePage { + private static final long serialVersionUID = 1L; public HomePage() { @@ -43,8 +44,9 @@ public HomePage() public HomePage(PageParameters parameters) { - add(new StatelessLink("next") + add(new StatelessLink("next") { + private static final long serialVersionUID = 1L; @Override public void onClick() @@ -52,8 +54,9 @@ public void onClick() setResponsePage(Page2.class); //Bookmarkable response } }); - add(new StatelessLink("next2") + add(new StatelessLink("next2") { + private static final long serialVersionUID = 1L; @Override public void onClick() @@ -61,8 +64,9 @@ public void onClick() setResponsePage(new AdminPage()); //non-bookmarkable response } }); - add(new StatelessLink("next3") + add(new StatelessLink("next3") { + private static final long serialVersionUID = 1L; @Override public void onClick() diff --git a/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/common/AdminLink.java b/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/common/AdminLink.java index 7e43325065..c406e46a02 100644 --- a/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/common/AdminLink.java +++ b/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/common/AdminLink.java @@ -31,7 +31,7 @@ @AuthorizeActions(actions = { @AuthorizeAction(action = Action.RENDER, roles = {"tomcat", "admin"}) }) -public abstract class AdminLink extends StatelessLink +public abstract class AdminLink extends StatelessLink { public AdminLink(String id) diff --git a/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/common/SecureLink.java b/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/common/SecureLink.java index 63a9f1039f..138387ddc9 100644 --- a/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/common/SecureLink.java +++ b/wicket-servlet3-parent/wicket-servlet3-examples/src/main/java/org/wicketstuff/servlet3/secure/example/ui/common/SecureLink.java @@ -31,8 +31,9 @@ @AuthorizeActions(actions = { @AuthorizeAction(action = Action.RENDER, roles = {"tomcat", "role1", "admin"}) }) -public abstract class SecureLink extends StatelessLink +public abstract class SecureLink extends StatelessLink { + private static final long serialVersionUID = 1L; public SecureLink(String id) { diff --git a/wicketstuff-lazymodel/src/test/java/org/wicketstuff/lazymodel/LazyModelTest.java b/wicketstuff-lazymodel/src/test/java/org/wicketstuff/lazymodel/LazyModelTest.java index 5deec4783e..7c0bbe928a 100644 --- a/wicketstuff-lazymodel/src/test/java/org/wicketstuff/lazymodel/LazyModelTest.java +++ b/wicketstuff-lazymodel/src/test/java/org/wicketstuff/lazymodel/LazyModelTest.java @@ -45,7 +45,7 @@ /** * Test for {@link LazyModel}. - * + * * @author svenmeier */ @SuppressWarnings("serial") @@ -773,7 +773,7 @@ protected A load() { assertEquals(a.b, model.getObject()); } - + @Test public void getFromPrivateConstructor() { final A a = new A(); @@ -911,7 +911,7 @@ public T getObject() { public void setObject(T arg0) { } }; - + try { from(new GenericModel()); @@ -927,8 +927,8 @@ public void fromTypeErasedModelWithClass() throws Exception final A a = new A(); a.b = new B(); - Model target = new Model(a); - + Model target = new Model<>(a); + LazyModel model = model(from(target, A.class).getB()); assertEquals(B.class, model.getObjectClass()); @@ -1186,7 +1186,7 @@ public static class G { /** * {@link Reflection} has to walk up the type hierarchy to resolve the * return type. - * + * * @see LazyModelTest#inheritedTypeVariable() */ public T getT() { @@ -1196,7 +1196,7 @@ public T getT() { /** * {@link Reflection} has to backtrack from type variable {@code E} to * {@code T} to resolve the return type of {@link List#get(int)} - * + * * @see LazyModelTest#backtrackedTypeVariable() */ @SuppressWarnings({ "rawtypes", "unchecked" }) diff --git a/wicketstuff-restannotations-parent/restannotations-examples/pom.xml b/wicketstuff-restannotations-parent/restannotations-examples/pom.xml index 3d5e67a188..01e48c725f 100644 --- a/wicketstuff-restannotations-parent/restannotations-examples/pom.xml +++ b/wicketstuff-restannotations-parent/restannotations-examples/pom.xml @@ -20,7 +20,6 @@ 8.0.0-SNAPSHOT - org.wicketstuff wicketstuff-restannotations-examples war @@ -68,7 +67,6 @@ com.google.code.gson gson - 2.2.4 diff --git a/yui-parent/yui-calendar/src/main/java/org/wicketstuff/yui/markup/html/calendar/Calendar.java b/yui-parent/yui-calendar/src/main/java/org/wicketstuff/yui/markup/html/calendar/Calendar.java index d2bf92bbd5..2d65b7ffb1 100644 --- a/yui-parent/yui-calendar/src/main/java/org/wicketstuff/yui/markup/html/calendar/Calendar.java +++ b/yui-parent/yui-calendar/src/main/java/org/wicketstuff/yui/markup/html/calendar/Calendar.java @@ -2,14 +2,14 @@ * $Id: Calendar.java 5044 2006-03-20 16:46:35 -0800 (Mon, 20 Mar 2006) * jonathanlocke $ $Revision: 5159 $ $Date: 2006-03-20 16:46:35 -0800 (Mon, 20 * Mar 2006) $ - * + * * ============================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -18,6 +18,9 @@ */ package org.wicketstuff.yui.markup.html.calendar; +import java.util.HashMap; +import java.util.Map; + import org.apache.wicket.AttributeModifier; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; @@ -28,6 +31,7 @@ import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.AbstractReadOnlyModel; +import org.apache.wicket.model.IModel; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.resource.CssResourceReference; import org.apache.wicket.request.resource.JavaScriptResourceReference; @@ -35,9 +39,6 @@ import org.apache.wicket.util.template.PackageTextTemplate; import org.wicketstuff.yui.markup.html.contributor.YuiHeaderContributor; -import java.util.HashMap; -import java.util.Map; - /** * Calendar component based on the Calendar of Yahoo UI Library. * @@ -47,7 +48,7 @@ public class Calendar extends Panel implements IHeaderContributor { /** * The container/ receiver of the javascript component. */ - private final class CalendarElement extends FormComponent { + private final class CalendarElement extends FormComponent { private static final long serialVersionUID = 1L; /** @@ -57,11 +58,11 @@ private final class CalendarElement extends FormComponent { */ public CalendarElement(String id) { super(id); - add(new AttributeModifier("id", new AbstractReadOnlyModel() { + add(new AttributeModifier("id", new IModel() { private static final long serialVersionUID = 1L; @Override - public Object getObject() { + public String getObject() { return elementId; } })); @@ -111,7 +112,8 @@ public Object getObject() { add(calendarElement = new CalendarElement("calendarContainer")); } - public void renderHead(IHeaderResponse response) { + @Override + public void renderHead(IHeaderResponse response) { response.render(OnLoadHeaderItem.forScript("init" + javaScriptId + "();")); YuiHeaderContributor.forModule("calendar").renderHead(response);