Skip to content

Commit

Permalink
upgrade wicket to version 8
Browse files Browse the repository at this point in the history
  • Loading branch information
@skublik
skublik committed Nov 23, 2018
1 parent 5eea244 commit 825f877
Show file tree
Hide file tree
Showing 222 changed files with 673 additions and 808 deletions.
4 changes: 2 additions & 2 deletions build-system/pom.xml
View file
Expand Up @@ -77,7 +77,7 @@
<jdbc.sqlserver>6.4.0.jre8</jdbc.sqlserver>
<jdbc.mariadb>2.3.0</jdbc.mariadb>
<jdbc.mysql>6.0.6</jdbc.mysql>
<wicket.version>7.10.0</wicket.version>
<wicket.version>8.2.0</wicket.version>
<groovy.version>2.4.14</groovy.version>
<activiti-engine.version>5.22.0</activiti-engine.version>
<activiti-spring.version>5.22.0</activiti-spring.version>
Expand Down Expand Up @@ -169,7 +169,7 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-datetime</artifactId>
<version>${wicket.version}</version>
<version>8.0.0-M7</version>
<exclusions>
<exclusion> <!-- Conflicting version with activiti -->
<groupId>joda-time</groupId>
Expand Down
7 changes: 3 additions & 4 deletions ...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PendingOperationPanel.java
View file
Expand Up @@ -27,7 +27,6 @@
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;

import java.util.List;
Expand Down Expand Up @@ -84,7 +83,7 @@ public String getCssClass() {
}

private IModel<String> createTextClass(IModel<PendingOperationType> model) {
return new AbstractReadOnlyModel<String>() {
return new IModel<String>() {

private static final long serialVersionUID = 1L;

Expand Down Expand Up @@ -120,7 +119,7 @@ public String getObject() {
}

private IModel<String> createTextTooltipModel(IModel<PendingOperationType> model) {
return new AbstractReadOnlyModel<String>() {
return new IModel<String>() {

private static final long serialVersionUID = 1L;

Expand Down Expand Up @@ -157,7 +156,7 @@ private void buildStringItem(StringBuilder sb, String key, Object obj) {
}

private IModel<String> createLabelText(IModel<PendingOperationType> model) {
return new AbstractReadOnlyModel<String>() {
return new IModel<String>() {

private static final long serialVersionUID = 1L;

Expand Down
5 changes: 2 additions & 3 deletions ...rc/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java
View file
Expand Up @@ -22,7 +22,6 @@
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.PropertyModel;

Expand Down Expand Up @@ -68,7 +67,7 @@ private void initLayout() {
WebMarkupContainer objectDeltaOperationMarkup = new WebMarkupContainer(ID_OBJECT_DELTA_OPERATION_MARKUP);
objectDeltaOperationMarkup.setOutputMarkupId(true);

objectDeltaOperationMarkup.add(AttributeModifier.append("class", new AbstractReadOnlyModel<String>() {
objectDeltaOperationMarkup.add(AttributeModifier.append("class", new IModel<String>() {

@Override
public String getObject() {
Expand Down Expand Up @@ -101,7 +100,7 @@ public String getObject() {
parentPage.showResult(result);
throw parentPage.redirectBackViaRestartResponseException();
}
IModel<SceneDto> deltaModel = new AbstractReadOnlyModel<SceneDto>() {
IModel<SceneDto> deltaModel = new IModel<SceneDto>() {
private static final long serialVersionUID = 1L;

public SceneDto getObject() {
Expand Down
3 changes: 1 addition & 2 deletions .../java/com/evolveum/midpoint/gui/api/component/objecttypeselect/ObjectTypeSelectPanel.java
View file
Expand Up @@ -21,7 +21,6 @@

import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;

import com.evolveum.midpoint.gui.api.component.BasePanel;
Expand Down Expand Up @@ -49,7 +48,7 @@ public ObjectTypeSelectPanel(String id, IModel<QName> model, Class<O> superclass

private void initLayout(IModel<QName> model, final Class<O> superclass) {
select = new DropDownChoice<>(ID_SELECT, model,
new AbstractReadOnlyModel<List<QName>>() {
new IModel<List<QName>>() {
private static final long serialVersionUID = 1L;

@Override
Expand Down
3 changes: 1 addition & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.java
View file
Expand Up @@ -10,7 +10,6 @@
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
Expand Down Expand Up @@ -92,7 +91,7 @@ public boolean isVisible() {
});

ItemPathSegmentPanel itemDefPanel = new ItemPathSegmentPanel(ID_DEFINITION,
new AbstractReadOnlyModel<ItemPathDto>() {
new IModel<ItemPathDto>() {

private static final long serialVersionUID = 1L;
public ItemPathDto getObject() {
Expand Down
3 changes: 1 addition & 2 deletions ...-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java
View file
Expand Up @@ -9,7 +9,6 @@
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
Expand Down Expand Up @@ -40,7 +39,7 @@ public ItemPathSegmentPanel(String id, IModel<ItemPathDto> model) {
private void initLayout() {

Label label = new Label(ID_PARENT,
new AbstractReadOnlyModel<String>() {
new IModel<String>() {
private static final long serialVersionUID = 1L;
@Override
public String getObject() {
Expand Down
9 changes: 4 additions & 5 deletions ...ui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java
View file
Expand Up @@ -42,7 +42,6 @@
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
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.PropertyModel;
import org.apache.wicket.model.StringResourceModel;
Expand Down Expand Up @@ -99,7 +98,7 @@ public void initLayout(Page parentPage) {
private void initHeader(WebMarkupContainer box) {
WebMarkupContainer iconType = new WebMarkupContainer(ID_ICON_TYPE);
iconType.setOutputMarkupId(true);
iconType.add(new AttributeAppender("class", new AbstractReadOnlyModel<String>() {
iconType.add(new AttributeAppender("class", new IModel<String>() {
private static final long serialVersionUID = 1L;

@Override
Expand Down Expand Up @@ -225,7 +224,7 @@ public void onClick(AjaxRequestTarget target) {

box.add(close);

DownloadLink downloadXml = new DownloadLink("downloadXml", new AbstractReadOnlyModel<File>() {
DownloadLink downloadXml = new DownloadLink("downloadXml", new IModel<File>() {
private static final long serialVersionUID = 1L;

@Override
Expand Down Expand Up @@ -257,7 +256,7 @@ public void close(AjaxRequestTarget target) {
}

private Label createMessage() {
Label message = new Label(ID_MESSAGE_LABEL, new AbstractReadOnlyModel<String>() {
Label message = new Label(ID_MESSAGE_LABEL, new IModel<String>() {

@Override
public String getObject() {
Expand Down Expand Up @@ -578,7 +577,7 @@ private void showHideAll(final boolean show, OpResult opresult, AjaxRequestTarge

private IModel<String> createHeaderCss() {

return new AbstractReadOnlyModel<String>() {
return new IModel<String>() {
private static final long serialVersionUID = 1L;

@Override
Expand Down
5 changes: 2 additions & 3 deletions ...ui/src/main/java/com/evolveum/midpoint/gui/api/component/result/ValidationErrorPanel.java
View file
Expand Up @@ -9,7 +9,6 @@
import org.apache.wicket.feedback.FeedbackMessage;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.PropertyModel;

Expand Down Expand Up @@ -44,7 +43,7 @@ public void initLayout() {

private IModel<String> createHeaderCss() {

return new AbstractReadOnlyModel<String>() {
return new IModel<String>() {

@Override
public String getObject() {
Expand Down Expand Up @@ -76,7 +75,7 @@ public String getObject() {
private void initHeader(WebMarkupContainer box) {
WebMarkupContainer iconType = new WebMarkupContainer("iconType");
iconType.setOutputMarkupId(true);
iconType.add(new AttributeAppender("class", new AbstractReadOnlyModel() {
iconType.add(new AttributeAppender("class", new IModel() {
@Override
public Object getObject() {

Expand Down
3 changes: 1 addition & 2 deletions ...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/tabs/CountablePanelTab.java
View file
Expand Up @@ -17,7 +17,6 @@

import com.evolveum.midpoint.gui.api.model.CountModelProvider;
import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;

/**
Expand All @@ -43,7 +42,7 @@ public IModel<String> getCountModel() {
// When we display the tab the panel does not exist yet.
// The panel is created only when the tab is clicked.

return new AbstractReadOnlyModel<String>() {
return new IModel<String>() {

private static final long serialVersionUID = 1L;

Expand Down
4 changes: 2 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyEnumValuesModel.java
View file
Expand Up @@ -16,7 +16,7 @@

package com.evolveum.midpoint.gui.api.model;

import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;

import java.util.Arrays;
import java.util.List;
Expand All @@ -26,7 +26,7 @@
*
* @author mederly
*/
public class ReadOnlyEnumValuesModel<E extends Enum<E>> extends AbstractReadOnlyModel<List<E>> {
public class ReadOnlyEnumValuesModel<E extends Enum<E>> implements IModel<List<E>> {

private final List<E> values;

Expand Down
4 changes: 2 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyModel.java
View file
Expand Up @@ -17,13 +17,13 @@
package com.evolveum.midpoint.gui.api.model;

import com.evolveum.midpoint.web.component.util.SerializableSupplier;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.jetbrains.annotations.NotNull;

/**
* @author mederly
*/
public class ReadOnlyModel<T> extends AbstractReadOnlyModel<T> {
public class ReadOnlyModel<T> implements IModel<T> {

@NotNull private final SerializableSupplier<T> objectSupplier;

Expand Down
4 changes: 2 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyValueModel.java
View file
Expand Up @@ -16,7 +16,7 @@

package com.evolveum.midpoint.gui.api.model;

import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.jetbrains.annotations.NotNull;

/**
Expand All @@ -25,7 +25,7 @@
*
* @author mederly
*/
public class ReadOnlyValueModel<T> extends AbstractReadOnlyModel<T> {
public class ReadOnlyValueModel<T> implements IModel<T> {

@NotNull private final T object;

Expand Down
20 changes: 10 additions & 10 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
View file
Expand Up @@ -402,7 +402,7 @@ public void resetCertWorkItemCountModel() {
}

protected void createBreadcrumb() {
BreadcrumbPageClass bc = new BreadcrumbPageClass(new AbstractReadOnlyModel<String>() {
BreadcrumbPageClass bc = new BreadcrumbPageClass(new IModel<String>() {
private static final long serialVersionUID = 1L;

@Override
Expand All @@ -415,7 +415,7 @@ public String getObject() {
}

protected void createInstanceBreadcrumb() {
BreadcrumbPageInstance bc = new BreadcrumbPageInstance(new AbstractReadOnlyModel<String>() {
BreadcrumbPageInstance bc = new BreadcrumbPageInstance(new IModel<String>() {
private static final long serialVersionUID = 1L;

@Override
Expand Down Expand Up @@ -748,7 +748,7 @@ private void initTitleLayout(WebMarkupContainer mainHeader) {
WebMarkupContainer pageTitle = new WebMarkupContainer(ID_PAGE_TITLE);
pageTitleContainer.add(pageTitle);

IModel<String> deploymentNameModel = new AbstractReadOnlyModel<String>() {
IModel<String> deploymentNameModel = new IModel<String>() {

private static final long serialVersionUID = 1L;

Expand All @@ -772,7 +772,7 @@ public String getObject() {
pageTitleReal.setRenderBodyOnly(true);
pageTitle.add(pageTitleReal);

IModel<List<Breadcrumb>> breadcrumbsModel = new AbstractReadOnlyModel<List<Breadcrumb>>() {
IModel<List<Breadcrumb>> breadcrumbsModel = new IModel<List<Breadcrumb>>() {

private static final long serialVersionUID = 1L;

Expand Down Expand Up @@ -880,7 +880,7 @@ private void initLayout() {
body.add(new AttributeAppender("class", "hold-transition ", " "));
body.add(new AttributeAppender("class", "custom-hold-transition ", " "));

body.add(new AttributeAppender("class", new AbstractReadOnlyModel<String>() {
body.add(new AttributeAppender("class", new IModel<String>() {

private static final long serialVersionUID = 1L;

Expand Down Expand Up @@ -951,7 +951,7 @@ public boolean isVisible() {
mainHeader.add(navigation);


IModel<IconType> logoModel = new AbstractReadOnlyModel<IconType>() {
IModel<IconType> logoModel = new IModel<IconType>() {

private static final long serialVersionUID = 1L;

Expand Down Expand Up @@ -992,7 +992,7 @@ public String getObject() {

WebMarkupContainer customLogoImgCss = new WebMarkupContainer(ID_CUSTOM_LOGO_IMG_CSS);
customLogoImgCss.add(new VisibleBehaviour(() -> logoModel.getObject() != null && StringUtils.isNotEmpty(logoModel.getObject().getCssClass())));
customLogoImgCss.add(new AttributeAppender("class", new AbstractReadOnlyModel<String>() {
customLogoImgCss.add(new AttributeAppender("class", new IModel<String>() {

private static final long serialVersionUID = 1L;

Expand All @@ -1002,7 +1002,7 @@ public String getObject() {
}
}));

mainHeader.add(new AttributeAppender("style", new AbstractReadOnlyModel<String>() {
mainHeader.add(new AttributeAppender("style", new IModel<String>() {

private static final long serialVersionUID = 1L;

Expand Down Expand Up @@ -1064,7 +1064,7 @@ public String getDescribe() {
footerContainer.add(copyrightMessage);

Label subscriptionMessage = new Label(ID_SUBSCRIPTION_MESSAGE,
new AbstractReadOnlyModel<String>() {
new IModel<String>() {
private static final long serialVersionUID = 1L;

@Override
Expand Down Expand Up @@ -1097,7 +1097,7 @@ public String getObject() {
}

private AttributeAppender createHeaderColorStyleModel(boolean checkSkinUsage) {
return new AttributeAppender("style", new AbstractReadOnlyModel<String>() {
return new AttributeAppender("style", new IModel<String>() {

private static final long serialVersionUID = 1L;

Expand Down

0 comments on commit 825f877

Please sign in to comment.