From 825f87730dbd12a0255117151c42392030e238a3 Mon Sep 17 00:00:00 2001 From: skublik Date: Fri, 23 Nov 2018 16:55:25 +0100 Subject: [PATCH] upgrade wicket to version 8 --- build-system/pom.xml | 4 +-- .../api/component/PendingOperationPanel.java | 7 ++--- .../delta/ObjectDeltaOperationPanel.java | 5 ++- .../ObjectTypeSelectPanel.java | 3 +- .../gui/api/component/path/ItemPathPanel.java | 3 +- .../component/path/ItemPathSegmentPanel.java | 3 +- .../result/OperationResultPanel.java | 9 +++--- .../result/ValidationErrorPanel.java | 5 ++- .../api/component/tabs/CountablePanelTab.java | 3 +- .../api/model/ReadOnlyEnumValuesModel.java | 4 +-- .../midpoint/gui/api/model/ReadOnlyModel.java | 4 +-- .../gui/api/model/ReadOnlyValueModel.java | 4 +-- .../midpoint/gui/api/page/PageBase.java | 20 ++++++------ .../gui/api/util/WebComponentUtil.java | 18 +++++------ .../MultivalueContainerListPanel.java | 5 ++- ...lueContainerListPanelWithDetailsPanel.java | 3 +- .../component/form/TriStateFormGroup.java | 3 +- .../component/GlobalPolicyRuleTabPanel.java | 3 +- .../LoggingConfigurationTabPanel.java | 9 +++--- .../StringPropertyNotificationPanel.java | 5 ++- .../web/component/AjaxIconButton.java | 3 +- .../web/component/AjaxTabbedPanel.java | 10 +++--- .../web/component/BasicSearchPanel.java | 8 ++--- .../web/component/BootstrapLabel.java | 3 +- .../component/DefaultAjaxSubmitButton.java | 6 ++-- .../web/component/FocusSummaryPanel.java | 3 +- .../ObjectPolicyConfigurationEditor.java | 5 ++- .../midpoint/web/component/TabbedPanel.java | 5 ++- .../AbstractAssignmentDetailsPanel.java | 3 +- .../AbstractAssignmentListPanel.java | 3 +- .../assignment/AssignmentEditorPanel.java | 11 +++---- .../component/assignment/AssignmentPanel.java | 7 ++--- .../assignment/AssignmentTablePanel.java | 3 +- .../component/assignment/AssignmentsUtil.java | 7 ++--- .../ConstructionAssociationPanel.java | 2 +- .../assignment/GdprAssignmentPanel.java | 3 +- .../assignment/GridViewComponent.java | 3 +- .../component/assignment/MetadataPanel.java | 3 +- .../assignment/ShoppingCartEditorPanel.java | 5 ++- .../assignment/UserSelectionButton.java | 5 ++- .../web/component/breadcrumbs/Breadcrumb.java | 14 +++------ .../data/BaseSortableDataProvider.java | 3 +- .../web/component/data/BoxedTablePanel.java | 6 ++-- .../web/component/data/CountToolbar.java | 3 +- .../web/component/data/PageSizePopover.java | 8 ++--- .../data/TableConfigurationPanel.java | 7 +++-- .../web/component/data/TablePanel.java | 3 +- .../data/column/CheckBoxHeaderColumn.java | 13 +++++--- .../component/data/column/ColumnUtils.java | 25 +++++++-------- .../data/column/InlineMenuButtonColumn.java | 2 +- .../data/column/ObjectNameColumn.java | 3 +- .../component/data/paging/NavigatorPanel.java | 15 +++++---- .../web/component/dialog/HelpInfoPanel.java | 4 +-- .../component/form/AceEditorFormGroup.java | 3 +- .../web/component/form/CheckFormGroup.java | 3 +- .../web/component/form/DropDownFormGroup.java | 3 +- .../web/component/form/TextAreaFormGroup.java | 3 +- .../web/component/form/TextFormGroup.java | 3 +- .../web/component/form/ValueChoosePanel.java | 3 +- .../GenericMultiValueLabelEditPanel.java | 7 ++--- .../MultiValueAutoCompleteTextPanel.java | 3 +- .../multivalue/MultiValueChoosePanel.java | 3 +- .../multivalue/MultiValueDropDownPanel.java | 5 ++- .../multivalue/MultiValueTextEditPanel.java | 9 +++--- .../multivalue/MultiValueTextFormGroup.java | 5 ++- .../form/multivalue/MultiValueTextPanel.java | 3 +- .../input/ExpressionEditorPanel.java | 5 ++- .../input/MultiStateHorizontalButton.java | 8 ++--- .../component/input/SearchFilterPanel.java | 2 +- .../web/component/input/TextDetailsPanel.java | 3 +- .../input/ThreeStateBooleanPanel.java | 9 +++--- .../component/input/TwoStateBooleanPanel.java | 7 ++--- .../component/input/UploadDownloadPanel.java | 4 +-- .../web/component/menu/MainMenuPanel.java | 5 ++- .../web/component/menu/SideBarMenuPanel.java | 3 +- .../web/component/menu/UserMenuPanel.java | 9 +++--- .../web/component/menu/cog/InlineMenu.java | 3 +- .../menu/cog/InlineMenuItemAction.java | 4 +-- .../web/component/menu/cog/MenuLinkPanel.java | 19 +++++++----- .../AbstractObjectMainPanel.java | 12 +++---- .../objectdetails/BaseAbstractRolePanel.java | 3 +- .../objectdetails/FocusMainPanel.java | 3 +- .../FocusProjectionsTabPanel.java | 3 +- .../objectdetails/FocusTasksTabPanel.java | 4 +-- .../web/component/prism/CheckTableHeader.java | 10 +++--- .../component/prism/ContainerValuePanel.java | 3 +- .../web/component/prism/H3Header.java | 3 +- .../component/prism/PrismContainerPanel.java | 5 ++- .../prism/PrismContainerValueHeaderPanel.java | 3 +- .../web/component/prism/PrismHeaderPanel.java | 1 - .../component/prism/PrismPropertyColumn.java | 3 +- .../component/prism/PrismPropertyPanel.java | 8 ++--- .../web/component/prism/PrismValuePanel.java | 7 ++--- .../web/component/prism/SimpleErrorPanel.java | 5 ++- .../prism/show/PagePreviewChanges.java | 1 - .../prism/show/PreviewChangesTabPanel.java | 5 ++- .../prism/show/SceneButtonPanel.java | 5 ++- .../prism/show/SceneItemLinePanel.java | 7 ++--- .../prism/show/SceneItemValuePanel.java | 9 +++--- .../web/component/prism/show/ScenePanel.java | 12 +++---- .../web/component/progress/ProgressPanel.java | 31 ++++++++----------- .../progress/StatisticsDtoModel.java | 3 +- .../component/progress/StatisticsPanel.java | 2 +- .../component/refresh/AutoRefreshPanel.java | 3 +- .../web/component/search/SearchItemPanel.java | 9 +++--- .../web/component/search/SearchPanel.java | 16 +++++----- .../web/component/util/SummaryTagSimple.java | 3 +- ...cessExecutionInformationPanelTextOnly.java | 3 +- .../web/component/wf/DecisionsPanel.java | 5 ++- ...witchableApprovalProcessPreviewsPanel.java | 17 +++++++--- .../web/component/wf/WorkItemsPanel.java | 7 ++--- .../midpoint/web/component/wizard/Wizard.java | 5 +-- .../web/component/wizard/WizardButtonBar.java | 16 +++++----- .../component/wizard/WizardIssuesPanel.java | 6 ++-- .../web/component/wizard/WizardStep.java | 4 +-- .../web/component/wizard/WizardSteps.java | 13 ++++---- .../wizard/resource/CapabilityStep.java | 5 ++- .../wizard/resource/ConfigurationStep.java | 4 +-- .../component/wizard/resource/NameStep.java | 3 +- .../wizard/resource/SchemaHandlingStep.java | 29 +++++++++-------- .../wizard/resource/SynchronizationStep.java | 21 ++++++------- .../resource/component/SchemaListPanel.java | 3 +- .../resource/component/WizardHelpDialog.java | 4 +-- .../schemahandling/AttributeEditorUtils.java | 5 ++- .../ResourceAssociationEditor.java | 14 ++++----- .../ResourceAttributeEditor.java | 12 +++---- .../ResourceCredentialsEditor.java | 7 ++--- .../ResourceDependencyEditor.java | 9 +++--- .../ResourceProtectedEditor.java | 7 ++--- .../modal/ExpressionVariableEditorDialog.java | 7 ++--- .../modal/LimitationsEditorDialog.java | 7 ++--- .../modal/MappingEditorDialog.java | 13 ++++---- .../SynchronizationActionEditorDialog.java | 2 +- .../SynchronizationExpressionEditor.java | 3 +- .../SynchronizationReactionEditor.java | 4 +-- .../web/page/admin/cases/PageCase.java | 4 +-- .../page/admin/cases/PageCaseWorkItems.java | 7 ++--- .../web/page/admin/cases/PageCases.java | 9 +++--- .../certification/CertDecisionHelper.java | 3 +- .../certification/DefinitionBasicPanel.java | 3 +- .../certification/DefinitionStagePanel.java | 5 ++- .../certification/DefinitionStagesPanel.java | 19 ++++++------ .../admin/certification/PageCertCampaign.java | 7 ++--- .../certification/PageCertCampaigns.java | 16 +++++----- .../certification/PageCertDecisions.java | 7 ++--- .../certification/PageCertDefinition.java | 2 +- .../certification/PageCertDefinitions.java | 3 +- .../configuration/InternalsClockPanel.java | 8 ++--- .../configuration/InternalsConfigPanel.java | 4 +-- .../configuration/InternalsCountersPanel.java | 4 +-- .../InternalsDebugUtilPanel.java | 4 +-- .../configuration/InternalsTracesPanel.java | 4 +-- .../admin/configuration/PageBulkAction.java | 4 +-- .../admin/configuration/PageDebugList.java | 17 +++++----- .../admin/configuration/PageDebugView.java | 7 ++--- .../configuration/PageEvaluateMapping.java | 8 ++--- .../admin/configuration/PageImportObject.java | 8 ++--- .../configuration/PageRepositoryQuery.java | 22 ++++++------- .../component/HeaderMenuAction.java | 2 +- .../component/ObjectPolicyPanel.java | 20 ++++++------ .../admin/home/PageMyPasswordQuestions.java | 2 +- .../home/component/MyAssignmentsPanel.java | 3 +- .../home/component/PersonalInfoPanel.java | 11 +++---- .../admin/home/component/SystemInfoPanel.java | 9 +++--- .../page/admin/orgs/AbstractOrgTabPanel.java | 3 +- .../web/page/admin/orgs/OrgTreePanel.java | 9 +++--- .../admin/reports/PageAuditLogDetails.java | 3 +- .../admin/reports/PageCreatedReports.java | 9 +++--- .../web/page/admin/reports/PageNewReport.java | 8 ++--- .../web/page/admin/reports/PageReport.java | 8 ++--- .../component/AuditLogViewerPanel.java | 11 +++---- .../component/ReportConfigurationPanel.java | 3 +- .../component/RunReportPopupPanel.java | 6 ++-- .../admin/resources/PageConnectorHosts.java | 3 +- .../resources/PageResourceVisualization.java | 7 ++--- .../page/admin/resources/PageResources.java | 3 +- .../resources/ResourceConnectorPanel.java | 3 +- .../admin/resources/ResourceContentPanel.java | 19 ++++++------ .../resources/ResourceContentTabPanel.java | 3 +- .../component/TestConnectionResultPanel.java | 11 ++++--- .../admin/resources/content/PageAccount.java | 4 +-- .../admin/roles/AbstractRoleMemberPanel.java | 1 - .../component/MultiplicityPolicyPanel.java | 4 +-- .../web/page/admin/server/PageTaskAdd.java | 11 +++---- .../web/page/admin/server/PageTaskEdit.java | 3 +- .../web/page/admin/server/PageTasks.java | 21 ++++++------- .../page/admin/server/TaskBasicTabPanel.java | 7 ++--- .../page/admin/server/TaskChangesPanel.java | 2 +- .../web/page/admin/server/TaskMainPanel.java | 4 +-- .../page/admin/server/TaskResultTabPanel.java | 8 +++-- .../admin/server/TaskSchedulingTabPanel.java | 19 ++++++------ .../TaskSubtasksAndThreadsTabPanel.java | 3 +- .../page/admin/server/TaskSummaryPanel.java | 7 ++--- .../page/admin/server/TaskWfChildPanel.java | 5 ++- .../page/admin/server/TaskWfParentPanel.java | 3 +- .../ActionsExecutedInformationPanel.java | 16 +++++----- .../IterativeInformationPanel.java | 27 ++++++++-------- .../server/dto/TaskCurrentStateDtoModel.java | 3 +- .../handlers/QueryBasedHandlerPanel.java | 3 +- .../handlers/ResourceRelatedHandlerPanel.java | 3 +- .../component/AssignmentsInfoDialog.java | 3 +- .../component/SelectableFolderContent.java | 11 ++++--- .../admin/users/component/TreeTablePanel.java | 3 +- .../admin/valuePolicy/PageValuePolicy.java | 2 +- .../page/admin/workflow/InformationPanel.java | 3 +- .../admin/workflow/ProcessInstancesPanel.java | 7 ++--- .../page/admin/workflow/WorkItemPanel.java | 7 +++-- .../admin/workflow/WorkItemSummaryPanel.java | 7 ++--- .../midpoint/web/page/error/PageError.java | 3 +- .../forgetpassword/PageForgotPassword.java | 4 +-- .../forgetpassword/PageSecurityQuestions.java | 2 +- .../web/page/login/PageAbstractFlow.java | 6 ++-- .../self/PageAbstractSelfCredentials.java | 8 ++--- .../web/page/self/PageAccountActivation.java | 8 ++--- .../page/self/PageAssignmentConflicts.java | 4 +-- .../page/self/PageAssignmentShoppingCart.java | 3 +- .../web/page/self/PageAssignmentsList.java | 7 ++--- .../web/page/self/UserViewTabPanel.java | 3 +- .../component/AssignmentConflictPanel.java | 19 ++++++------ .../self/component/ChangePasswordPanel.java | 7 ++--- .../self/component/DashboardSearchPanel.java | 2 +- .../web/page/self/component/LinksPanel.java | 5 ++- 222 files changed, 673 insertions(+), 808 deletions(-) diff --git a/build-system/pom.xml b/build-system/pom.xml index 536dc527838..2663aad7484 100644 --- a/build-system/pom.xml +++ b/build-system/pom.xml @@ -77,7 +77,7 @@ 6.4.0.jre8 2.3.0 6.0.6 - 7.10.0 + 8.2.0 2.4.14 5.22.0 5.22.0 @@ -169,7 +169,7 @@ org.apache.wicket wicket-datetime - ${wicket.version} + 8.0.0-M7 joda-time diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PendingOperationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PendingOperationPanel.java index 5e3b62f5977..39409908beb 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PendingOperationPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PendingOperationPanel.java @@ -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; @@ -84,7 +83,7 @@ public String getCssClass() { } private IModel createTextClass(IModel model) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @@ -120,7 +119,7 @@ public String getObject() { } private IModel createTextTooltipModel(IModel model) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @@ -157,7 +156,7 @@ private void buildStringItem(StringBuilder sb, String key, Object obj) { } private IModel createLabelText(IModel model) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java index 7072ae2698d..b0c126ff961 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java @@ -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; @@ -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() { + objectDeltaOperationMarkup.add(AttributeModifier.append("class", new IModel() { @Override public String getObject() { @@ -101,7 +100,7 @@ public String getObject() { parentPage.showResult(result); throw parentPage.redirectBackViaRestartResponseException(); } - IModel deltaModel = new AbstractReadOnlyModel() { + IModel deltaModel = new IModel() { private static final long serialVersionUID = 1L; public SceneDto getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/objecttypeselect/ObjectTypeSelectPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/objecttypeselect/ObjectTypeSelectPanel.java index f871d462343..0b22c15d129 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/objecttypeselect/ObjectTypeSelectPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/objecttypeselect/ObjectTypeSelectPanel.java @@ -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; @@ -49,7 +48,7 @@ public ObjectTypeSelectPanel(String id, IModel model, Class superclass private void initLayout(IModel model, final Class superclass) { select = new DropDownChoice<>(ID_SELECT, model, - new AbstractReadOnlyModel>() { + new IModel>() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.java index 8c61fb4e1bd..f1bb83b72d9 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.java @@ -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; @@ -92,7 +91,7 @@ public boolean isVisible() { }); ItemPathSegmentPanel itemDefPanel = new ItemPathSegmentPanel(ID_DEFINITION, - new AbstractReadOnlyModel() { + new IModel() { private static final long serialVersionUID = 1L; public ItemPathDto getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java index b971dac1f4d..5de2eec976b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java @@ -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; @@ -40,7 +39,7 @@ public ItemPathSegmentPanel(String id, IModel model) { private void initLayout() { Label label = new Label(ID_PARENT, - new AbstractReadOnlyModel() { + new IModel() { private static final long serialVersionUID = 1L; @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java index 63d58a85292..a988cf21717 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java @@ -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; @@ -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() { + iconType.add(new AttributeAppender("class", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -225,7 +224,7 @@ public void onClick(AjaxRequestTarget target) { box.add(close); - DownloadLink downloadXml = new DownloadLink("downloadXml", new AbstractReadOnlyModel() { + DownloadLink downloadXml = new DownloadLink("downloadXml", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -257,7 +256,7 @@ public void close(AjaxRequestTarget target) { } private Label createMessage() { - Label message = new Label(ID_MESSAGE_LABEL, new AbstractReadOnlyModel() { + Label message = new Label(ID_MESSAGE_LABEL, new IModel() { @Override public String getObject() { @@ -578,7 +577,7 @@ private void showHideAll(final boolean show, OpResult opresult, AjaxRequestTarge private IModel createHeaderCss() { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/ValidationErrorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/ValidationErrorPanel.java index 7a78847a367..c8259708a3c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/ValidationErrorPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/ValidationErrorPanel.java @@ -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; @@ -44,7 +43,7 @@ public void initLayout() { private IModel createHeaderCss() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -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() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/tabs/CountablePanelTab.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/tabs/CountablePanelTab.java index 3f11eca7e95..5d71f3156f8 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/tabs/CountablePanelTab.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/tabs/CountablePanelTab.java @@ -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; /** @@ -43,7 +42,7 @@ public IModel 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() { + return new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyEnumValuesModel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyEnumValuesModel.java index 32792a3bb63..19079f9ad3e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyEnumValuesModel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyEnumValuesModel.java @@ -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; @@ -26,7 +26,7 @@ * * @author mederly */ -public class ReadOnlyEnumValuesModel> extends AbstractReadOnlyModel> { +public class ReadOnlyEnumValuesModel> implements IModel> { private final List values; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyModel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyModel.java index ba4935bf552..fee4a21ce92 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyModel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyModel.java @@ -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 extends AbstractReadOnlyModel { +public class ReadOnlyModel implements IModel { @NotNull private final SerializableSupplier objectSupplier; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyValueModel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyValueModel.java index eaa5beaa4a2..cc948cd748b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyValueModel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/ReadOnlyValueModel.java @@ -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; /** @@ -25,7 +25,7 @@ * * @author mederly */ -public class ReadOnlyValueModel extends AbstractReadOnlyModel { +public class ReadOnlyValueModel implements IModel { @NotNull private final T object; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java index af46d2f88d0..2b187f8db49 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java @@ -402,7 +402,7 @@ public void resetCertWorkItemCountModel() { } protected void createBreadcrumb() { - BreadcrumbPageClass bc = new BreadcrumbPageClass(new AbstractReadOnlyModel() { + BreadcrumbPageClass bc = new BreadcrumbPageClass(new IModel() { private static final long serialVersionUID = 1L; @Override @@ -415,7 +415,7 @@ public String getObject() { } protected void createInstanceBreadcrumb() { - BreadcrumbPageInstance bc = new BreadcrumbPageInstance(new AbstractReadOnlyModel() { + BreadcrumbPageInstance bc = new BreadcrumbPageInstance(new IModel() { private static final long serialVersionUID = 1L; @Override @@ -748,7 +748,7 @@ private void initTitleLayout(WebMarkupContainer mainHeader) { WebMarkupContainer pageTitle = new WebMarkupContainer(ID_PAGE_TITLE); pageTitleContainer.add(pageTitle); - IModel deploymentNameModel = new AbstractReadOnlyModel() { + IModel deploymentNameModel = new IModel() { private static final long serialVersionUID = 1L; @@ -772,7 +772,7 @@ public String getObject() { pageTitleReal.setRenderBodyOnly(true); pageTitle.add(pageTitleReal); - IModel> breadcrumbsModel = new AbstractReadOnlyModel>() { + IModel> breadcrumbsModel = new IModel>() { private static final long serialVersionUID = 1L; @@ -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() { + body.add(new AttributeAppender("class", new IModel() { private static final long serialVersionUID = 1L; @@ -951,7 +951,7 @@ public boolean isVisible() { mainHeader.add(navigation); - IModel logoModel = new AbstractReadOnlyModel() { + IModel logoModel = new IModel() { private static final long serialVersionUID = 1L; @@ -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() { + customLogoImgCss.add(new AttributeAppender("class", new IModel() { private static final long serialVersionUID = 1L; @@ -1002,7 +1002,7 @@ public String getObject() { } })); - mainHeader.add(new AttributeAppender("style", new AbstractReadOnlyModel() { + mainHeader.add(new AttributeAppender("style", new IModel() { private static final long serialVersionUID = 1L; @@ -1064,7 +1064,7 @@ public String getDescribe() { footerContainer.add(copyrightMessage); Label subscriptionMessage = new Label(ID_SUBSCRIPTION_MESSAGE, - new AbstractReadOnlyModel() { + new IModel() { private static final long serialVersionUID = 1L; @Override @@ -1097,7 +1097,7 @@ public String getObject() { } private AttributeAppender createHeaderColorStyleModel(boolean checkSkinUsage) { - return new AttributeAppender("style", new AbstractReadOnlyModel() { + return new AttributeAppender("style", new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java index e5ac8f39205..e25eb2a825c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java @@ -743,7 +743,7 @@ public static IModel createLocalizedModelForEnum(T valu } public static IModel> createReadonlyModelFromEnum(final Class type) { - return new AbstractReadOnlyModel>() { + return new IModel>() { @Override public List getObject() { @@ -796,7 +796,7 @@ public static List createTaskCategoryList() { public static IModel createCategoryNameModel(final Component component, final IModel categorySymbolModel) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { return createStringResourceStatic(component, @@ -894,7 +894,7 @@ public static DropDownChoicePanel createEnumPanel(final PrismPropertyDefinition // final Class clazz = model.getObject().getClass(); final Object o = model.getObject(); - final IModel> enumModelValues = new AbstractReadOnlyModel>() { + final IModel> enumModelValues = new IModel>() { private static final long serialVersionUID = 1L; @@ -2338,16 +2338,14 @@ protected WebMarkupContainer newLink(String linkId, final int index) { private static final long serialVersionUID = 1L; @Override - protected void onError(AjaxRequestTarget target, - org.apache.wicket.markup.html.form.Form form) { - super.onError(target, form); + protected void onError(AjaxRequestTarget target) { + super.onError(target); target.add(parentPage.getFeedbackPanel()); } @Override - protected void onSubmit(AjaxRequestTarget target, - org.apache.wicket.markup.html.form.Form form) { - super.onSubmit(target, form); + protected void onSubmit(AjaxRequestTarget target) { + super.onSubmit(target); setSelectedTab(index); if (target != null) { @@ -2736,7 +2734,7 @@ public static ObjectFilter createAssociationShadowRefFilter(RefinedAssociationDe } private static IModel> createChoices() { - return new AbstractReadOnlyModel>() { + return new IModel>() { @Override public List getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java index c864146b127..f567574267b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java @@ -27,7 +27,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -210,7 +209,7 @@ public int getItemsPerPage() { @Override protected Item> customizeNewRowItem(Item> item, IModel> model) { - item.add(AttributeModifier.append("class", new AbstractReadOnlyModel() { + item.add(AttributeModifier.append("class", new IModel() { private static final long serialVersionUID = 1L; @@ -338,7 +337,7 @@ private MultivalueContainerListDataProvider getDataProvider() { protected IModel createStyleClassModelForNewObjectIcon() { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanelWithDetailsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanelWithDetailsPanel.java index a4859a17bb8..2a030d753c3 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanelWithDetailsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanelWithDetailsPanel.java @@ -22,7 +22,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; 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 com.evolveum.midpoint.prism.Containerable; @@ -95,7 +94,7 @@ public boolean isVisible() { add(details); ListView> itemDetailsView = new ListView>(MultivalueContainerListPanelWithDetailsPanel.ID_ITEMS_DETAILS, - new AbstractReadOnlyModel>>() { + new IModel>>() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/form/TriStateFormGroup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/form/TriStateFormGroup.java index a18db5dfd16..edad40110ff 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/form/TriStateFormGroup.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/form/TriStateFormGroup.java @@ -28,7 +28,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.panel.FeedbackPanel; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -87,7 +86,7 @@ private void initLayout(IModel label, final String tooltipKey, boolean i labelContainer.add(l); Label tooltipLabel = new Label(ID_TOOLTIP, new Model<>()); - tooltipLabel.add(new AttributeAppender("data-original-title", new AbstractReadOnlyModel() { + tooltipLabel.add(new AttributeAppender("data-original-title", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/GlobalPolicyRuleTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/GlobalPolicyRuleTabPanel.java index bb6149288ee..78fccf51ba0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/GlobalPolicyRuleTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/GlobalPolicyRuleTabPanel.java @@ -29,7 +29,6 @@ import org.apache.wicket.markup.html.basic.MultiLineLabel; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -215,7 +214,7 @@ private List, String>> initB @Override protected IModel createIconModel(IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/LoggingConfigurationTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/LoggingConfigurationTabPanel.java index d2f2e373b7d..9be142b0a68 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/LoggingConfigurationTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/LoggingConfigurationTabPanel.java @@ -34,7 +34,6 @@ import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.StringResourceModel; @@ -267,7 +266,7 @@ protected WebMarkupContainer initButtonToolbar(String contentAreaId) { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form form) { + protected void onSubmit(AjaxRequestTarget target) { newItemPerformed(target); } }; @@ -327,7 +326,7 @@ private List, String @Override protected IModel createIconModel(IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @@ -450,7 +449,7 @@ private MultivalueContainerDetailsPanel getAppendersM @Override protected DisplayNamePanel createDisplayNamePanel(String displayNamePanelId) { - IModel displayNameModel = new AbstractReadOnlyModel() { + IModel displayNameModel = new IModel() { private static final long serialVersionUID = 1L; @@ -519,7 +518,7 @@ private List, String>> @Override protected IModel createIconModel(IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/StringPropertyNotificationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/StringPropertyNotificationPanel.java index 8d42a711048..360bc4eca34 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/StringPropertyNotificationPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/StringPropertyNotificationPanel.java @@ -23,7 +23,6 @@ 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 com.evolveum.midpoint.gui.api.page.PageBase; @@ -91,7 +90,7 @@ private void initLayout(final IModel model, final Form form) { final IModel label = name; Label displayName = new Label(ID_LABEL, label); - displayName.add(new AttributeModifier("style", new AbstractReadOnlyModel() { + displayName.add(new AttributeModifier("style", new IModel() { private static final long serialVersionUID = 1L; @@ -123,7 +122,7 @@ public boolean isVisible() { } else { throw new IllegalStateException("Unsupported type " + getModel().getObject().getClass().getName() + " for Model"); } - panel.add(new AttributeModifier("class", new AbstractReadOnlyModel() { + panel.add(new AttributeModifier("class", new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxIconButton.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxIconButton.java index 7389a339afe..4284ad4f5fc 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxIconButton.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxIconButton.java @@ -24,7 +24,6 @@ import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupStream; import org.apache.wicket.markup.parser.XmlTag; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; /** @@ -43,7 +42,7 @@ public AjaxIconButton(String id, IModel icon, IModel title) { this.title = title; - add(AttributeAppender.append("class", new AbstractReadOnlyModel() { + add(AttributeAppender.append("class", new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxTabbedPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxTabbedPanel.java index 6502d4e0a7e..dda64b8b93b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxTabbedPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxTabbedPanel.java @@ -23,6 +23,7 @@ import org.apache.wicket.model.IModel; import java.util.List; +import java.util.Optional; /** * Ajaxified version of the tabbed panel. Uses AjaxFallbackLink instead of regular wicket links so @@ -78,17 +79,16 @@ protected WebMarkupContainer newLink(final String linkId, final int index) private static final long serialVersionUID = 1L; @Override - public void onClick(final AjaxRequestTarget target) + public void onClick(final Optional target) { setSelectedTab(index); onTabChange(index); - if (target != null) + if (target != null && target.get() != null) { - target.add(AjaxTabbedPanel.this); + target.get().add(AjaxTabbedPanel.this); } - onAjaxUpdate(target); + onAjaxUpdate(target.get()); } - }; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.java index 84f2d04b395..874e7291d7a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.java @@ -56,12 +56,12 @@ protected void initLayout() { createStringResource("BasicSearchPanel.search")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { searchPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } }; @@ -70,12 +70,12 @@ protected void onError(AjaxRequestTarget target, Form form) { AjaxSubmitButton clearButton = new AjaxSubmitButton(ID_CLEAR_SEARCH) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { clearSearchPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BootstrapLabel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BootstrapLabel.java index 650de704b71..dbe07fd9081 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BootstrapLabel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BootstrapLabel.java @@ -18,7 +18,6 @@ import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; /** @@ -33,7 +32,7 @@ public static enum State { public BootstrapLabel(String id, IModel model, final IModel state) { super(id, model); - add(AttributeAppender.append("class", new AbstractReadOnlyModel() { + add(AttributeAppender.append("class", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DefaultAjaxSubmitButton.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DefaultAjaxSubmitButton.java index 66c5b5d2ab3..4b26cccfa74 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DefaultAjaxSubmitButton.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DefaultAjaxSubmitButton.java @@ -37,12 +37,12 @@ public DefaultAjaxSubmitButton(String id, IModel label, PageBase pageBas } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(pageBase.getFeedbackPanel()); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { - onSubmit.accept(target, form); + protected void onSubmit(AjaxRequestTarget target) { + onSubmit.accept(target, getForm()); } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java index af3b7606cd3..6a54f76f993 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java @@ -34,7 +34,6 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.*; import org.apache.wicket.MarkupContainer; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.resource.AbstractResource; @@ -135,7 +134,7 @@ protected void addAdditionalExpressionVariables(ExpressionVariables variables) { @Override protected IModel getPhotoModel() { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java index 3b3ceb8e03c..d34cb31b8fe 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java @@ -30,7 +30,6 @@ import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.FeedbackPanel; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import com.evolveum.midpoint.gui.api.component.BasePanel; @@ -113,7 +112,7 @@ public boolean isVisible() { @Override protected void populateItem(final ListItem item) { WebMarkupContainer textWrapper = new WebMarkupContainer(ID_TEXT_WRAPPER); - textWrapper.add(AttributeAppender.prepend("class", new AbstractReadOnlyModel(){ + textWrapper.add(AttributeAppender.prepend("class", new IModel(){ private static final long serialVersionUID = 1L; @Override @@ -153,7 +152,7 @@ public void onClick(AjaxRequestTarget target) { textWrapper.add(edit); WebMarkupContainer buttonGroup = new WebMarkupContainer(ID_BUTTON_GROUP); - buttonGroup.add(AttributeAppender.append("class", new AbstractReadOnlyModel() { + buttonGroup.add(AttributeAppender.append("class", new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java index 96e017103c3..1d9f3eb016e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java @@ -29,7 +29,6 @@ import org.apache.wicket.markup.html.list.Loop; import org.apache.wicket.markup.html.list.LoopItem; 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.apache.wicket.util.lang.Args; @@ -102,7 +101,7 @@ public TabbedPanel(final String id, final IModel> tabs, IModel this.tabs = Args.notNull(tabs, "tabs"); - final IModel tabCount = new AbstractReadOnlyModel() { + final IModel tabCount = new IModel() { private static final long serialVersionUID = 1L; @Override @@ -137,7 +136,7 @@ protected void populateItem(final LoopItem item) { Label countLabel = new Label(ID_COUNT, countModel); countLabel.setVisible(countModel != null); countLabel.setOutputMarkupId(true); - countLabel.add(AttributeModifier.append("class", new AbstractReadOnlyModel() { + countLabel.add(AttributeModifier.append("class", new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java index 20c11824e59..6948bf7f15b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java @@ -22,7 +22,6 @@ import com.evolveum.midpoint.web.component.prism.*; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -61,7 +60,7 @@ protected void onInitialize() { protected void initLayout(){ - final AbstractReadOnlyModel displayNameModel = new AbstractReadOnlyModel() { + final IModel displayNameModel = new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentListPanel.java index 9d4bb2b4b60..ece689af47a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentListPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentListPanel.java @@ -28,7 +28,6 @@ import com.evolveum.midpoint.web.page.admin.users.dto.UserDtoStatus; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import java.util.ArrayList; @@ -62,7 +61,7 @@ protected void deleteAssignmentPerformed(AjaxRequestTarget target, AssignmentEdi } public Popupable getDeleteAssignmentPopupContent(AssignmentEditorDto dto) { - return new ConfirmationPanel(getPageBase().getMainPopupBodyId(), new AbstractReadOnlyModel() { + return new ConfirmationPanel(getPageBase().getMainPopupBodyId(), new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java index f79ec070ac0..d2cca772f00 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java @@ -75,7 +75,6 @@ import org.apache.wicket.markup.html.form.TextArea; 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 org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; @@ -300,7 +299,7 @@ public boolean isVisible(){ } protected IModel createAssignmentNameLabelModel(final boolean isManager) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -413,7 +412,7 @@ public boolean isVisible(){ new PropertyModel<>(getModel(), AssignmentEditorDto.F_FOCUS_TYPE), FocusType.class); focusTypeContainer.add(focusType); - Label relationLabel = new Label(ID_RELATION_LABEL, new AbstractReadOnlyModel() { + Label relationLabel = new Label(ID_RELATION_LABEL, new IModel() { @Override public String getObject() { @@ -620,7 +619,7 @@ public void onClick(AjaxRequestTarget target) { getModelObject().getOldValue().asContainerable() == null){ metadataPanel = new WebMarkupContainer(ID_METADATA_CONTAINER); } else { - metadataPanel = new MetadataPanel(ID_METADATA_CONTAINER, new AbstractReadOnlyModel() { + metadataPanel = new MetadataPanel(ID_METADATA_CONTAINER, new IModel() { @Override public MetadataType getObject() { return getModelObject().getOldValue().getValue().getMetadata(); @@ -776,7 +775,7 @@ public boolean isVisible() { } private IModel createShowEmptyLabel() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -926,7 +925,7 @@ private ResourceAttributeDefinitionType findOrCreateValueConstruction(PrismPrope } protected IModel createImageTypeModel(final IModel model) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java index a6cb159b660..b03b3f5977b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java @@ -57,7 +57,6 @@ import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -274,7 +273,7 @@ private List, String>> initBasicCo @Override protected IModel createIconModel(IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @@ -444,7 +443,7 @@ protected Fragment getSpecificContainers(String contentAreaId) { ItemPath assignmentPath = item.getModelObject().getContainerValue().getValue().asPrismContainerValue().getPath(); ContainerWrapperFromObjectWrapperModel activationModel = new ContainerWrapperFromObjectWrapperModel(((PageAdminObjectDetails)getPageBase()).getObjectModel(), assignmentPath.append(AssignmentType.F_ACTIVATION)); - PrismContainerPanel acitvationContainer = new PrismContainerPanel(ID_ACTIVATION_PANEL, Model.of(activationModel), true, form, itemWrapper -> getActivationVisibileItems(itemWrapper.getPath(), assignmentPath), getPageBase()); + PrismContainerPanel acitvationContainer = new PrismContainerPanel(ID_ACTIVATION_PANEL, IModel.of(activationModel), true, form, itemWrapper -> getActivationVisibileItems(itemWrapper.getPath(), assignmentPath), getPageBase()); specificContainers.add(acitvationContainer); return specificContainers; @@ -593,7 +592,7 @@ private ItemVisibility getAssignmentBasicTabVisibity(ItemWrapper itemWrapper, It } private IModel getDisplayModel(AssignmentType assignment){ - final AbstractReadOnlyModel displayNameModel = new AbstractReadOnlyModel() { + final IModel displayNameModel = new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java index 7fa426be713..54e3a9b62fd 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java @@ -35,7 +35,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 org.apache.wicket.model.Model; @@ -170,7 +169,7 @@ protected boolean ignoreMandatoryAttributes(){ } protected AttributeModifier getClassModifier(ListItem item){ - return AttributeModifier.append("class", new AbstractReadOnlyModel() { + return AttributeModifier.append("class", new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java index 2b8f80630bc..9904062124e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java @@ -19,7 +19,6 @@ import com.evolveum.midpoint.web.session.RoleCatalogStorage; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; import org.apache.commons.lang3.StringUtils; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -51,7 +50,7 @@ public static IModel createActivationTitleModel(ActivationType activatio public static IModel createActivationTitleModel(ActivationStatusType administrativeStatus, XMLGregorianCalendar validFrom, XMLGregorianCalendar validTo, BasePanel basePanel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -177,7 +176,7 @@ public static String createAssignmentStatusClassModel(final ContainerValueWrappe } public static IModel createAssignmentStatusClassModel(final UserDtoStatus model) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -199,7 +198,7 @@ public boolean isEnabled(){ } public static IModel createAssignmentIconTitleModel(BasePanel panel, AssignmentEditorDtoType type){ - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssociationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssociationPanel.java index 44663418417..39714edfe27 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssociationPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssociationPanel.java @@ -163,7 +163,7 @@ protected void addFirstPerformed(AjaxRequestTarget target){ @Override protected IModel createTextModel(final IModel model) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GdprAssignmentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GdprAssignmentPanel.java index e8209a7408b..a2149273edd 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GdprAssignmentPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GdprAssignmentPanel.java @@ -31,7 +31,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -70,7 +69,7 @@ protected IModel getEnabled(IModel getCheckBoxValueModel(IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GridViewComponent.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GridViewComponent.java index 13299fa4e50..efcebe40e49 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GridViewComponent.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GridViewComponent.java @@ -28,7 +28,6 @@ import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.GridView; import org.apache.wicket.markup.repeater.data.IDataProvider; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import java.util.List; @@ -103,7 +102,7 @@ public boolean isVisible(){ } }); - final Label count = new Label(ID_COUNT, new AbstractReadOnlyModel() { + final Label count = new Label(ID_COUNT, new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.java index 2355772ee5b..199cb7f6ec5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.java @@ -27,7 +27,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.repeater.RepeatingView; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; @@ -98,7 +97,7 @@ private void initLayout(){ metadataRow.add(new Label(ID_METADATA_PROPERTY_KEY, createStringResource(DOT_CLASS + qname.getLocalPart()))); - AbstractReadOnlyModel metadataFieldModel = new AbstractReadOnlyModel() { + IModel metadataFieldModel = new IModel() { @Override public String getObject() { PropertyModel tempModel = new PropertyModel<>(getModel(), diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.java index 8c4c25ca714..2491b5e2671 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.java @@ -19,7 +19,6 @@ import org.apache.wicket.AttributeModifier; 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; @@ -50,7 +49,7 @@ protected void initHeaderRow(){ box.add(new AttributeModifier("class", BOX_CSS_CLASS + " " + getBoxAdditionalCssClass())); box.add(new Label(ID_DISPLAY_NAME, new PropertyModel(getModel(), AssignmentEditorDto.F_NAME))); - box.add(new Label(ID_DESCRIPTION, new AbstractReadOnlyModel() { + box.add(new Label(ID_DESCRIPTION, new IModel() { @Override public String getObject(){ return getModelObject().getTargetRef() != null @@ -101,7 +100,7 @@ private String getIconCssClass(){ @Override protected IModel createHeaderClassModel(final IModel model) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/UserSelectionButton.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/UserSelectionButton.java index e8e1ee34024..d2ae0e988a7 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/UserSelectionButton.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/UserSelectionButton.java @@ -27,7 +27,6 @@ import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.behavior.AttributeAppender; 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.StringResourceModel; @@ -83,7 +82,7 @@ public void onClick(AjaxRequestTarget target) { }; userSelectionButton.add(AttributeModifier.append("class", getTargetUserButtonClass())); userSelectionButton.setOutputMarkupId(true); - userSelectionButton.add(new AttributeAppender("title", new AbstractReadOnlyModel() { + userSelectionButton.add(new AttributeAppender("title", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -93,7 +92,7 @@ public String getObject() { })); add(userSelectionButton); - Label label = new Label(ID_USER_SELECTION_BUTTON_LABEL, new AbstractReadOnlyModel() { + Label label = new Label(ID_USER_SELECTION_BUTTON_LABEL, new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/breadcrumbs/Breadcrumb.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/breadcrumbs/Breadcrumb.java index 69631fbd5e3..87462b59ecd 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/breadcrumbs/Breadcrumb.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/breadcrumbs/Breadcrumb.java @@ -22,7 +22,6 @@ import com.evolveum.midpoint.util.logging.TraceManager; import org.apache.wicket.RestartResponseException; import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -71,7 +70,7 @@ public PageParameters getParameters() { public IModel getLabel() { if (labelModel == null && label != null) { - labelModel = new AbstractReadOnlyModel() { + labelModel = new IModel() { private static final long serialVersionUID = 1L; @Override public String getObject() { @@ -88,7 +87,7 @@ public void setLabel(final IModel label) { return; } - this.labelModel = new AbstractReadOnlyModel() { + this.labelModel = new IModel() { private static final long serialVersionUID = 1L; @Override @@ -103,7 +102,6 @@ public String getObject() { @Override public void detach() { - super.detach(); Breadcrumb.this.label = label.getObject(); Breadcrumb.this.labelModel = null; } @@ -113,7 +111,7 @@ public void detach() { public IModel getIcon() { if (iconModel == null && icon != null) { - iconModel = new AbstractReadOnlyModel() { + iconModel = new IModel() { private static final long serialVersionUID = 1L; @Override public String getObject() { @@ -130,7 +128,7 @@ public void setIcon(final IModel icon) { return; } - this.iconModel = new AbstractReadOnlyModel() { + this.iconModel = new IModel() { private static final long serialVersionUID = 1L; @Override @@ -145,7 +143,6 @@ public String getObject() { @Override public void detach() { - super.detach(); Breadcrumb.this.icon = icon.getObject(); Breadcrumb.this.iconModel = null; } @@ -182,7 +179,7 @@ private IModel wrapModel(final IModel model) { return null; } - return new AbstractReadOnlyModel() { + return new IModel() { @Override public T getObject() { @@ -196,7 +193,6 @@ public T getObject() { @Override public void detach() { - super.detach(); model.getObject(); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java index 08a772e7372..d73257d583c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java @@ -45,7 +45,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder; import org.apache.wicket.extensions.markup.html.repeater.util.SortParam; import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.jetbrains.annotations.NotNull; @@ -191,7 +190,7 @@ public void setQuery(ObjectQuery query) { * @return By defaults it returns true. */ public IModel isSizeAvailableModel() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public Boolean getObject() { return true; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java index 804dd477dd7..2618e2683ff 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java @@ -29,7 +29,7 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; +import org.apache.wicket.model.IModel; import com.evolveum.midpoint.gui.api.component.BasePanel; import com.evolveum.midpoint.gui.api.page.PageBase; @@ -82,7 +82,7 @@ public BoxedTablePanel(String id, ISortableDataProvider provider, List> columns, ISortableDataProvider provider, int pageSize) { setOutputMarkupId(true); WebMarkupContainer box = new WebMarkupContainer(ID_BOX); - box.add(new AttributeAppender("class", new AbstractReadOnlyModel() { + box.add(new AttributeAppender("class", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -241,7 +241,7 @@ private void initLayout(final BoxedTablePanel boxedTablePanel, final Table table WebMarkupContainer footerContainer = new WebMarkupContainer(ID_FOOTER_CONTAINER); footerContainer.setOutputMarkupId(true); - final Label count = new Label(ID_COUNT, new AbstractReadOnlyModel() { + final Label count = new Label(ID_COUNT, new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.java index de6abc1bfb1..d754f01fe76 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.java @@ -28,7 +28,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.navigation.paging.IPageable; import org.apache.wicket.markup.repeater.data.DataViewBase; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; /** @@ -49,7 +48,7 @@ protected void onInitialize() { super.onInitialize(); WebMarkupContainer td = new WebMarkupContainer(ID_TD); - td.add(AttributeModifier.replace("colspan", new AbstractReadOnlyModel() { + td.add(AttributeModifier.replace("colspan", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java index aea4c679903..d88350e9f74 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java @@ -62,14 +62,14 @@ protected void initLayout() { AjaxSubmitButton button = new AjaxSubmitButton(ID_BUTTON) { @Override - protected void onError(AjaxRequestTarget target, Form form) { - super.onError(target, form); + protected void onError(AjaxRequestTarget target) { + super.onError(target); target.add(getPageBase().getFeedbackPanel()); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { - super.onSubmit(target, form); + protected void onSubmit(AjaxRequestTarget target) { + super.onSubmit(target); pageSizeChanged(target); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.java index 99f8998bdf8..fa968f820ef 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.java @@ -20,6 +20,9 @@ import com.evolveum.midpoint.web.component.AjaxSubmitButton; import com.evolveum.midpoint.web.session.UserProfileStorage; import com.evolveum.midpoint.web.util.SearchFormEnterBehavior; + +import org.apache.wicket.Component; +import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.feedback.ComponentFeedbackMessageFilter; @@ -101,12 +104,12 @@ private void initPopoverLayout() { AjaxSubmitButton button = new AjaxSubmitButton(ID_BUTTON) { @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(TableConfigurationPanel.this.get(createComponentPath(ID_POPOVER, ID_FORM, "inputFeedback"))); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { pageSizeChanged(target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java index 7a0f0707b73..b01e346370f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java @@ -32,7 +32,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider; 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; @@ -120,7 +119,7 @@ public boolean isVisible() { private IModel showPagedPagingModel(ISortableDataProvider provider) { if (!(provider instanceof BaseSortableDataProvider)) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public Boolean getObject() { return true; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java index c2b9d4cc2de..28a6ade9d76 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java @@ -32,10 +32,11 @@ import org.apache.wicket.markup.repeater.data.IDataProvider; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import org.apache.wicket.util.iterator.ComponentHierarchyIterator; import java.io.Serializable; +import java.util.Iterator; import java.util.List; +import java.util.stream.Stream; /** * @author lazyman @@ -117,8 +118,9 @@ protected void onUpdateHeader(AjaxRequestTarget target, boolean selected, DataTa } } - ComponentHierarchyIterator iterator = table.visitChildren(SelectableDataTable.SelectableRowItem.class); - + Stream stream = table.streamChildren(); + Iterator iterator = stream.iterator(); + while (iterator.hasNext()) { SelectableDataTable.SelectableRowItem row = (SelectableDataTable.SelectableRowItem) iterator.next(); if (!row.getOutputMarkupId()) { @@ -173,7 +175,8 @@ protected void onUpdateRow(AjaxRequestTarget target, DataTable table, IModel public IsolatedCheckBoxPanel findCheckBoxColumnHeader(DataTable table) { WebMarkupContainer topToolbars = table.getTopToolbars(); - ComponentHierarchyIterator iterator = topToolbars.visitChildren(TableHeadersToolbar.class); + Stream stream = topToolbars.streamChildren(); + Iterator iterator = stream.iterator(); if (!iterator.hasNext()) { return null; } @@ -182,7 +185,7 @@ public IsolatedCheckBoxPanel findCheckBoxColumnHeader(DataTable table) { // simple attempt to find checkbox which is header for our column // todo: this search will fail if there are more checkbox header columns (which is not supported now, // because Selectable.F_SELECTED is hardcoded all over the place... - iterator = toolbar.visitChildren(IsolatedCheckBoxPanel.class); + iterator = toolbar.streamChildren().iterator(); while (iterator.hasNext()) { Component c = iterator.next(); if (!c.getOutputMarkupId()) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java index c20c4a4d444..b254ac1f734 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java @@ -44,7 +44,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.RepeatingView; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -159,7 +158,7 @@ private static IColumn, String> getEmpt @Override protected IModel createIconModel(final IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -176,7 +175,7 @@ private static IColumn, String> getDefa @Override protected IModel createIconModel(final IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -191,7 +190,7 @@ public String getObject() { @Override protected IModel createTitleModel(final IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -218,7 +217,7 @@ private static IColumn, String> getUser @Override protected IModel createIconModel(final IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -232,7 +231,7 @@ public String getObject() { @Override protected IModel createTitleModel(final IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -260,7 +259,7 @@ public static IColumn, String> getShado @Override protected IModel createIconModel(final IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -307,7 +306,7 @@ private static IColumn, String> getRole @Override protected IModel createIconModel(final IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -326,7 +325,7 @@ private static IColumn, String> getOrgI @Override protected IModel createIconModel(final IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -349,7 +348,7 @@ private static IColumn, String> getServ @Override protected IModel createIconModel(final IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { /** * @@ -372,7 +371,7 @@ private static IColumn, String> getTask @Override protected IModel createIconModel(final IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @@ -392,7 +391,7 @@ private static IColumn, String> getAcce @Override protected IModel createIconModel(final IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -411,7 +410,7 @@ private static IColumn, String> getReso @Override protected IModel createIconModel(final IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java index 1165928ef80..086bc0d1f4a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java @@ -150,7 +150,7 @@ private void buttonMenuItemClickPerformed(int id, List but showConfirmationPopup(menuItem, target); } else { if (menuItem.isSubmit()){ - menuItem.getAction().onSubmit(target, null); + menuItem.getAction().onSubmit(target); } else { menuItem.getAction().onClick(target); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ObjectNameColumn.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ObjectNameColumn.java index c32161415ba..5cbe2097b29 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ObjectNameColumn.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ObjectNameColumn.java @@ -22,7 +22,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.export.IExportableColumn; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import com.evolveum.midpoint.gui.api.util.WebComponentUtil; @@ -57,7 +56,7 @@ public ObjectNameColumn(IModel displayModel, String itemPath) { public void populateItem(final Item>> cellItem, String componentId, final IModel> rowModel) { - IModel labelModel = new AbstractReadOnlyModel() { + IModel labelModel = new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java index f6085f6d9df..1bd4ab3c7a0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java @@ -30,7 +30,6 @@ import org.apache.wicket.markup.html.navigation.paging.IPageable; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.markup.repeater.AbstractRepeater; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; /** @@ -56,7 +55,7 @@ public class NavigatorPanel extends Panel { private final IModel showPageListingModel; public NavigatorPanel(String id, IPageable pageable, final boolean showPageListing) { - this(id, pageable, new AbstractReadOnlyModel() { + this(id, pageable, new IModel() { @Override public Boolean getObject() { return showPageListing; @@ -91,7 +90,7 @@ private void initLayout() { private void initPrevious() { WebMarkupContainer previous = new WebMarkupContainer(ID_PREVIOUS); - previous.add(new AttributeModifier("class", new AbstractReadOnlyModel() { + previous.add(new AttributeModifier("class", new IModel() { @Override public String getObject() { @@ -123,7 +122,7 @@ public boolean isEnabled() { private void initFirst() { WebMarkupContainer first = new WebMarkupContainer(ID_FIRST); - first.add(new AttributeModifier("class", new AbstractReadOnlyModel() { + first.add(new AttributeModifier("class", new IModel() { @Override public String getObject() { @@ -154,7 +153,7 @@ public boolean isEnabled() { } private void initNavigation() { - IModel model = new AbstractReadOnlyModel() { + IModel model = new IModel() { @Override public Integer getObject() { @@ -181,7 +180,7 @@ public void onClick(AjaxRequestTarget target) { }; item.add(pageLink); - item.add(new AttributeModifier("class", new AbstractReadOnlyModel() { + item.add(new AttributeModifier("class", new IModel() { @Override public String getObject() { @@ -225,7 +224,7 @@ private long computePageNumber(int loopIndex) { private void initNext() { WebMarkupContainer next = new WebMarkupContainer(ID_NEXT); - next.add(new AttributeModifier("class", new AbstractReadOnlyModel() { + next.add(new AttributeModifier("class", new IModel() { @Override public String getObject() { @@ -258,7 +257,7 @@ public boolean isEnabled() { private void initLast() { WebMarkupContainer last = new WebMarkupContainer(ID_LAST); - last.add(new AttributeModifier("class", new AbstractReadOnlyModel() { + last.add(new AttributeModifier("class", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/HelpInfoPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/HelpInfoPanel.java index e39693cd0b0..f1582c50b23 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/HelpInfoPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/HelpInfoPanel.java @@ -6,7 +6,7 @@ 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.StringResourceModel; /** @@ -30,7 +30,7 @@ public void initLayout(final String messageKey){ WebMarkupContainer content = new WebMarkupContainer(ID_CONTENT); add(content); - Label helpLabel = new Label(ID_HELP, new AbstractReadOnlyModel() { + Label helpLabel = new Label(ID_HELP, new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/AceEditorFormGroup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/AceEditorFormGroup.java index 89ebe76de04..c4100435ec6 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/AceEditorFormGroup.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/AceEditorFormGroup.java @@ -26,7 +26,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.TextArea; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -76,7 +75,7 @@ private void initLayout(IModel label, final String tooltipKey, boolean i labelContainer.add(l); Label tooltipLabel = new Label(ID_TOOLTIP, new Model<>()); - tooltipLabel.add(new AttributeAppender("data-original-title", new AbstractReadOnlyModel() { + tooltipLabel.add(new AttributeAppender("data-original-title", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.java index fdcc407a0b6..5e31fa57c64 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.java @@ -25,7 +25,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.CheckBox; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -65,7 +64,7 @@ private void initLayout(IModel label, final String tooltipKey, boolean i labelContainer.add(l); Label tooltipLabel = new Label(ID_TOOLTIP, new Model<>()); - tooltipLabel.add(new AttributeAppender("data-original-title", new AbstractReadOnlyModel() { + tooltipLabel.add(new AttributeAppender("data-original-title", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java index c8de3e1b76e..c874d9f8013 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java @@ -29,7 +29,6 @@ import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.IChoiceRenderer; import org.apache.wicket.markup.html.panel.FeedbackPanel; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -91,7 +90,7 @@ private void initLayout(IModel> choices, IChoiceRenderer renderer, IM labelContainer.add(l); Label tooltipLabel = new Label(ID_TOOLTIP, new Model<>()); - tooltipLabel.add(new AttributeAppender("data-original-title", new AbstractReadOnlyModel() { + tooltipLabel.add(new AttributeAppender("data-original-title", new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.java index 689f55a679c..19077be1e01 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.java @@ -26,7 +26,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.TextArea; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -76,7 +75,7 @@ private void initLayout(IModel label, final String tooltipKey, boolean i labelContainer.add(l); Label tooltipLabel = new Label(ID_TOOLTIP, new Model<>()); - tooltipLabel.add(new AttributeAppender("data-original-title", new AbstractReadOnlyModel() { + tooltipLabel.add(new AttributeAppender("data-original-title", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.java index 9581710d3bc..7311f541abe 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.java @@ -27,7 +27,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.panel.FeedbackPanel; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -85,7 +84,7 @@ private void initLayout(IModel label, final String tooltipKey, boolean i labelContainer.add(l); Label tooltipLabel = new Label(ID_TOOLTIP, new Model<>()); - tooltipLabel.add(new AttributeAppender("data-original-title", new AbstractReadOnlyModel() { + tooltipLabel.add(new AttributeAppender("data-original-title", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java index 6b69d659905..321f05cbf7c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java @@ -29,7 +29,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.panel.FeedbackPanel; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import com.evolveum.midpoint.gui.api.component.BasePanel; @@ -179,7 +178,7 @@ protected String getOffsetClass() { protected IModel createTextModel() { final IModel model = getModel(); - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/GenericMultiValueLabelEditPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/GenericMultiValueLabelEditPanel.java index 522923f200a..03293b4339f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/GenericMultiValueLabelEditPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/GenericMultiValueLabelEditPanel.java @@ -34,7 +34,6 @@ import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.FeedbackPanel; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import java.io.Serializable; @@ -126,7 +125,7 @@ public void onClick(AjaxRequestTarget target) { @Override protected void populateItem(final ListItem listItem) { WebMarkupContainer textWrapper = new WebMarkupContainer(ID_TEXT_WRAPPER); - textWrapper.add(AttributeAppender.prepend("class", new AbstractReadOnlyModel() { + textWrapper.add(AttributeAppender.prepend("class", new IModel() { @Override public String getObject() { @@ -158,7 +157,7 @@ protected void onUpdate(AjaxRequestTarget ajaxRequestTarget) {} textWrapper.add(feedback); WebMarkupContainer buttonGroup = new WebMarkupContainer(ID_BUTTON_GROUP); - buttonGroup.add(AttributeAppender.append("class", new AbstractReadOnlyModel() { + buttonGroup.add(AttributeAppender.append("class", new IModel() { @Override public String getObject() { @@ -210,7 +209,7 @@ protected String getOffsetClass() { } protected IModel createTextModel(final IModel model) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.java index 01c157162de..2129b9a336d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.java @@ -31,7 +31,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; 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 org.apache.wicket.model.StringResourceModel; import org.apache.wicket.util.string.Strings; @@ -83,7 +82,7 @@ public void onClick(AjaxRequestTarget target) { addValuePerformed(target); } }; - placeholderAdd.add(new AttributeAppender("class", new AbstractReadOnlyModel() { + placeholderAdd.add(new AttributeAppender("class", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.java index a371058b1df..2926b6840a6 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.java @@ -34,7 +34,6 @@ import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.FeedbackPanel; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import com.evolveum.midpoint.gui.api.component.BasePanel; @@ -187,7 +186,7 @@ protected String getOffsetClass() { } protected IModel createTextModel(final IModel model) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueDropDownPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueDropDownPanel.java index e46b443fd6c..e2a272819aa 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueDropDownPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueDropDownPanel.java @@ -30,7 +30,6 @@ import org.apache.wicket.markup.html.form.IChoiceRenderer; 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.io.Serializable; @@ -78,7 +77,7 @@ public void onClick(AjaxRequestTarget target) { addValuePerformed(target); } }; - placeholderAdd.add(new AttributeAppender("class", new AbstractReadOnlyModel() { + placeholderAdd.add(new AttributeAppender("class", new IModel() { @Override public String getObject() { @@ -225,7 +224,7 @@ protected boolean buttonsDisabled(){ * Provides list of choices for drop-down component * */ protected IModel> createChoiceList(){ - return new AbstractReadOnlyModel>() { + return new IModel>() { @Override public List getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.java index bbc9fe9b9f4..568fd1c79b6 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.java @@ -31,7 +31,6 @@ import org.apache.wicket.markup.html.form.TextField; 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 org.apache.wicket.model.StringResourceModel; import org.jetbrains.annotations.Nullable; @@ -87,7 +86,7 @@ public void onClick(AjaxRequestTarget target) { addValuePerformed(target); } }; - placeholderAdd.add(new AttributeAppender("class", new AbstractReadOnlyModel() { + placeholderAdd.add(new AttributeAppender("class", new IModel() { @Override public String getObject() { @@ -140,16 +139,16 @@ private void initButtons(WebMarkupContainer buttonGroup, final ListItem item, AjaxSubmitLink edit = new AjaxSubmitLink(ID_EDIT) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { editPerformed(target, item.getModelObject()); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getPageBase().getFeedbackPanel()); } }; - edit.add(new AttributeAppender("class", new AbstractReadOnlyModel() { + edit.add(new AttributeAppender("class", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextFormGroup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextFormGroup.java index 36ffe0d5a3f..07e1645318d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextFormGroup.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextFormGroup.java @@ -31,7 +31,6 @@ import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.FeedbackPanel; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import java.io.Serializable; @@ -77,7 +76,7 @@ private void initLayout(final IModel label, final String labelSize, fina @Override protected void populateItem(final ListItem item) { WebMarkupContainer textWrapper = new WebMarkupContainer(ID_TEXT_WRAPPER); - textWrapper.add(AttributeAppender.prepend("class", new AbstractReadOnlyModel() { + textWrapper.add(AttributeAppender.prepend("class", new IModel() { @Override public String getObject() { @@ -110,7 +109,7 @@ protected void onUpdate(AjaxRequestTarget target) { textWrapper.add(feedback); WebMarkupContainer buttonGroup = new WebMarkupContainer(ID_BUTTON_GROUP); - buttonGroup.add(AttributeAppender.append("class", new AbstractReadOnlyModel() { + buttonGroup.add(AttributeAppender.append("class", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.java index d55880a815c..727f4497a34 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.java @@ -28,7 +28,6 @@ import org.apache.wicket.markup.html.form.TextField; 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 org.apache.wicket.model.StringResourceModel; @@ -89,7 +88,7 @@ public void onClick(AjaxRequestTarget target) { } }; placeholderAdd.add(WebComponentUtil.visibleIfFalse(readOnlyModel)); - placeholderAdd.add(new AttributeAppender("class", new AbstractReadOnlyModel() { + placeholderAdd.add(new AttributeAppender("class", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java index 7623820bd73..92661425e4c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java @@ -41,7 +41,6 @@ import org.apache.wicket.markup.html.form.EnumChoiceRenderer; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextArea; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; @@ -178,7 +177,7 @@ public boolean isVisible(){ DropDownChoice policyRef = new DropDownChoice<>(ID_POLICY_REF, new PropertyModel<>(dtoModel, ExpressionTypeDto.F_POLICY_REF), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -208,7 +207,7 @@ protected void onUpdate(AjaxRequestTarget target) { AjaxSubmitLink update = new AjaxSubmitLink(ID_BUTTON_UPDATE) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { updateExpressionPerformed(target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/MultiStateHorizontalButton.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/MultiStateHorizontalButton.java index dbc08a8ae88..4dadfd17204 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/MultiStateHorizontalButton.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/MultiStateHorizontalButton.java @@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.repeater.RepeatingView; -import org.apache.wicket.model.AbstractReadOnlyModel; +import org.apache.wicket.model.IModel; import java.util.List; @@ -62,11 +62,11 @@ private void initLayout(){ for (String propertyKey : propertyKeysList){ AjaxSubmitButton button = new AjaxSubmitButton(buttons.newChildId(), pageBase.createStringResource(propertyKey)) { @Override - public void onSubmit(AjaxRequestTarget ajaxRequestTarget, Form form) { + public void onSubmit(AjaxRequestTarget ajaxRequestTarget) { MultiStateHorizontalButton.this.onStateChanged(propertyKeysList.indexOf(propertyKey), ajaxRequestTarget); } @Override - public void onError(AjaxRequestTarget ajaxRequestTarget, Form form) { + public void onError(AjaxRequestTarget ajaxRequestTarget) { MultiStateHorizontalButton.this.onStateChanged(propertyKeysList.indexOf(propertyKey), ajaxRequestTarget); } }; @@ -78,7 +78,7 @@ public void onError(AjaxRequestTarget ajaxRequestTarget, Form form) { } private AttributeAppender getActiveButtonClassAppender(final int index){ - return new AttributeAppender("class", new AbstractReadOnlyModel() { + return new AttributeAppender("class", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java index 4cded498510..899f86ac26e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java @@ -99,7 +99,7 @@ protected void initLayout(NonEmptyModel readOnlyModel) { AjaxSubmitLink update = new AjaxSubmitLink(ID_BUTTON_UPDATE) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { updateClausePerformed(target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TextDetailsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TextDetailsPanel.java index 56fb66fd287..e94f8fccdae 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TextDetailsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TextDetailsPanel.java @@ -22,7 +22,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.markup.html.form.TextField; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; /** @@ -45,7 +44,7 @@ public TextDetailsPanel(String id, IModel model, Class clazz){ add(text); Label details = new Label(ID_DETAILS); - details.add(AttributeModifier.replace("title", new AbstractReadOnlyModel() { + details.add(AttributeModifier.replace("title", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.java index 6dc6e31f777..1a20cc5e3a2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.java @@ -21,7 +21,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.behavior.AttributeAppender; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; /** @@ -61,7 +60,7 @@ public ThreeStateBooleanPanel(String id, IModel model, String optionOne private void initLayout(final String optionOneLabel, final String optionTwoLabel, final String optionThreeLabel, final String buttonCssClass){ - AjaxButton buttonTrue = new AjaxButton(ID_BUTTON_ONE, new AbstractReadOnlyModel() { + AjaxButton buttonTrue = new AjaxButton(ID_BUTTON_ONE, new IModel() { @Override public String getObject() { @@ -83,7 +82,7 @@ public void onClick(AjaxRequestTarget target) { buttonTrue.add(prepareActiveButtonAppender(Boolean.TRUE)); add(buttonTrue); - AjaxButton buttonUndef = new AjaxButton(ID_BUTTON_TWO, new AbstractReadOnlyModel() { + AjaxButton buttonUndef = new AjaxButton(ID_BUTTON_TWO, new IModel() { @Override public String getObject() { @@ -105,7 +104,7 @@ public void onClick(AjaxRequestTarget target) { buttonUndef.add(prepareActiveButtonAppender(null)); add(buttonUndef); - AjaxButton buttonFalse = new AjaxButton(ID_BUTTON_THREE, new AbstractReadOnlyModel() { + AjaxButton buttonFalse = new AjaxButton(ID_BUTTON_THREE, new IModel() { @Override public String getObject() { @@ -134,7 +133,7 @@ private void stateChanged(Boolean newValue, AjaxRequestTarget target){ } private AttributeAppender prepareActiveButtonAppender(final Boolean value){ - return new AttributeAppender("class", new AbstractReadOnlyModel() { + return new AttributeAppender("class", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java index 1fe1fbe9758..d699455c4ae 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java @@ -21,7 +21,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.behavior.AttributeAppender; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; /** @@ -53,7 +52,7 @@ public TwoStateBooleanPanel(String id, IModel model, String optionOneLa private void initLayout(final String optionOneLabel, final String optionTwoLabel, final String buttonCssClass){ - AjaxButton buttonFalse = new AjaxButton(ID_BUTTON_ONE, new AbstractReadOnlyModel() { + AjaxButton buttonFalse = new AjaxButton(ID_BUTTON_ONE, new IModel() { @Override public String getObject() { @@ -75,7 +74,7 @@ public void onClick(AjaxRequestTarget target) { buttonFalse.add(prepareActiveButtonAppender(Boolean.FALSE)); add(buttonFalse); - AjaxButton buttonTrue = new AjaxButton(ID_BUTTON_TWO, new AbstractReadOnlyModel() { + AjaxButton buttonTrue = new AjaxButton(ID_BUTTON_TWO, new IModel() { @Override public String getObject() { @@ -105,7 +104,7 @@ private void stateChanged(Boolean newValue, AjaxRequestTarget target){ } private AttributeAppender prepareActiveButtonAppender(final Boolean value){ - return new AttributeAppender("class", new AbstractReadOnlyModel() { + return new AttributeAppender("class", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadDownloadPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadDownloadPanel.java index dead2bf2a79..a6cb027e4cd 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadDownloadPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadDownloadPanel.java @@ -100,7 +100,7 @@ protected InputStream initStream() { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { downloadPerformed(downloadBehavior, target); } }); @@ -109,7 +109,7 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { removeFilePerformed(target); } }); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuPanel.java index 0de167585dc..d52bfea4594 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuPanel.java @@ -34,7 +34,6 @@ import org.apache.wicket.markup.html.link.Link; 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 org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -84,7 +83,7 @@ private void initLayout() { final MainMenuItem menu = getModelObject(); WebMarkupContainer item = new WebMarkupContainer(ID_ITEM); - item.add(AttributeModifier.replace("class", new AbstractReadOnlyModel() { + item.add(AttributeModifier.replace("class", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -183,7 +182,7 @@ protected void populateItem(ListItem listItem) { private void createSubmenu(final ListItem listItem) { final MenuItem menuItem = listItem.getModelObject(); - listItem.add(AttributeModifier.replace("class", new AbstractReadOnlyModel() { + listItem.add(AttributeModifier.replace("class", new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.java index a38d8ea8b35..4d529d4c9ca 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.java @@ -28,7 +28,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 org.apache.wicket.model.PropertyModel; @@ -85,7 +84,7 @@ protected void onEvent(AjaxRequestTarget target) { onMenuClick(sidebar, item, target); } }); - icon.add(AttributeModifier.append("class", new AbstractReadOnlyModel() { + icon.add(AttributeModifier.append("class", new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java index 691fb279ac1..8a6868ed58d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java @@ -45,7 +45,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.image.ContextImage; import org.apache.wicket.markup.html.image.NonCachingImage; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.resource.AbstractResource; @@ -117,7 +116,7 @@ private void initLayout() { WebMarkupContainer iconBox = new WebMarkupContainer(ID_ICON_BOX); add(iconBox); - NonCachingImage img = new NonCachingImage(ID_PHOTO, new AbstractReadOnlyModel() { + NonCachingImage img = new NonCachingImage(ID_PHOTO, new IModel() { @Override public AbstractResource getObject() { @@ -153,7 +152,7 @@ public boolean isVisible(){ }); iconBox.add(icon); - Label usernameLink = new Label(ID_USERNAME_LINK, new AbstractReadOnlyModel() { + Label usernameLink = new Label(ID_USERNAME_LINK, new IModel() { @Override public String getObject() { @@ -166,7 +165,7 @@ public String getObject() { WebMarkupContainer panelIconBox = new WebMarkupContainer(ID_PANEL_ICON_BOX); add(panelIconBox); - NonCachingImage panelImg = new NonCachingImage(ID_PANEL_PHOTO, new AbstractReadOnlyModel() { + NonCachingImage panelImg = new NonCachingImage(ID_PANEL_PHOTO, new IModel() { @Override public AbstractResource getObject() { @@ -200,7 +199,7 @@ public boolean isVisible(){ }); panelIconBox.add(panelIcon); - Label username = new Label(ID_USERNAME, new AbstractReadOnlyModel() { + Label username = new Label(ID_USERNAME, new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java index eef17282dda..72529e0317e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java @@ -26,7 +26,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; 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 com.evolveum.midpoint.web.component.util.SimplePanel; @@ -117,7 +116,7 @@ public boolean isVisible() { private void initMenuItem(ListItem menuItem) { final InlineMenuItem item = menuItem.getModelObject(); - menuItem.add(AttributeModifier.append("class", new AbstractReadOnlyModel() { + menuItem.add(AttributeModifier.append("class", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItemAction.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItemAction.java index 227bbf8125d..a94e7efce75 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItemAction.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItemAction.java @@ -14,11 +14,11 @@ public void onClick(AjaxRequestTarget target) { } - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { } - public void onError(AjaxRequestTarget target, Form form) { + public void onError(AjaxRequestTarget target) { } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuLinkPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuLinkPanel.java index 27329c36a3f..fbfac4851f2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuLinkPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuLinkPanel.java @@ -18,6 +18,9 @@ import com.evolveum.midpoint.gui.api.page.PageBase; import com.evolveum.midpoint.web.component.dialog.ConfirmationPanel; import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour; + +import org.apache.wicket.Component; +import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.markup.html.AjaxLink; @@ -53,13 +56,13 @@ private void initLayout(IModel item) { a = new AjaxSubmitLink(ID_MENU_ITEM_LINK) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { - MenuLinkPanel.this.onSubmit(target, form, dto.getAction(), item); + protected void onSubmit(AjaxRequestTarget target) { + MenuLinkPanel.this.onSubmit(target, dto.getAction(), item); } @Override - protected void onError(AjaxRequestTarget target, Form form) { - MenuLinkPanel.this.onError(target, form, dto.getAction()); + protected void onError(AjaxRequestTarget target) { + MenuLinkPanel.this.onError(target, dto.getAction()); } @Override @@ -101,19 +104,19 @@ public boolean isVisible() { a.add(span); } - protected void onSubmit(AjaxRequestTarget target, Form form, InlineMenuItemAction action, IModel item) { + protected void onSubmit(AjaxRequestTarget target, InlineMenuItemAction action, IModel item) { if (action != null) { if (item.getObject().showConfirmationDialog() && item.getObject().getConfirmationMessageModel() != null) { showConfirmationPopup(item.getObject(), target); } else { - action.onSubmit(target, form); + action.onSubmit(target); } } } - protected void onError(AjaxRequestTarget target, Form form, InlineMenuItemAction action) { + protected void onError(AjaxRequestTarget target, InlineMenuItemAction action) { if (action != null) { - action.onError(target, form); + action.onError(target); } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.java index ad00e53c4e5..48a705d87ec 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.java @@ -155,14 +155,12 @@ protected void initLayoutSaveButton(final PageAdminObjectDetails parentPage) private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, - org.apache.wicket.markup.html.form.Form form) { + protected void onSubmit(AjaxRequestTarget target) { getDetailsPage().savePerformed(target); } @Override - protected void onError(AjaxRequestTarget target, - org.apache.wicket.markup.html.form.Form form) { + protected void onError(AjaxRequestTarget target) { target.add(parentPage.getFeedbackPanel()); } }; @@ -199,14 +197,12 @@ protected void initLayoutPreviewButton(final PageAdminObjectDetails parentPag private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, - org.apache.wicket.markup.html.form.Form form) { + protected void onSubmit(AjaxRequestTarget target) { getDetailsPage().previewPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, - org.apache.wicket.markup.html.form.Form form) { + protected void onError(AjaxRequestTarget target) { target.add(parentPage.getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/BaseAbstractRolePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/BaseAbstractRolePanel.java index 83f3b45a0d1..b53804600de 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/BaseAbstractRolePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/BaseAbstractRolePanel.java @@ -6,7 +6,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import com.evolveum.midpoint.gui.api.model.LoadableModel; @@ -45,7 +44,7 @@ private WebMarkupContainer getMaxAssignmentsContainer(){ } private IModel createMultiplicityPolicyLabel(final IModel model){ - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java index 4014c3860df..de7ef74983e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java @@ -53,7 +53,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.extensions.markup.html.tabs.ITab; import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.util.string.StringValue; @@ -237,7 +236,7 @@ protected void viewObjectHistoricalDataPerformed(AjaxRequestTarget target, Prism } protected IModel> unwrapModel() { - return new AbstractReadOnlyModel>() { + return new IModel>() { @Override public PrismObject getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java index bbea92a4655..2048f1a680f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java @@ -29,7 +29,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.Model; import org.apache.wicket.model.PropertyModel; @@ -560,7 +559,7 @@ private void unlinkProjectionPerformed(AjaxRequestTarget target, private Popupable getDeleteProjectionPopupContent() { ConfirmationPanel dialog = new ConfirmationPanel(getPageBase().getMainPopupBodyId(), - new AbstractReadOnlyModel() { + new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusTasksTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusTasksTabPanel.java index e7b9bc58bd7..848ee65f138 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusTasksTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusTasksTabPanel.java @@ -20,7 +20,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.model.AbstractReadOnlyModel; +import org.apache.wicket.model.IModel; import com.evolveum.midpoint.gui.api.model.LoadableModel; import com.evolveum.midpoint.gui.api.page.PageBase; @@ -59,7 +59,7 @@ public FocusTasksTabPanel(String id, Form mainForm, LoadableModel() { + Label label = new Label(ID_LABEL, new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.java index 927540c252f..df1e185325c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.java @@ -85,7 +85,7 @@ protected void onUpdate(AjaxRequestTarget target) { add(pendingPanel); Label icon = new Label(ID_ICON); - icon.add(AttributeModifier.replace("class", new AbstractReadOnlyModel() { + icon.add(AttributeModifier.replace("class", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -96,7 +96,7 @@ public String getObject() { add(icon); Label trigger = new Label(ID_TRIGGER); - trigger.add(AttributeModifier.replace("title", new AbstractReadOnlyModel() { + trigger.add(AttributeModifier.replace("title", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -139,7 +139,7 @@ public void onClick(AjaxRequestTarget target) { }; add(link); - Label name = new Label(ID_NAME, new AbstractReadOnlyModel() { + Label name = new Label(ID_NAME, new IModel() { private static final long serialVersionUID = 1L; @Override @@ -149,7 +149,7 @@ public String getObject() { }); link.add(name); - Label description = new Label(ID_DESCRIPTION, new AbstractReadOnlyModel() { + Label description = new Label(ID_DESCRIPTION, new IModel() { private static final long serialVersionUID = 1L; @Override @@ -178,7 +178,7 @@ public boolean isOn() { } private IModel> createPendingOperationsModel() { - return new AbstractReadOnlyModel>() { + return new IModel>() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValuePanel.java index 561686d4ed9..6358ab01ed5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValuePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValuePanel.java @@ -30,7 +30,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; @@ -167,7 +166,7 @@ public PageBase getPageBase(){ } private IModel createStyleClassModel(final IModel wrapper) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/H3Header.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/H3Header.java index 0b9a767c39e..ec838629113 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/H3Header.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/H3Header.java @@ -29,7 +29,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; 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; @@ -54,7 +53,7 @@ public H3Header(String id, IModel> model) { @Override protected void initLayout() { - Label title = new Label(ID_TITLE, new AbstractReadOnlyModel() { + Label title = new Label(ID_TITLE, new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java index 6a8df89c777..7f50398eb0e 100755 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java @@ -34,7 +34,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.Model; import org.apache.wicket.model.PropertyModel; @@ -206,7 +205,7 @@ public PageBase getPageBase(){ } private IModel createStyleClassModel(final IModel wrapper) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -238,7 +237,7 @@ public boolean isVisible() { item.add(containerPanel); item.setOutputMarkupId(true); - containerPanel.add(AttributeModifier.append("class", new AbstractReadOnlyModel() { + containerPanel.add(AttributeModifier.append("class", new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java index 01cac53cadd..4c7ebd453af 100755 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java @@ -11,7 +11,6 @@ import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.panel.Fragment; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import com.evolveum.midpoint.gui.api.GuiStyleConstants; @@ -83,7 +82,7 @@ public boolean isOn() { return PrismContainerValueHeaderPanel.this.getModelObject().isShowMetadata(); } }; - showMetadataButton.add(new AttributeModifier("title", new AbstractReadOnlyModel() { + showMetadataButton.add(new AttributeModifier("title", new IModel() { @Override public Object getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.java index 9a1ee9439ba..9c6c3793593 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.java @@ -23,7 +23,6 @@ import org.apache.wicket.markup.html.WebComponent; 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.StringResourceModel; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyColumn.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyColumn.java index 05052f09371..234e0c8ffa9 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyColumn.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyColumn.java @@ -25,7 +25,6 @@ import org.apache.wicket.markup.html.form.Form; 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 org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -174,7 +173,7 @@ protected String getValueCssClass() { protected IModel createStyleClassModel(final IModel value) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java index cb664263640..3fbaa53ef8e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java @@ -135,7 +135,7 @@ private void initLayout(final IModel model, final Form form) { final IModel label = createDisplayName(model); Label displayName = new Label(ID_LABEL, label); - displayName.add(new AttributeModifier("style", new AbstractReadOnlyModel() { + displayName.add(new AttributeModifier("style", new IModel() { private static final long serialVersionUID = 1L; @@ -195,7 +195,7 @@ public boolean isVisible() { Label deprecated = new Label(ID_DEPRECATED); - deprecated.add(AttributeModifier.replace("deprecated", new AbstractReadOnlyModel() { + deprecated.add(AttributeModifier.replace("deprecated", new IModel() { private static final long serialVersionUID = 1L; @@ -324,7 +324,7 @@ protected String getValueCssClass() { } protected IModel createStyleClassModel(final IModel value) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -402,7 +402,7 @@ private boolean hasPendingModification(IModel model) { } private IModel createDisplayName(final IModel model) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java index b13a363cb74..5f019a9ea3f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java @@ -56,7 +56,6 @@ import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.FeedbackPanel; 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.apache.wicket.model.PropertyModel; @@ -217,7 +216,7 @@ public boolean isVisible() { } private IModel createHelpModel() { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -680,7 +679,7 @@ public void uploadFileFailed(AjaxRequestTarget target) { }; } else if (ObjectDeltaType.COMPLEX_TYPE.equals(valueType)) { - panel = new ModificationsPanel(id, new AbstractReadOnlyModel() { + panel = new ModificationsPanel(id, new IModel() { @Override public DeltaDto getObject() { if (getModel().getObject() == null || getModel().getObject().getValue() == null @@ -700,7 +699,7 @@ public DeltaDto getObject() { } }); } else if (QueryType.COMPLEX_TYPE.equals(valueType) || CleanupPoliciesType.COMPLEX_TYPE.equals(valueType)) { - return new TextAreaPanel<>(id, new AbstractReadOnlyModel() { + return new TextAreaPanel<>(id, new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/SimpleErrorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/SimpleErrorPanel.java index 9996fd64982..f5861341051 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/SimpleErrorPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/SimpleErrorPanel.java @@ -24,7 +24,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; @@ -52,7 +51,7 @@ protected void initLayout(){ Label icon = new Label(ID_ICON); add(icon); - Label description = new Label(ID_DESCRIPTION, new AbstractReadOnlyModel() { + Label description = new Label(ID_DESCRIPTION, new IModel() { @Override public String getObject() { @@ -70,7 +69,7 @@ public void onClick(AjaxRequestTarget target) { }; add(link); - Label showMore = new Label(ID_SHOW_MORE, new AbstractReadOnlyModel() { + Label showMore = new Label(ID_SHOW_MORE, new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java index e7a6899a50e..06a880d2367 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java @@ -61,7 +61,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; 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; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.java index 5be8adba93a..bd3f1e3fd03 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.java @@ -25,7 +25,6 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; import com.evolveum.midpoint.xml.ns._public.common.common_3.PolicyRuleEnforcerHookPreviewOutputType; 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; @@ -107,13 +106,13 @@ private void initModels(){ secondaryScenes.size() != 1 ? "PagePreviewChanges.secondaryChangesMore" : "PagePreviewChanges.secondaryChangesOne", secondaryScenes.size()); final SceneDto primarySceneDto = new SceneDto(primaryScene); final SceneDto secondarySceneDto = new SceneDto(secondaryScene); - primaryDeltasModel = new AbstractReadOnlyModel() { + primaryDeltasModel = new IModel() { @Override public SceneDto getObject() { return primarySceneDto; } }; - secondaryDeltasModel = new AbstractReadOnlyModel() { + secondaryDeltasModel = new IModel() { @Override public SceneDto getObject() { return secondarySceneDto; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneButtonPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneButtonPanel.java index 52a689c6120..59f9b2fe12d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneButtonPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneButtonPanel.java @@ -22,7 +22,6 @@ import org.apache.wicket.behavior.AttributeAppender; 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 com.evolveum.midpoint.gui.api.GuiStyleConstants; @@ -55,7 +54,7 @@ public void onClick(AjaxRequestTarget target) { add(minimize); Label icon = new Label(ID_ICON); - icon.add(AttributeModifier.append("class", new AbstractReadOnlyModel() { + icon.add(AttributeModifier.append("class", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -70,7 +69,7 @@ public String getObject() { })); minimize.add(icon); - icon.add(new AttributeAppender("title", new AbstractReadOnlyModel() { + icon.add(new AttributeAppender("title", new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.java index f715444af6e..2d227ab56eb 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.java @@ -27,7 +27,6 @@ import org.apache.wicket.Component; 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.Model; import org.apache.wicket.model.PropertyModel; @@ -58,7 +57,7 @@ private void initLayout() { WebMarkupContainer nameCell = new WebMarkupContainer(ID_NAME_CONTAINER); nameCell.add(new AttributeModifier("rowspan", new PropertyModel(getModel(), SceneItemLineDto.F_NUMBER_OF_LINES))); - Label label = new Label("name", new AbstractReadOnlyModel() { + Label label = new Label("name", new IModel() { @Override public String getObject() { final SceneItemLineDto lineDto = getModel().getObject(); @@ -141,13 +140,13 @@ public boolean isVisible(){ new PropertyModel<>(getModel(), SceneItemLineDto.F_NEW_VALUE)); sivp.setRenderBodyOnly(true); newValueCell.add(sivp); - newValueCell.add(new AttributeModifier("colspan", new AbstractReadOnlyModel() { + newValueCell.add(new AttributeModifier("colspan", new IModel() { @Override public Integer getObject() { return !getModelObject().isDelta() && !getModelObject().isNullEstimatedOldValues() && getModelObject().isDeltaScene() ? 2 : 1; } })); - newValueCell.add(new AttributeModifier("align", new AbstractReadOnlyModel() { + newValueCell.add(new AttributeModifier("align", new IModel() { @Override public String getObject() { return !getModelObject().isDelta() && !getModelObject().isNullEstimatedOldValues() && getModelObject().isDeltaScene() ? "center" : null; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemValuePanel.java index e6324aeafcb..03f8987f764 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemValuePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemValuePanel.java @@ -28,7 +28,6 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import javax.xml.namespace.QName; @@ -90,7 +89,7 @@ public void onClick(AjaxRequestTarget target) { link.add(visibleIfReference); add(link); - final Label additionalText = new Label(ID_ADDITIONAL_TEXT, new AbstractReadOnlyModel() { + final Label additionalText = new Label(ID_ADDITIONAL_TEXT, new IModel() { @Override public String getObject() { return getModelObject() != null ? getModelObject().getAdditionalText() : null; @@ -114,7 +113,7 @@ private ObjectTypeGuiDescriptor getObjectTypeDescriptor() { } } - private class IconModel extends AbstractReadOnlyModel { + private class IconModel implements IModel { @Override public String getObject() { ObjectTypeGuiDescriptor guiDescriptor = getObjectTypeDescriptor(); @@ -122,7 +121,7 @@ public String getObject() { } } - private class TitleModel extends AbstractReadOnlyModel { + private class TitleModel implements IModel { @Override public String getObject() { ObjectTypeGuiDescriptor guiDescriptor = getObjectTypeDescriptor(); @@ -130,7 +129,7 @@ public String getObject() { } } - private class LabelModel extends AbstractReadOnlyModel { + private class LabelModel implements IModel { @Override public String getObject() { return getModelObject() != null ? getModelObject().getText() : null; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java index c05d5b462a4..eb8c653410e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java @@ -88,7 +88,7 @@ private void initLayout() { final IModel model = getModel(); WebMarkupContainer box = new WebMarkupContainer(ID_BOX); - box.add(AttributeModifier.append("class", new AbstractReadOnlyModel() { + box.add(AttributeModifier.append("class", new IModel() { @Override public String getObject() { @@ -131,7 +131,7 @@ public void minimizeOnClick(AjaxRequestTarget target) { Label headerObjectType = new Label(ID_HEADER_OBJECT_TYPE, new ObjectTypeModel()); //headerObjectType.setRenderBodyOnly(true); - IModel nameModel = new AbstractReadOnlyModel() { + IModel nameModel = new IModel() { @Override public String getObject() { return model.getObject().getName(ScenePanel.this); @@ -149,14 +149,14 @@ public void onClick(AjaxRequestTarget target) { } } }; - Label headerDescription = new Label(ID_HEADER_DESCRIPTION, new AbstractReadOnlyModel() { + Label headerDescription = new Label(ID_HEADER_DESCRIPTION, new IModel() { @Override public String getObject() { return model.getObject().getDescription(ScenePanel.this); } }); Label headerWrapperDisplayName = new Label(ID_HEADER_WRAPPER_DISPLAY_NAME, - new AbstractReadOnlyModel() { + new IModel() { @Override public String getObject() { String key = ((WrapperScene) getModelObject().getScene()).getDisplayNameKey(); @@ -303,7 +303,7 @@ public void headerOnClickPerformed(AjaxRequestTarget target, IModel mo target.add(this); } - private class ChangeTypeModel extends AbstractReadOnlyModel { + private class ChangeTypeModel implements IModel { @Override public String getObject() { @@ -315,7 +315,7 @@ public String getObject() { } } - private class ObjectTypeModel extends AbstractReadOnlyModel { + private class ObjectTypeModel implements IModel { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java index 30985fdbc3f..c590956f9dc 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.java @@ -51,7 +51,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 org.apache.wicket.util.time.Duration; import org.springframework.security.core.Authentication; @@ -133,7 +132,7 @@ private void initLayout() { progressForm.add(contentsPanel); ListView statusItemsListView = new ListView(ID_ACTIVITIES, - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -154,7 +153,7 @@ protected void populateItem(ListItem item) { statisticsPanel = new StatisticsPanel(ID_STATISTICS, new StatisticsDtoModel()); contentsPanel.add(statisticsPanel); - ListView logItemsListView = new ListView(ID_LOG_ITEMS, new AbstractReadOnlyModel() { + ListView logItemsListView = new ListView(ID_LOG_ITEMS, new IModel() { @Override public List getObject() { @@ -172,7 +171,7 @@ protected void populateItem(ListItem item) { }; contentsPanel.add(logItemsListView); - Label executionTime = new Label(ID_EXECUTION_TIME, new AbstractReadOnlyModel() { + Label executionTime = new Label(ID_EXECUTION_TIME, new IModel() { @Override public String getObject() { @@ -202,7 +201,7 @@ private Label createImageLabel(String id, IModel cssClass, IModel item) { - item.add(new Label(ID_ACTIVITY_DESCRIPTION, new AbstractReadOnlyModel() { + item.add(new Label(ID_ACTIVITY_DESCRIPTION, new IModel() { @Override public String getObject() { @@ -217,7 +216,7 @@ public String getObject() { } })); item.add(createImageLabel(ID_ACTIVITY_STATE, - new AbstractReadOnlyModel() { + new IModel() { @Override public String getObject() { @@ -229,7 +228,7 @@ public String getObject() { } } }, - new AbstractReadOnlyModel() { + new IModel() { @Override public String getObject() { // TODO why this does not work??? @@ -243,7 +242,7 @@ public String getObject() { // TODO why this does not work??? } } )); - item.add(new Label(ID_ACTIVITY_COMMENT, new AbstractReadOnlyModel() { + item.add(new Label(ID_ACTIVITY_COMMENT, new IModel() { @Override public String getObject() { @@ -288,14 +287,12 @@ private void initButtons(final Form progressForm) { createStringResource("pageAdminFocus.button.abort")) { @Override - protected void onSubmit(AjaxRequestTarget target, - org.apache.wicket.markup.html.form.Form form) { + protected void onSubmit(AjaxRequestTarget target) { abortPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, - org.apache.wicket.markup.html.form.Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getPageBase().getFeedbackPanel()); } }; @@ -306,13 +303,12 @@ protected void onError(AjaxRequestTarget target, createStringResource("pageAdminFocus.button.back")) { @Override - protected void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form form) { + protected void onSubmit(AjaxRequestTarget target) { backPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, - org.apache.wicket.markup.html.form.Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getPageBase().getFeedbackPanel()); } }; @@ -323,14 +319,13 @@ protected void onError(AjaxRequestTarget target, createStringResource("pageAdminFocus.button.continueEditing")) { @Override - protected void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form form) { + protected void onSubmit(AjaxRequestTarget target) { ProgressReportingAwarePage page = (ProgressReportingAwarePage) getPage(); page.continueEditing(target); } @Override - protected void onError(AjaxRequestTarget target, - org.apache.wicket.markup.html.form.Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getPageBase().getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsDtoModel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsDtoModel.java index 847edc8ddb7..6184d5451c1 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsDtoModel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsDtoModel.java @@ -23,13 +23,12 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.EnvironmentalPerformanceInformationType; import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationStatsType; import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; /** * @author Pavol Mederly */ -public class StatisticsDtoModel extends AbstractReadOnlyModel { +public class StatisticsDtoModel implements IModel { private static final Trace LOGGER = TraceManager.getTrace(StatisticsDtoModel.class); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsPanel.java index 63d0fa954e4..44ae50ea3ae 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsPanel.java @@ -152,7 +152,7 @@ protected void populateItem(final ListItem item) { Label lastMessage = new Label(ID_LAST_MESSAGE, new PropertyModel<>(getModel(), StatisticsDto.F_LAST_MESSAGE)); contentsPanel.add(lastMessage); -// Label source = new Label(ID_SOURCE, new AbstractReadOnlyModel() { +// Label source = new Label(ID_SOURCE, new IModel() { // @Override // public String getObject() { // StatisticsDto dto = getModelObject(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/AutoRefreshPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/AutoRefreshPanel.java index 6bc378e5d57..51999233400 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/AutoRefreshPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/AutoRefreshPanel.java @@ -24,7 +24,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.behavior.Behavior; 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; @@ -92,7 +91,7 @@ public boolean isVisible() { }); add(pauseRefreshing); - final Label status = new Label(ID_STATUS, new AbstractReadOnlyModel() { + final Label status = new Label(ID_STATUS, new IModel() { @Override public String getObject() { AutoRefreshDto dto = getModelObject(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java index 44451de3a8e..3eae1ab7ddf 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java @@ -48,7 +48,6 @@ import org.apache.wicket.markup.html.form.Form; 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 org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -183,7 +182,7 @@ private void initPopover() { @Override protected void populateItem(final ListItem> item) { - item.add(AttributeModifier.replace("style", new AbstractReadOnlyModel() { + item.add(AttributeModifier.replace("style", new IModel() { private static final long serialVersionUID = 1L; @@ -205,7 +204,7 @@ public String getObject() { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { updateItemPerformed(target); } }; @@ -287,7 +286,7 @@ private PrismObject findLookupTable(ItemDefini private IModel>> createBooleanChoices() { - return new AbstractReadOnlyModel>>() { + return new IModel>>() { private static final long serialVersionUID = 1L; @@ -303,7 +302,7 @@ public List> getObject() { } private IModel createLabelModel() { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java index 4690637f994..ccb18aface2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java @@ -37,6 +37,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; +import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.attributes.ThrottlingSettings; @@ -52,7 +53,6 @@ import org.apache.wicket.markup.html.form.TextField; 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 org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -185,12 +185,12 @@ public boolean isVisible() { private static final long serialVersionUID = 1L; @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(form); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { searchPerformed(target); } }; @@ -233,12 +233,12 @@ public boolean isVisible() { private static final long serialVersionUID = 1L; @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(form); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { searchPerformed(target); } }; @@ -500,7 +500,7 @@ private void debugPerformed() { } private IModel createAdvancedGroupLabelStyle() { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @@ -514,7 +514,7 @@ public String getObject() { } private IModel createAdvancedGroupStyle() { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @@ -528,7 +528,7 @@ public String getObject() { } private IModel createAdvancedModel() { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SummaryTagSimple.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SummaryTagSimple.java index 7d02c94eda5..d2cb1ce13fb 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SummaryTagSimple.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SummaryTagSimple.java @@ -19,7 +19,6 @@ import org.apache.wicket.AttributeModifier; 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; /** @@ -114,7 +113,7 @@ public void setHideTag(boolean hideTag) { protected abstract void initialize(C object); - abstract class SummaryTagModel extends AbstractReadOnlyModel { + abstract class SummaryTagModel implements IModel { IModel objectModel; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanelTextOnly.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanelTextOnly.java index b81c7589393..a4d6dfbeaaf 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanelTextOnly.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanelTextOnly.java @@ -24,7 +24,6 @@ import com.evolveum.midpoint.web.page.admin.workflow.dto.ApprovalStageExecutionInformationDto; import com.evolveum.midpoint.web.page.admin.workflow.dto.ApproverEngagementDto; import com.evolveum.midpoint.wf.util.ApprovalUtils; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import java.util.List; @@ -45,7 +44,7 @@ public ApprovalProcessExecutionInformationPanelTextOnly(String id, IModel(ID_TEXT, new AbstractReadOnlyModel() { + add(new TextAreaPanel<>(ID_TEXT, new IModel() { @Override public String getObject() { ApprovalProcessExecutionInformationDto processInfo = getModelObject(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/DecisionsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/DecisionsPanel.java index 97490547ef6..c88d0416ae6 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/DecisionsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/DecisionsPanel.java @@ -22,7 +22,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.jetbrains.annotations.NotNull; @@ -72,7 +71,7 @@ private IconColumn createOutcomeColumn() { @Override protected IModel createIconModel(final IModel rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -89,7 +88,7 @@ public String getCssClass() { @Override protected IModel createTitleModel(final IModel rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.java index 448d1e6748f..db573f5b831 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.java @@ -29,6 +29,9 @@ import com.evolveum.midpoint.web.page.admin.server.TaskWfChildPanel; import com.evolveum.midpoint.web.page.admin.workflow.dto.ApprovalProcessExecutionInformationDto; import com.evolveum.midpoint.xml.ns._public.common.common_3.ApprovalSchemaExecutionInformationType; + +import org.apache.wicket.Component; +import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxFallbackLink; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -36,6 +39,7 @@ import org.jetbrains.annotations.Nullable; import java.util.Collections; +import java.util.Optional; /** * @author mederly @@ -149,10 +153,13 @@ private void initLayout(IModel showNextStagesModel) { WebMarkupContainer showNextStagesContainer = new WebMarkupContainer(ID_SHOW_NEXT_STAGES_CONTAINER); showNextStagesContainer.add(new AjaxFallbackLink(ID_SHOW_NEXT_STAGES) { - public void onClick(AjaxRequestTarget target) { + + @Override + public void onClick(Optional target) { displayedProcessInfoBox = ProcessInfoBox.NEXT_STAGES; - target.add(SwitchableApprovalProcessPreviewsPanel.this); + ((AjaxRequestTarget) target.get()).add(SwitchableApprovalProcessPreviewsPanel.this); } + }); showNextStagesContainer.add(WebComponentUtil.createHelp(ID_SHOW_NEXT_STAGES_HELP)); showNextStagesContainer.add(new VisibleBehaviour(() -> @@ -161,9 +168,11 @@ public void onClick(AjaxRequestTarget target) { WebMarkupContainer showWholeProcessContainer = new WebMarkupContainer(ID_SHOW_WHOLE_PROCESS_CONTAINER); showWholeProcessContainer.add(new AjaxFallbackLink(ID_SHOW_WHOLE_PROCESS) { - public void onClick(AjaxRequestTarget target) { + + @Override + public void onClick(Optional target) { displayedProcessInfoBox = ProcessInfoBox.WHOLE_PROCESS; - target.add(SwitchableApprovalProcessPreviewsPanel.this); + ((AjaxRequestTarget) target.get()).add(SwitchableApprovalProcessPreviewsPanel.this); } }); showWholeProcessContainer.add(new VisibleBehaviour(() -> displayedProcessInfoBox != ProcessInfoBox.WHOLE_PROCESS)); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java index a706c4b4c08..fbe53aa885b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java @@ -48,7 +48,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator; import org.apache.wicket.extensions.markup.html.repeater.data.table.*; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -108,7 +107,7 @@ private void initLayout(UserProfileStorage.TableId tableId, int pageSize, View v @Override public void populateItem(Item> cellItem, String componentId, final IModel rowModel) { - cellItem.add(new DateLabelComponent(componentId, new AbstractReadOnlyModel() { + cellItem.add(new DateLabelComponent(componentId, new IModel() { private static final long serialVersionUID = 1L; @Override @@ -124,7 +123,7 @@ public Date getObject() { @Override public void populateItem(Item> cellItem, String componentId, final IModel rowModel) { - cellItem.add(new DateLabelComponent(componentId, new AbstractReadOnlyModel() { + cellItem.add(new DateLabelComponent(componentId, new IModel() { private static final long serialVersionUID = 1L; @Override @@ -139,7 +138,7 @@ public Date getObject() { @Override public void populateItem(Item> cellItem, String componentId, final IModel rowModel) { - cellItem.add(new DateLabelComponent(componentId, new AbstractReadOnlyModel() { + cellItem.add(new DateLabelComponent(componentId, new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java index 34d8a12c942..d5ff3d639b0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Optional; /** * @author lazyman @@ -110,11 +111,11 @@ public boolean isVisible() { readOnlyNote.add(new AjaxFallbackLink(ID_READ_ONLY_SWITCH) { @Override - public void onClick(AjaxRequestTarget ajaxRequestTarget) { + public void onClick(Optional optionalTarget) { PageResourceWizard wizardPage = (PageResourceWizard) getPageBase(); wizardPage.resetModels(); // e.g. to switch configuration models to read-write wizardPage.setReadOnly(false); - ajaxRequestTarget.add(wizardPage); + optionalTarget.get().add(wizardPage); } }); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardButtonBar.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardButtonBar.java index ed5b8345b84..eaaeacf6af4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardButtonBar.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardButtonBar.java @@ -27,7 +27,7 @@ import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.IFormSubmittingComponent; import org.apache.wicket.markup.html.panel.Panel; -import org.apache.wicket.model.AbstractReadOnlyModel; +import org.apache.wicket.model.IModel; /** * @author lazyman @@ -120,12 +120,12 @@ public boolean isEnabled() { AjaxSubmitButton validate = new AjaxSubmitButton(ID_VALIDATE) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { Session.get().getFeedbackMessages().clear(); // TODO - ok? ((PageResourceWizard) getPage()).refreshIssues(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(((PageBase) getPage()).getFeedbackPanel()); } }; @@ -134,7 +134,7 @@ protected void onError(AjaxRequestTarget target, Form form) { final AjaxSubmitButton save = new AjaxSubmitButton(ID_SAVE) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { IWizardStep activeStep = wizard.getModelObject().getActiveStep(); if (activeStep != null) { activeStep.applyState(); @@ -143,7 +143,7 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(((PageBase) getPage()).getFeedbackPanel()); } }; @@ -152,7 +152,7 @@ protected void onError(AjaxRequestTarget target, Form form) { final AjaxSubmitButton visualize = new AjaxSubmitButton(ID_VISUALIZE) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { IWizardStep activeStep = wizard.getModelObject().getActiveStep(); PageResourceWizard wizardPage = (PageResourceWizard) getPage(); if (!wizardPage.isReadOnly()) { @@ -167,14 +167,14 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(((PageBase) getPage()).getFeedbackPanel()); } }; visualize.setVisible(moreSteps); add(visualize); - Label visualizeLabel = new Label(ID_VISUALIZE_LABEL, new AbstractReadOnlyModel() { + Label visualizeLabel = new Label(ID_VISUALIZE_LABEL, new IModel() { @Override public String getObject() { PageResourceWizard wizardPage = (PageResourceWizard) getPage(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardIssuesPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardIssuesPanel.java index c419c0fc9f6..554b655dcae 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardIssuesPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardIssuesPanel.java @@ -25,7 +25,7 @@ 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 org.apache.wicket.model.PropertyModel; import org.jetbrains.annotations.NotNull; @@ -56,7 +56,7 @@ public boolean isVisible() { return getModelObject().hasIssues(); } }); - panel.add(AttributeAppender.append("class", new AbstractReadOnlyModel() { + panel.add(AttributeAppender.append("class", new IModel() { @Override public String getObject() { WizardIssuesDto issuesDto = WizardIssuesPanel.this.getModelObject(); @@ -66,7 +66,7 @@ public String getObject() { })); add(panel); - Label title = new Label(ID_TITLE, new AbstractReadOnlyModel() { + Label title = new Label(ID_TITLE, new IModel() { @Override public String getObject() { WizardIssuesDto issuesDto = WizardIssuesPanel.this.getModelObject(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java index 802b5bc2c9f..0c159c7aa2b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java @@ -60,7 +60,7 @@ public WizardStep(PageBase pageBase) { @Override public Component getHeader(String id, Component parent, IWizard wizard) { return new Label(id, ""); // we don't want to display step names twice (in upper bar and in page header) -// return new Label(id, new AbstractReadOnlyModel() { +// return new Label(id, new IModel() { // @Override // public String getObject() { // return getTitle(); @@ -142,7 +142,7 @@ public void validate(IValidatable validated) { if(!stringList.contains(value)){ error(createStringResource("SchemaHandlingStep.message.validationError", value).getString()); - AjaxRequestTarget target = getRequestCycle().find(AjaxRequestTarget.class); + AjaxRequestTarget target = getRequestCycle().find(AjaxRequestTarget.class).get(); target.add(getPageBase().getFeedbackPanel()); } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardSteps.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardSteps.java index b4b3cffa34d..2d16774aa1a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardSteps.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardSteps.java @@ -31,7 +31,6 @@ import org.apache.wicket.markup.html.form.Form; 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; @@ -63,12 +62,12 @@ protected void populateItem(ListItem item) { AjaxSubmitLink button = new AjaxSubmitLink(ID_LINK) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { changeStepPerformed(target, dto); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getPageBase().getFeedbackPanel()); } }; @@ -89,14 +88,14 @@ public boolean isVisible() { } }); - button.add(AttributeModifier.replace("class", new AbstractReadOnlyModel() { + button.add(AttributeModifier.replace("class", new IModel() { @Override public String getObject() { return dto.getWizardStep() == getActiveStep() ? "current" : null; } })); - button.add(AttributeModifier.replace("style", new AbstractReadOnlyModel() { + button.add(AttributeModifier.replace("style", new IModel() { @Override public String getObject() { final boolean enabled = ((PageResourceWizard) getPageBase()).isCurrentStepComplete(); @@ -132,13 +131,13 @@ public void updateModal(){ WizardHelpDialog window = (WizardHelpDialog)get(ID_HELP_MODAL); if(window != null){ - AjaxRequestTarget target = getRequestCycle().find(AjaxRequestTarget.class); + AjaxRequestTarget target = getRequestCycle().find(AjaxRequestTarget.class).get(); window.updateModal(target ,getActiveStep()); } } private IModel createLabelModel(final String key) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java index cd8829c9d85..578bad222d5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java @@ -62,7 +62,6 @@ import org.apache.wicket.markup.html.form.IChoiceRenderer; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -180,7 +179,7 @@ public void onClick(AjaxRequestTarget target) { editCapabilityPerformed(target, dto); } }; - Label label = new Label(ID_CAPABILITY_NAME, new AbstractReadOnlyModel() { + Label label = new Label(ID_CAPABILITY_NAME, new IModel() { @Override public String getObject() { String rv = dto.getDisplayName(); @@ -218,7 +217,7 @@ public boolean isVisible() { }); name.add(deleteLink); - capabilityRow.add(AttributeModifier.replace("class", new AbstractReadOnlyModel() { + capabilityRow.add(AttributeModifier.replace("class", new IModel() { @Override public Object getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java index 84a18adff51..1faedf546b4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java @@ -185,12 +185,12 @@ private void initLayout() { createStringResource("ConfigurationStep.button.testConnection")) { @Override - protected void onError(final AjaxRequestTarget target, Form form) { + protected void onError(final AjaxRequestTarget target) { WebComponentUtil.refreshFeedbacks(form, target); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { testConnectionPerformed(target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java index b08d9a03342..9decdcbf943 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java @@ -61,7 +61,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.IChoiceRenderer; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -162,7 +161,7 @@ protected PrismObject load() { }; parentPage.registerDependentModel(selectedConnectorModel); - schemaChangeWarningModel = new AbstractReadOnlyModel() { + schemaChangeWarningModel = new IModel() { @Override public String getObject() { PrismObject selectedConnector = getConnectorDropDown().getInput().getModel().getObject(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java index f6e863b3358..fadb1635eb0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java @@ -65,7 +65,6 @@ import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -212,12 +211,12 @@ protected void populateItem(final Item item AjaxSubmitLink link = new AjaxSubmitLink(ID_LINK_OBJECT_TYPE) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { editObjectTypePerformed(target, objectType); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(parentPage.getFeedbackPanel()); } }; @@ -236,7 +235,7 @@ public void onClick(AjaxRequestTarget target) { parentPage.addEditingVisibleBehavior(delete); link.add(delete); - item.add(AttributeModifier.replace("class", new AbstractReadOnlyModel() { + item.add(AttributeModifier.replace("class", new IModel() { @Override public String getObject() { @@ -254,12 +253,12 @@ public String getObject() { AjaxSubmitLink add = new AjaxSubmitLink(ID_BUTTON_ADD_OBJECT_TYPE) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { addObjectTypePerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(parentPage.getFeedbackPanel()); } }; @@ -278,7 +277,7 @@ protected void onConfigure() { } private IModel createObjectTypeDisplayModel(final ResourceObjectTypeDefinitionTypeDto objectType){ - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -305,7 +304,7 @@ static void addKindAndIntent(StringBuilder sb, ShadowKindType kind, String inten } private void initObjectTypeEditor(WebMarkupContainer editor){ - Label editorLabel = new Label(ID_EDITOR_NAME, new AbstractReadOnlyModel() { + Label editorLabel = new Label(ID_EDITOR_NAME, new IModel() { @Override public String getObject() { ResourceObjectTypeDefinitionTypeDto selected = schemaHandlingDtoModel.getObject().getSelectedObjectTypeDto(); @@ -367,7 +366,7 @@ protected void onUpdate(AjaxRequestTarget target) { AjaxSubmitLink editorDependency = new AjaxSubmitLink(ID_EDITOR_BUTTON_DEPENDENCY) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { dependencyEditPerformed(target); } }; @@ -385,7 +384,7 @@ protected Iterator getChoices(String input) { } }; editorObjectClass.add(new UpdateNamesBehaviour()); - editorObjectClass.add(createObjectClassValidator(new AbstractReadOnlyModel>() { + editorObjectClass.add(createObjectClassValidator(new IModel>() { @Override public List getObject() { return schemaHandlingDtoModel.getObject().getObjectClassList(); @@ -506,7 +505,7 @@ protected void performRemoveValueHook(AjaxRequestTarget target, ListItem form) { + protected void onSubmit(AjaxRequestTarget target) { iterationEditPerformed(target); } }; @@ -516,7 +515,7 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { AjaxSubmitLink editorProtected = new AjaxSubmitLink(ID_EDITOR_BUTTON_PROTECTED) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { protectedEditPerformed(target); } }; @@ -526,7 +525,7 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { AjaxSubmitLink editorActivation = new AjaxSubmitLink(ID_EDITOR_BUTTON_ACTIVATION) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { activationEditPerformed(target); } }; @@ -536,7 +535,7 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { AjaxSubmitLink editorCredentials = new AjaxSubmitLink(ID_EDITOR_BUTTON_CREDENTIALS) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { credentialsEditPerformed(target); } }; @@ -710,7 +709,7 @@ private Iterator getObjectClassChoices(String input) { } private void addDisabledClassModifier(Component component){ - component.add(new AttributeAppender("class", new AbstractReadOnlyModel() { + component.add(new AttributeAppender("class", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java index ad131cd85ec..dce1b9580c9 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java @@ -63,7 +63,6 @@ import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -197,7 +196,7 @@ protected void populateItem(Item item) { AjaxSubmitLink link = new AjaxSubmitLink(ID_OBJECT_SYNC_LINK) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { editSyncObjectPerformed(target, syncObject); } }; @@ -217,7 +216,7 @@ public void onClick(AjaxRequestTarget target){ parentPage.addEditingVisibleBehavior(delete); link.add(delete); - item.add(AttributeModifier.replace("class", new AbstractReadOnlyModel() { + item.add(AttributeModifier.replace("class", new IModel() { @Override public String getObject() { @@ -260,7 +259,7 @@ protected void onConfigure() { } private void initObjectSyncEditor(WebMarkupContainer editor){ - Label editorLabel = new Label(ID_EDITOR_LABEL, new AbstractReadOnlyModel() { + Label editorLabel = new Label(ID_EDITOR_LABEL, new IModel() { @Override public String getObject() { if (!isAnySelected()) { @@ -329,7 +328,7 @@ protected String createAutoCompleteObjectLabel(QName object) { @Override protected IValidator createAutoCompleteValidator(){ - return createObjectClassValidator(new AbstractReadOnlyModel>() { + return createObjectClassValidator(new IModel>() { @Override public List getObject() { return syncDtoModel.getObject().getObjectClassList(); @@ -343,7 +342,7 @@ public List getObject() { // TODO: switch to ObjectTypeSelectPanel DropDownChoice editorFocus = new DropDownChoice<>(ID_EDITOR_FOCUS, new PropertyModel<>(syncDtoModel, ResourceSynchronizationDto.F_SELECTED + ".focusType"), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -363,7 +362,7 @@ public List getObject() { AjaxSubmitLink editorCondition = new AjaxSubmitLink(ID_EDITOR_BUTTON_CONDITION){ @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { conditionEditPerformed(target); } }; @@ -373,7 +372,7 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { AjaxSubmitLink editorConfirmation = new AjaxSubmitLink(ID_EDITOR_BUTTON_CONFIRMATION){ @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { confirmationEditPerformed(target); } }; @@ -382,7 +381,7 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { DropDownChoice editorObjectTemplate = new DropDownChoice<>(ID_EDITOR_OBJECT_TEMPLATE, new PropertyModel<>(syncDtoModel, ResourceSynchronizationDto.F_SELECTED + ".objectTemplateRef"), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -577,7 +576,7 @@ protected boolean buttonsDisabled(){ } private IModel createObjectSyncTypeDisplayModel(final ObjectSynchronizationType syncObject){ - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -601,7 +600,7 @@ private static String getTypeDisplayName(@NotNull QName name) { } private void addDisableClassModifier(Component component){ - component.add(new AttributeAppender("class", new AbstractReadOnlyModel() { + component.add(new AttributeAppender("class", new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java index d093259ca78..30aec0fea5b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java @@ -57,7 +57,6 @@ import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -177,7 +176,7 @@ public void onClick(AjaxRequestTarget target) { Label label = new Label(ID_LABEL, new PropertyModel<>(item.getModel(), ObjectClassDto.F_DISPLAY_NAME)); link.add(label); - item.add(AttributeModifier.replace("class", new AbstractReadOnlyModel() { + item.add(AttributeModifier.replace("class", new IModel() { @Override public Object getObject() { return item.getModelObject().isSelected() ? "success" : null; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/WizardHelpDialog.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/WizardHelpDialog.java index bb3e6e7e2f8..07a04cf6c34 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/WizardHelpDialog.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/WizardHelpDialog.java @@ -25,7 +25,7 @@ import org.apache.wicket.extensions.wizard.IWizardStep; 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.StringResourceModel; /** @@ -84,7 +84,7 @@ protected void onBeforeRender(){ } public void initLayout(WebMarkupContainer content){ - Label helpLabel = new Label(ID_HELP, new AbstractReadOnlyModel() { + Label helpLabel = new Label(ID_HELP, new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/AttributeEditorUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/AttributeEditorUtils.java index 4492d57d0c5..06d1c9605c6 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/AttributeEditorUtils.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/AttributeEditorUtils.java @@ -29,7 +29,6 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceItemDefinitionType; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.DropDownChoice; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.jetbrains.annotations.NotNull; @@ -79,7 +78,7 @@ public void detach() { final List matchingRuleList = WebComponentUtil.getMatchingRuleList(); DropDownChoice matchingRule = new DropDownChoice<>(ID_MATCHING_RULE, - matchingRuleModel, new AbstractReadOnlyModel>() { + matchingRuleModel, new IModel>() { @Override public List getObject() { return matchingRuleList; @@ -99,7 +98,7 @@ public boolean isEnabled() { }); editor.add(matchingRule); - Label unknownMatchingRule = new Label(ID_UNKNOWN_MATCHING_RULE, new AbstractReadOnlyModel() { + Label unknownMatchingRule = new Label(ID_UNKNOWN_MATCHING_RULE, new IModel() { @Override public String getObject() { return editor.getString("ResourceAttributeEditor.label.unknownMatchingRule", matchingRuleModel.getObject()); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java index 87997174808..69517d4ce83 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java @@ -152,7 +152,7 @@ protected void initLayout(NonEmptyModel readOnlyModel) { DropDownChoice associationAttribute = new DropDownChoice<>(ID_ASSOCIATION_ATTRIBUTE, new PropertyModel<>(getModel(), "associationAttribute"), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -165,7 +165,7 @@ public List getObject() { DropDownChoice valueAttribute = new DropDownChoice<>(ID_VALUE_ATTRIBUTE, new PropertyModel<>(getModel(), "valueAttribute"), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -248,7 +248,7 @@ public void onClick(AjaxRequestTarget target) { VisibleEnableBehaviour showIfEditingOrOutboundExists = AttributeEditorUtils.createShowIfEditingOrOutboundExists(getModel(), readOnlyModel); TextField outboundLabel = new TextField<>(ID_OUTBOUND_LABEL, - new AbstractReadOnlyModel() { + new IModel() { @Override public String getObject() { @@ -269,12 +269,12 @@ public String getObject() { AjaxSubmitButton outbound = new AjaxSubmitButton(ID_BUTTON_OUTBOUND) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { outboundEditPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(parentStep.getPageBase().getFeedbackPanel()); } }; @@ -285,12 +285,12 @@ protected void onError(AjaxRequestTarget target, Form form) { AjaxSubmitLink deleteOutbound = new AjaxSubmitLink(ID_DELETE_OUTBOUND) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { deleteOutboundPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(parentStep.getPageBase().getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java index d213771eaae..ea2d5e85b50 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java @@ -174,7 +174,7 @@ public boolean isEnabled() { schemaRefPanel.add(refTooltip); DropDownChoice refSelect = new DropDownChoice(ID_REFERENCE_SELECT, new PropertyModel<>(getModel(), "ref"), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -288,7 +288,7 @@ public void onClick(AjaxRequestTarget target) { AttributeEditorUtils.addMatchingRuleFields(this, readOnlyModel); TextField outboundLabel = new TextField<>(ID_OUTBOUND_LABEL, - new AbstractReadOnlyModel() { + new IModel() { @Override public String getObject() { @@ -311,12 +311,12 @@ public String getObject() { AjaxSubmitLink outbound = new AjaxSubmitLink(ID_BUTTON_OUTBOUND) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { outboundEditPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(parentStep.getPageBase().getFeedbackPanel()); } }; @@ -327,12 +327,12 @@ protected void onError(AjaxRequestTarget target, Form form) { AjaxSubmitLink deleteOutbound = new AjaxSubmitLink(ID_DELETE_OUTBOUND) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { deleteOutboundPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(parentStep.getPageBase().getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java index 3af55f28755..585ca8e0504 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java @@ -45,7 +45,6 @@ import org.apache.wicket.markup.html.form.EnumChoiceRenderer; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -117,7 +116,7 @@ public boolean isVisible() { return !parentPage.isReadOnly() || credentials.getPassword().getOutbound() != null; } }; - TextField outboundLabel = new TextField<>(ID_OUTBOUND_LABEL, new AbstractReadOnlyModel() { + TextField outboundLabel = new TextField<>(ID_OUTBOUND_LABEL, new IModel() { @Override public String getObject() { @@ -144,7 +143,7 @@ public String getObject() { AjaxSubmitLink outbound = new AjaxSubmitLink(ID_OUTBOUND_BUTTON) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { outboundEditPerformed(target); } }; @@ -182,7 +181,7 @@ protected void editPerformed(AjaxRequestTarget target, MappingType object){ DropDownChoice passwordPolicy = new DropDownChoice<>(ID_PASS_POLICY, new PropertyModel<>(getModel(), "password.passwordPolicyRef"), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java index 719418cd298..8fd18074363 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java @@ -42,7 +42,6 @@ import org.apache.wicket.markup.html.form.TextField; 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 org.apache.wicket.model.PropertyModel; @@ -134,7 +133,7 @@ public void onClick(AjaxRequestTarget target) { dependencyBody.setMarkupId(createCollapseItemId(item, false).getObject()); if(changeState != ChangeState.SKIP){ - dependencyBody.add(new AttributeModifier("class", new AbstractReadOnlyModel() { + dependencyBody.add(new AttributeModifier("class", new IModel() { @Override public String getObject() { @@ -179,7 +178,7 @@ public String getObject() { DropDownChoice resource = new DropDownChoice<>(ID_REF, new PropertyModel<>(item.getModelObject(), "resourceRef"), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -227,7 +226,7 @@ public void onClick(AjaxRequestTarget target) { } private IModel createDependencyLabelModel(final ListItem item){ - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -308,7 +307,7 @@ private WebMarkupContainer getMainContainer(){ } private IModel createCollapseItemId(final ListItem item, final boolean appendSelector){ - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java index f1e77c9f3c0..fbee6cb9338 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java @@ -32,7 +32,6 @@ import org.apache.wicket.markup.html.form.TextField; 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 org.apache.wicket.model.PropertyModel; @@ -92,7 +91,7 @@ protected void populateItem(final ListItem item){ linkCont.add(new AttributeModifier("href", createCollapseItemId(item, true))); item.add(linkCont); - Label accountLabel = new Label(ID_ACCOUNT_NAME, new AbstractReadOnlyModel() { + Label accountLabel = new Label(ID_ACCOUNT_NAME, new IModel() { @Override public String getObject() { @@ -128,7 +127,7 @@ public void onClick(AjaxRequestTarget target) { accountBody.setMarkupId(createCollapseItemId(item, false).getObject()); if(changeState != ChangeState.SKIP){ - accountBody.add(new AttributeModifier("class", new AbstractReadOnlyModel() { + accountBody.add(new AttributeModifier("class", new IModel() { @Override public String getObject() { @@ -193,7 +192,7 @@ private WebMarkupContainer getMainContainer(){ } private IModel createCollapseItemId(final ListItem item,final boolean includeSelector){ - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/ExpressionVariableEditorDialog.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/ExpressionVariableEditorDialog.java index 1a7343612bc..55daad62fb0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/ExpressionVariableEditorDialog.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/ExpressionVariableEditorDialog.java @@ -26,7 +26,6 @@ import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; import org.apache.wicket.markup.html.WebMarkupContainer; 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.model.PropertyModel; @@ -167,7 +166,7 @@ public void initLayout(WebMarkupContainer content) { DropDownFormGroup objectReference = new DropDownFormGroup<>(ID_OBJECT_REFERENCE, new PropertyModel<>(model, ExpressionVariableDefinitionTypeDto.F_VARIABLE + ".objectRef"), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -186,7 +185,7 @@ public List getObject() { createStringResource("ExpressionVariableEditor.button.cancel")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { cancelPerformed(target); } }; @@ -196,7 +195,7 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { createStringResource("ExpressionVariableEditor.button.apply")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java index 1ea38252da3..dcfd4687f36 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java @@ -44,7 +44,6 @@ import org.apache.wicket.markup.html.form.FormComponent; 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 org.apache.wicket.model.PropertyModel; import org.apache.wicket.model.StringResourceModel; @@ -177,7 +176,7 @@ public void onClick(AjaxRequestTarget target) { limitationBody.setOutputMarkupId(true); limitationBody.setMarkupId(createCollapseItemId(item, false).getObject()); if (changeState != ChangeState.SKIP) { - limitationBody.add(new AttributeModifier("class", new AbstractReadOnlyModel() { + limitationBody.add(new AttributeModifier("class", new IModel() { @Override public String getObject() { @@ -317,7 +316,7 @@ protected void onUpdate(AjaxRequestTarget target) {} } private IModel createLimitationsLabelModel(final ListItem item){ - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -359,7 +358,7 @@ public String getObject() { } private IModel createCollapseItemId(final ListItem item, final boolean appendSelector){ - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java index 85ac83367d2..59b975b06f4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java @@ -35,7 +35,6 @@ import org.apache.wicket.markup.html.form.EnumChoiceRenderer; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.IChoiceRenderer; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -246,7 +245,7 @@ protected String createNewEmptyItem() { @Override protected IModel> createChoiceList() { - return new AbstractReadOnlyModel>() { + return new IModel>() { @Override public List getObject() { @@ -273,7 +272,7 @@ protected String createNewEmptyItem() { @Override protected IModel> createChoiceList() { - return new AbstractReadOnlyModel>() { + return new IModel>() { @Override public List getObject() { @@ -360,7 +359,7 @@ protected void onUpdate(AjaxRequestTarget target) { DropDownFormGroup expressionGeneratePolicy = new DropDownFormGroup( ID_EXPRESSION_POLICY_REF, new PropertyModel<>(model, MappingTypeDto.F_EXPRESSION_POLICY_REF), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -468,7 +467,7 @@ protected void onUpdate(AjaxRequestTarget target) { DropDownFormGroup conditionGeneratePolicy = new DropDownFormGroup( ID_CONDITION_POLICY_REF, new PropertyModel<>(model, MappingTypeDto.F_CONDITION_POLICY_REF), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -543,12 +542,12 @@ public void onClick(AjaxRequestTarget target) { createStringResource("MappingEditorDialog.button.apply")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getPageBase().getFeedbackPanel(), getContent()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java index 532df257d6a..68c53ee4142 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java @@ -175,7 +175,7 @@ public void onClick(AjaxRequestTarget target) { AjaxSubmitLink save = new AjaxSubmitLink(ID_BUTTON_SAVE) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationExpressionEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationExpressionEditor.java index b950fcd7a04..ba871d149fc 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationExpressionEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationExpressionEditor.java @@ -20,7 +20,6 @@ import com.evolveum.midpoint.web.page.admin.resources.PageResourceWizard; import com.evolveum.midpoint.xml.ns._public.common.common_3.ExpressionType; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; /** @@ -48,7 +47,7 @@ public IModel getModel(){ } protected void initLayout(PageResourceWizard parentPage){ - Label label = new Label(ID_LABEL, new AbstractReadOnlyModel() { + Label label = new Label(ID_LABEL, new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java index 58a9ccfd848..4785bac596c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java @@ -129,7 +129,7 @@ protected String createNewEmptyItem() { @Override protected IModel> createChoiceList() { - return new AbstractReadOnlyModel>() { + return new IModel>() { @Override public List getObject() { @@ -155,7 +155,7 @@ protected IChoiceRenderer createRenderer() { DropDownChoice objectTemplateRef = new DropDownChoice<>(ID_OBJECT_TEMPLATE_REF, new PropertyModel<>(getModel(), "objectTemplateRef"), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCase.java index c971d0222a4..2dd1a810b8f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCase.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCase.java @@ -183,12 +183,12 @@ public void onClick(AjaxRequestTarget target) { AjaxSubmitButton save = new AjaxSubmitButton(ID_SAVE_BUTTON, createStringResource("pageCase.button.save")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItems.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItems.java index 4648b729b2a..4a7128095ae 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItems.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItems.java @@ -38,7 +38,6 @@ import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -257,7 +256,7 @@ public void populateItem(Item> item, String comp } else { created = null; } - item.add(new Label(componentId, new AbstractReadOnlyModel() { + item.add(new Label(componentId, new IModel() { @Override public String getObject() { return WebComponentUtil.getLocalizedDate(created, DateLabelComponent.LONG_MEDIUM_STYLE); @@ -282,7 +281,7 @@ public void populateItem(Item> item, String comp } else { deadline = null; } - item.add(new Label(componentId, new AbstractReadOnlyModel() { + item.add(new Label(componentId, new IModel() { @Override public String getObject() { return WebComponentUtil.getLocalizedDate(deadline, DateLabelComponent.LONG_MEDIUM_STYLE); @@ -307,7 +306,7 @@ public void populateItem(Item> item, String comp } else { closed = null; } - item.add(new Label(componentId, new AbstractReadOnlyModel() { + item.add(new Label(componentId, new IModel() { @Override public String getObject() { return WebComponentUtil.getLocalizedDate(closed, DateLabelComponent.LONG_MEDIUM_STYLE); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCases.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCases.java index 2c454d60692..12dd37ebb4d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCases.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCases.java @@ -22,7 +22,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -113,7 +112,7 @@ private List, String>> initColumns() { column = new AbstractColumn, String>(createStringResource("pageCases.table.objectRef"), "objectRef"){ @Override public void populateItem(Item>> item, String componentId, IModel> rowModel) { - item.add(new Label(componentId, new AbstractReadOnlyModel() { + item.add(new Label(componentId, new IModel() { @Override public String getObject() { return getObjectRef(rowModel); @@ -126,7 +125,7 @@ public String getObject() { column = new AbstractColumn, String>(createStringResource("pageCases.table.actors")){ @Override public void populateItem(Item>> item, String componentId, IModel> rowModel) { - item.add(new Label(componentId, new AbstractReadOnlyModel() { + item.add(new Label(componentId, new IModel() { @Override public String getObject() { String actors = null; @@ -172,7 +171,7 @@ public void populateItem(Item>> cellItem } else { created = null; } - cellItem.add(new Label(componentId, new AbstractReadOnlyModel() { + cellItem.add(new Label(componentId, new IModel() { @Override public String getObject() { return WebComponentUtil.getLocalizedDate(created, DateLabelComponent.LONG_MEDIUM_STYLE); @@ -196,7 +195,7 @@ public void populateItem(Item>> cellItem } else { closed = null; } - cellItem.add(new Label(componentId, new AbstractReadOnlyModel() { + cellItem.add(new Label(componentId, new IModel() { @Override public String getObject() { return WebComponentUtil.getLocalizedDate(closed, DateLabelComponent.LONG_MEDIUM_STYLE); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java index 38fa6ebd309..fe304259b96 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java @@ -33,7 +33,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -120,7 +119,7 @@ public IColumn createDetailedInfoCo @Override protected IModel createIconModel(final IModel rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { return "fa fa-fw fa-info-circle text-info"; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionBasicPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionBasicPanel.java index 94f0cdf299c..a5f957261e1 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionBasicPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionBasicPanel.java @@ -30,7 +30,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.*; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -132,7 +131,7 @@ public void setObject(AccessCertificationRemediationStyleType object) { add(WebComponentUtil.createHelp(ID_OUTCOME_STRATEGY_HELP)); - Label stopReviewOn = new Label(ID_STOP_REVIEW_ON, new AbstractReadOnlyModel() { + Label stopReviewOn = new Label(ID_STOP_REVIEW_ON, new IModel() { @Override public String getObject() { List stopOn = getModel().getObject().getStopReviewOn(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java index 9063b8e4823..ecce396bf0f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java @@ -33,7 +33,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.*; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; @@ -189,7 +188,7 @@ public boolean isEnabled() { add(outcomeIfNoReviewers); add(WebComponentUtil.createHelp(ID_OUTCOME_IF_NO_REVIEWERS_HELP)); - Label stopReviewOn = new Label(ID_STOP_REVIEW_ON, new AbstractReadOnlyModel() { + Label stopReviewOn = new Label(ID_STOP_REVIEW_ON, new IModel() { @Override public String getObject() { List stopOn = getModelObject().getStopReviewOn(); @@ -208,7 +207,7 @@ public NoOffsetPrismReferencePanel(String id, IModel propertyM // quite a hack, to get rid of col-md-offset-2 style @Override protected IModel createStyleClassModel(IModel value) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { return null; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java index a7c3e92b88d..b94ccf77cf2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java @@ -30,7 +30,6 @@ import org.apache.wicket.extensions.markup.html.tabs.ITab; import org.apache.wicket.markup.html.WebMarkupContainer; 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.jetbrains.annotations.NotNull; @@ -71,8 +70,8 @@ private void initLayout() { AjaxSubmitButton addNewStage = new AjaxSubmitButton(ID_ADD_NEW_STAGE, createStringResource("StageDefinitionPanel.addNewStageButton")) { @Override - public void onSubmit(AjaxRequestTarget target, Form form) { - super.onSubmit(target, form); + public void onSubmit(AjaxRequestTarget target) { + super.onSubmit(target); addPerformed(target); } }; @@ -89,8 +88,8 @@ public boolean isVisible() { AjaxSubmitButton moveLeft = new AjaxSubmitButton(ID_MOVE_STAGE_LEFT, createStringResource("StageDefinitionPanel.moveStageLeftButton")) { @Override - public void onSubmit(AjaxRequestTarget target, Form form) { - super.onSubmit(target, form); + public void onSubmit(AjaxRequestTarget target) { + super.onSubmit(target); moveLeftPerformed(target); } }; @@ -99,8 +98,8 @@ public void onSubmit(AjaxRequestTarget target, Form form) { AjaxSubmitButton moveRight = new AjaxSubmitButton(ID_MOVE_STAGE_RIGHT, createStringResource("StageDefinitionPanel.moveStageRightButton")) { @Override - public void onSubmit(AjaxRequestTarget target, Form form) { - super.onSubmit(target, form); + public void onSubmit(AjaxRequestTarget target) { + super.onSubmit(target); moveRightPerformed(target); } }; @@ -109,8 +108,8 @@ public void onSubmit(AjaxRequestTarget target, Form form) { AjaxSubmitButton delete = new AjaxSubmitButton(ID_DELETE_STAGE, createStringResource("StageDefinitionPanel.deleteStageButton")) { @Override - public void onSubmit(AjaxRequestTarget target, Form form) { - super.onSubmit(target, form); + public void onSubmit(AjaxRequestTarget target) { + super.onSubmit(target); deletePerformed(target); } }; @@ -121,7 +120,7 @@ public void onSubmit(AjaxRequestTarget target, Form form) { } private void deletePerformed(AjaxRequestTarget target) { - ConfirmationPanel dialog = new ConfirmationPanel(getPageBase().getMainPopupBodyId(), new AbstractReadOnlyModel() { + ConfirmationPanel dialog = new ConfirmationPanel(getPageBase().getMainPopupBodyId(), new IModel() { @Override public String getObject() { StageDefinitionDto dto = getModelObject().get(tabPanel.getSelectedTab()); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java index 5cb52fd18c6..d515a1f95c0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java @@ -58,7 +58,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -227,14 +226,14 @@ private void initBasicInfoLayout(Form mainForm) { mainForm.add(new Label(ID_CAMPAIGN_NUMBER_OF_STAGES, new PropertyModel<>(campaignModel, CertCampaignDto.F_NUMBER_OF_STAGES))); mainForm.add(new Label(ID_CAMPAIGN_ITERATION, new PropertyModel<>(campaignModel, CertCampaignDto.F_ITERATION))); mainForm.add(new Label(ID_CAMPAIGN_CURRENT_STATE, new PropertyModel<>(campaignModel, CertCampaignDto.F_CURRENT_STATE))); - mainForm.add(new Label(ID_CAMPAIGN_TIME, new AbstractReadOnlyModel() { + mainForm.add(new Label(ID_CAMPAIGN_TIME, new IModel() { @Override public String getObject() { CertCampaignDto dto = campaignModel.getObject(); return formatDuration(dto.getCampaignStart(), dto.getCampaignEnd()); } })); - mainForm.add(new Label(ID_STAGE_TIME, new AbstractReadOnlyModel() { + mainForm.add(new Label(ID_STAGE_TIME, new IModel() { @Override public String getObject() { CertCampaignDto dto = campaignModel.getObject(); @@ -402,7 +401,7 @@ public void onClick(AjaxRequestTarget target) { AjaxSubmitButton startCampaignButton = new AjaxSubmitButton(ID_START_CAMPAIGN_BUTTON, createStringResource("PageCertCampaign.button.startCampaign")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { executeCampaignStateOperation(target, OP_OPEN_NEXT_STAGE); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java index 4e21288386f..7c80aa6946d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java @@ -152,7 +152,7 @@ public CertCampaignListItemDto createDataObjectWrapper( @Override protected IModel createPageTitleModel() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -220,12 +220,12 @@ private void initLayout() { AjaxSubmitButton clearButton = new AjaxSubmitButton(ID_SEARCH_CLEAR) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { clearSearchPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(((PageBase) getPage()).getFeedbackPanel()); } @@ -285,7 +285,7 @@ private ObjectQuery createCampaignsQuery() { } private IModel createCloseStageConfirmString() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -309,7 +309,7 @@ private IModel createReiterateCampaignConfirmString() { } private IModel createCloseSelectedCampaignsConfirmString() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -344,7 +344,7 @@ private IModel createReiterateSelectedCampaignsConfirmString() { } private IModel createDeleteCampaignConfirmString() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -355,7 +355,7 @@ public String getObject() { } private IModel createDeleteSelectedCampaignsConfirmString() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -578,7 +578,7 @@ public void onClick(AjaxRequestTarget target) { @Override public IModel getVisible() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public Boolean getObject() { return dto.getState() != AccessCertificationCampaignStateType.CLOSED; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java index 496cb5149dc..5851add9b90 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java @@ -63,7 +63,6 @@ import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -233,7 +232,7 @@ public void onClick(AjaxRequestTarget target, IModel rowModel) @Override public void populateItem(Item> item, String componentId, final IModel rowModel) { - item.add(new Label(componentId, new AbstractReadOnlyModel() { + item.add(new Label(componentId, new IModel() { @Override public Object getObject() { return rowModel.getObject().getCampaignName(); @@ -262,7 +261,7 @@ public String getCssClass() { @Override public void populateItem(Item> item, String componentId, final IModel rowModel) { - item.add(new Label(componentId, new AbstractReadOnlyModel() { + item.add(new Label(componentId, new IModel() { @Override public String getObject() { CertWorkItemDto dto = rowModel.getObject(); @@ -289,7 +288,7 @@ public String getCssClass() { @Override public void populateItem(Item> item, String componentId, final IModel rowModel) { - item.add(new Label(componentId, new AbstractReadOnlyModel() { + item.add(new Label(componentId, new IModel() { @Override public String getObject() { CertWorkItemDto dto = rowModel.getObject(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java index 72aec171728..91403669df7 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java @@ -214,7 +214,7 @@ public void onClick(AjaxRequestTarget target) { AjaxSubmitButton saveButton = new AjaxSubmitButton(ID_SAVE_BUTTON, createStringResource("PageCertDefinition.button.save")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java index 86ef469477f..38a222b179f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java @@ -49,7 +49,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -133,7 +132,7 @@ private MainObjectListPanel getDefinitionsTab } private IModel createDeleteConfirmString() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { if (singleDelete == null) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsClockPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsClockPanel.java index b7bc070ac5d..20e5d682c80 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsClockPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsClockPanel.java @@ -47,12 +47,12 @@ protected void onInitialize() { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getPageBase().getFeedbackPanel()); } }; @@ -62,12 +62,12 @@ protected void onError(AjaxRequestTarget target, Form form) { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { resetPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getPageBase().getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsConfigPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsConfigPanel.java index da772c81f5e..891b80ab099 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsConfigPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsConfigPanel.java @@ -58,12 +58,12 @@ protected void onInitialize() { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { updateInternalConfig(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getPageBase().getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsCountersPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsCountersPanel.java index 6631c98574a..c3b92c5c163 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsCountersPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsCountersPanel.java @@ -5,7 +5,7 @@ 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 com.evolveum.midpoint.gui.api.component.BasePanel; import com.evolveum.midpoint.schema.internals.InternalCounters; @@ -39,7 +39,7 @@ protected void populateItem(ListItem item) { Label label = new Label(ID_COUNTER_LABEL, createStringResource("InternalCounters." + counter.getKey())); item.add(label); - Label valueLabel = new Label(ID_COUNTER_VALUE, new AbstractReadOnlyModel() { + Label valueLabel = new Label(ID_COUNTER_VALUE, new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsDebugUtilPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsDebugUtilPanel.java index cca46b2b665..b5a4ac6e186 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsDebugUtilPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsDebugUtilPanel.java @@ -47,12 +47,12 @@ protected void onInitialize() { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { updateDebugPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getPageBase().getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsTracesPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsTracesPanel.java index 6ecafe664a6..d4a8867204b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsTracesPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsTracesPanel.java @@ -67,12 +67,12 @@ protected void populateItem(ListItem item) { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { updateTraces(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getPageBase().getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java index e148fb5c329..4f0021e968a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java @@ -88,12 +88,12 @@ private void initLayout() { AjaxSubmitButton start = new AjaxSubmitButton(ID_START, createStringResource("PageBulkAction.button.start")) { @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { startPerformed(target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java index c197539defb..6c001799fc4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java @@ -55,7 +55,6 @@ import org.apache.wicket.markup.html.form.IChoiceRenderer; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -284,7 +283,7 @@ public void populateItem(Item> cellItem, String final IModel rowModel) { TwoValueLinkPanel panel = new TwoValueLinkPanel(componentId, - new AbstractReadOnlyModel() { + new IModel() { @Override public String getObject() { DebugObjectItem object = rowModel.getObject(); @@ -386,7 +385,7 @@ public InlineMenuItemAction initAction() { private static final long serialVersionUID = 1L; @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { exportSelected(target, null); } }; @@ -403,7 +402,7 @@ public InlineMenuItemAction initAction() { private static final long serialVersionUID = 1L; @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { exportAllType(target); } }; @@ -443,7 +442,7 @@ public InlineMenuItemAction initAction() { private static final long serialVersionUID = 1L; @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { exportAll(target); } }; @@ -461,7 +460,7 @@ public InlineMenuItemAction initAction() { private static final long serialVersionUID = 1L; @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { deleteSelected(target, null); } }; @@ -478,7 +477,7 @@ public InlineMenuItemAction initAction() { @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { deleteAllType(target); } }; @@ -518,7 +517,7 @@ public InlineMenuItemAction initAction() { @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { deleteAllIdentities(target); } }; @@ -620,7 +619,7 @@ private RepositoryObjectDataProvider getTableDataProvider() { } private IModel createDeleteConfirmString() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java index cba0db2060b..d1f4855f093 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java @@ -22,12 +22,9 @@ import javax.xml.namespace.QName; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang3.BooleanUtils; import org.apache.wicket.RestartResponseException; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox; import org.apache.wicket.markup.html.form.TextArea; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.util.string.StringValue; @@ -273,12 +270,12 @@ private void initButtons(final Form mainForm) { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(target); } @Override - protected void onError(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageEvaluateMapping.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageEvaluateMapping.java index dfdc43a78dc..51a79297fb1 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageEvaluateMapping.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageEvaluateMapping.java @@ -40,7 +40,7 @@ import org.apache.wicket.ajax.form.OnChangeAjaxBehavior; import org.apache.wicket.markup.html.form.DropDownChoice; 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.model.PropertyModel; @@ -108,12 +108,12 @@ private void initLayout() { AjaxSubmitButton evaluateMapping = new AjaxSubmitButton(ID_EXECUTE, createStringResource("PageEvaluateMapping.button.evaluateMapping")) { @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { executeMappingPerformed(target); } }; @@ -121,7 +121,7 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { final DropDownChoice sampleChoice = new DropDownChoice<>(ID_MAPPING_SAMPLE, Model.of(""), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { return SAMPLES; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java index 3084df11dce..080ebb7a471 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java @@ -231,12 +231,12 @@ public boolean isVisible() { createStringResource("PageImportObject.button.import")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(false, OPERATION_IMPORT_FILE, target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } }; @@ -247,12 +247,12 @@ protected void onError(AjaxRequestTarget target, Form form) { createStringResource("PageImportObject.button.import")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(true, OPERATION_IMPORT_XML, target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java index fa89252e0fa..aec70353f87 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java @@ -67,7 +67,7 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.DropDownChoice; 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.model.PropertyModel; import org.apache.wicket.model.util.ListModel; @@ -224,12 +224,12 @@ protected void onUpdate(AjaxRequestTarget target) { AjaxSubmitButton executeMidPoint = new AjaxSubmitButton(ID_EXECUTE_MIDPOINT, createStringResource("PageRepositoryQuery.button.translateAndExecute")) { @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { queryPerformed(Action.EXECUTE_MIDPOINT, target); } }; @@ -237,12 +237,12 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { AjaxSubmitButton compileMidPoint = new AjaxSubmitButton(ID_COMPILE_MIDPOINT, createStringResource("PageRepositoryQuery.button.translate")) { @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { queryPerformed(Action.TRANSLATE_ONLY, target); } }; @@ -250,11 +250,11 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { AjaxSubmitButton useInObjectList = new AjaxSubmitButton(ID_USE_IN_OBJECT_LIST, createStringResource("PageRepositoryQuery.button.useInObjectList")) { @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { useInObjectListPerformed(target); } }; @@ -268,7 +268,7 @@ public boolean isVisible() { final DropDownChoice sampleChoice = new DropDownChoice<>(ID_QUERY_SAMPLE, Model.of(""), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { return SAMPLES; @@ -307,19 +307,19 @@ protected void onUpdate(AjaxRequestTarget target) { AjaxSubmitButton executeHibernate = new AjaxSubmitButton(ID_EXECUTE_HIBERNATE, createStringResource("PageRepositoryQuery.button.execute")) { @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { queryPerformed(Action.EXECUTE_HIBERNATE, target); } }; executeHibernate.setVisible(isAdmin); mainForm.add(executeHibernate); - Label resultLabel = new Label(ID_RESULT_LABEL, new AbstractReadOnlyModel() { + Label resultLabel = new Label(ID_RESULT_LABEL, new IModel() { @Override public String getObject() { if (model.getObject().getQueryResultText() == null) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/HeaderMenuAction.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/HeaderMenuAction.java index da09970ed3a..e8b6bd855c1 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/HeaderMenuAction.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/HeaderMenuAction.java @@ -36,7 +36,7 @@ public HeaderMenuAction(Component component) { } @Override - public void onError(AjaxRequestTarget target, Form form) { + public void onError(AjaxRequestTarget target) { Page page = component.getPage(); if (page instanceof PageBase) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java index 7c2435019f5..a58eff5670a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java @@ -29,6 +29,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; +import org.apache.wicket.MarkupContainer; import org.apache.wicket.RestartResponseException; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; @@ -43,7 +44,6 @@ import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.FeedbackPanel; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -186,7 +186,7 @@ public void initLayout(ObjectPolicyConfigurationType config) { protected void populateItem(final ListItem item) { WebMarkupContainer textWrapper = new WebMarkupContainer(ID_TEXT_WRAPPER); textWrapper.setOutputMarkupId(true); - textWrapper.add(AttributeAppender.prepend("class", new AbstractReadOnlyModel() { + textWrapper.add(AttributeAppender.prepend("class", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -237,7 +237,7 @@ protected void onUpdate(AjaxRequestTarget target) { textWrapper.add(feedback); WebMarkupContainer buttonGroup = new WebMarkupContainer(ID_BUTTON_GROUP); - buttonGroup.add(AttributeAppender.append("class", new AbstractReadOnlyModel() { + buttonGroup.add(AttributeAppender.append("class", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -261,12 +261,12 @@ public String getObject() { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { cancelPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { cancelPerformed(target); } }; @@ -277,12 +277,12 @@ protected void onError(AjaxRequestTarget target, Form form) { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getPageBase().getFeedbackPanel()); target.add(form); } @@ -294,6 +294,7 @@ private void initButtons(WebMarkupContainer buttonGroup, final ListItem> createObjectTemplateList() { - return new AbstractReadOnlyModel>() { + return new IModel>() { private static final long serialVersionUID = 1L; @Override @@ -408,7 +410,7 @@ public List getObject() { // TODO - to what types can be ObjectTemplate bound? private IModel> createTypeChoiceList() { - return new AbstractReadOnlyModel>() { + return new IModel>() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java index f1cadba3d0a..bcf0967c504 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java @@ -439,7 +439,7 @@ public void initButtons(Form mainForm){ private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(target); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyAssignmentsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyAssignmentsPanel.java index 019eafdb94f..7f3ff37f530 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyAssignmentsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyAssignmentsPanel.java @@ -31,7 +31,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import java.util.ArrayList; @@ -57,7 +56,7 @@ private void initLayout() { @Override protected IModel createIconModel(final IModel rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/PersonalInfoPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/PersonalInfoPanel.java index 619f90c5309..2e4a77dc60f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/PersonalInfoPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/PersonalInfoPanel.java @@ -30,7 +30,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import java.util.Date; @@ -89,7 +88,7 @@ private PersonalInfoDto loadPersonalInfo() { } protected void initLayout(PageBase parentPage) { - DateLabelComponent lastLoginDate = new DateLabelComponent(ID_LAST_LOGIN_DATE, new AbstractReadOnlyModel() { + DateLabelComponent lastLoginDate = new DateLabelComponent(ID_LAST_LOGIN_DATE, new IModel() { @Override public Date getObject() { @@ -100,7 +99,7 @@ public Date getObject() { lastLoginDate.setBeforeTextOnDateNull(parentPage.getString("PersonalInfoPanel.never")); add(lastLoginDate); - Label lastLoginFrom = new Label(ID_LAST_LOGIN_FROM, new AbstractReadOnlyModel() { + Label lastLoginFrom = new Label(ID_LAST_LOGIN_FROM, new IModel() { @Override public String getObject() { @@ -112,7 +111,7 @@ public String getObject() { }); add(lastLoginFrom); - DateLabelComponent lastFailDate = new DateLabelComponent(ID_LAST_FAIL_DATE, new AbstractReadOnlyModel() { + DateLabelComponent lastFailDate = new DateLabelComponent(ID_LAST_FAIL_DATE, new IModel() { @Override public Date getObject() { @@ -123,7 +122,7 @@ public Date getObject() { lastFailDate.setBeforeTextOnDateNull(parentPage.getString("PersonalInfoPanel.never")); add(lastFailDate); - Label lastFailFrom = new Label(ID_LAST_FAIL_FROM, new AbstractReadOnlyModel() { + Label lastFailFrom = new Label(ID_LAST_FAIL_FROM, new IModel() { @Override public String getObject() { @@ -135,7 +134,7 @@ public String getObject() { }); add(lastFailFrom); - Label passwordExp = new Label(ID_PASSWORD_EXP, new AbstractReadOnlyModel() { + Label passwordExp = new Label(ID_PASSWORD_EXP, new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/SystemInfoPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/SystemInfoPanel.java index f9cf500d58e..39c849f1ac4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/SystemInfoPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/SystemInfoPanel.java @@ -26,7 +26,6 @@ import org.apache.wicket.ajax.AjaxSelfUpdatingTimerBehavior; 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; import org.apache.wicket.util.time.Duration; @@ -163,7 +162,7 @@ protected void initLayout() { } private IModel createUptimeModel() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -176,7 +175,7 @@ public String getObject() { } private IModel createStartTimeModel() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public Date getObject() { @@ -187,7 +186,7 @@ public Date getObject() { } private IModel createMemoryModel(final boolean heap) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -205,7 +204,7 @@ public String getObject() { } private IModel createThreadModel() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java index 7b56a8c1da5..1b796e1d4e2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java @@ -28,7 +28,6 @@ import org.apache.wicket.extensions.markup.html.tabs.ITab; import org.apache.wicket.markup.html.WebMarkupContainer; 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; @@ -155,7 +154,7 @@ public AjaxTabbedPanel getTabbedPanel(){ protected abstract Panel createTreePanel(String id, Model model, PageBase pageBase); private IModel createTabTitle(final PrismObject org) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java index caea1593fd0..e7e0b404811 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java @@ -37,7 +37,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.ReuseIfModelsEqualStrategy; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -235,12 +234,12 @@ protected Component newContentComponent(String id, IModel target) { super.onClick(target); OrgTreePanel.this.setSelectedItem(selected.getObject(), getOrgTreeStateStorage()); - selectTreeItemPerformed(selected.getObject(), target); + selectTreeItemPerformed(selected.getObject(), target.get()); } }; } @@ -249,7 +248,7 @@ protected void onClick(AjaxRequestTarget target) { protected Item> newRowItem(String id, int index, final IModel> model) { Item> item = super.newRowItem(id, index, model); - item.add(AttributeModifier.append("class", new AbstractReadOnlyModel() { + item.add(AttributeModifier.append("class", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -295,7 +294,7 @@ protected void onModelChanged() { treeContainer.add(tree); } - private static class TreeStateModel extends AbstractReadOnlyModel>> { + private static class TreeStateModel implements IModel>> { private static final long serialVersionUID = 1L; private TreeStateSet> set = new TreeStateSet<>(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java index 2be71f03bbf..feb61173fc4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java @@ -40,7 +40,6 @@ import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.RepeatingView; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -381,7 +380,7 @@ public void detach() { ListView additionalItemsList = new ListView( ID_ADDITIONAL_ITEM_LINE, - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { List rv = new ArrayList<>(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java index 8bd1ffd4a52..dbfa369101a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java @@ -42,7 +42,6 @@ import org.apache.wicket.extensions.markup.html.repeater.util.SortParam; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -287,7 +286,7 @@ private List, String>> initColumns( @Override public void populateItem(Item>> cellItem, String componentId, final IModel> rowModel) { - cellItem.add(new DateLabelComponent(componentId, new AbstractReadOnlyModel() { + cellItem.add(new DateLabelComponent(componentId, new IModel() { private static final long serialVersionUID = 1L; @Override @@ -347,7 +346,7 @@ public InlineMenuItemAction initAction() { private static final long serialVersionUID = 1L; @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { deleteAllPerformed(target, ReportDeleteDialogDto.Operation.DELETE_ALL); } }; @@ -363,7 +362,7 @@ public InlineMenuItemAction initAction() { private static final long serialVersionUID = 1L; @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { deleteSelectedPerformed(target, ReportDeleteDialogDto.Operation.DELETE_SELECTED, null); } }; @@ -374,7 +373,7 @@ public void onSubmit(AjaxRequestTarget target, Form form) { } private IModel createDeleteConfirmString() { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java index 2bab86c207f..31246101beb 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java @@ -164,12 +164,12 @@ private void initButtons(WebMarkupContainer buttonBar, IModel inputType createStringResource("PageNewReport.button.import")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { importReportFromFilePerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } }; @@ -180,12 +180,12 @@ protected void onError(AjaxRequestTarget target, Form form) { createStringResource("PageNewReport.button.import")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { importReportFromStreamPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java index cee97954054..05f23c3e2e2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java @@ -247,12 +247,12 @@ private void initButtons(Form mainForm) { AjaxSubmitButton save = new AjaxSubmitButton(ID_SAVE_BUTTON, createStringResource("PageBase.button.save")) { @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { onSavePerformed(target); } }; @@ -261,12 +261,12 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { AjaxSubmitButton cancel = new AjaxSubmitButton(ID_CANCEL_BUTTON, createStringResource("PageBase.button.cancel")) { @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { onCancelPerformed(target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java index cce7d115f7d..9fcc5ac3a2e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java @@ -42,7 +42,6 @@ import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -310,13 +309,13 @@ public boolean isVisible() { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { updateAuditSearchStorage(getModel().getObject()); searchUpdatePerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form){ + protected void onError(AjaxRequestTarget target){ target.add(getPageBase().getFeedbackPanel()); } }; @@ -328,13 +327,13 @@ protected void onError(AjaxRequestTarget target, Form form){ private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { resetAuditSearchStorage(); searchUpdatePerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form){ + protected void onError(AjaxRequestTarget target){ target.add(getPageBase().getFeedbackPanel()); } }; @@ -498,7 +497,7 @@ protected List> initColumns() { @Override protected IModel createLinkModel(final IModel rowModel){ - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java index 541fcdb8fd6..cf6f2024299 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java @@ -25,7 +25,6 @@ import org.apache.wicket.markup.html.form.ChoiceRenderer; import org.apache.wicket.markup.html.form.EnumChoiceRenderer; import org.apache.wicket.markup.html.form.IChoiceRenderer; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; @@ -102,7 +101,7 @@ private IModel> createVirtualizerListModel() { virtualizerList.add("JRSwapFileVirtualizer"); virtualizerList.add("JRGzipVirtualizer"); - return new AbstractReadOnlyModel>() { + return new IModel>() { @Override public List getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java index b9d4180bd3e..95c101b3966 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java @@ -174,13 +174,13 @@ public boolean accept(FeedbackMessage message) { private static final long serialVersionUID = 1L; @Override - protected void onError(AjaxRequestTarget target, Form form) { - FeedbackAlerts feedback = (FeedbackAlerts) form.get(ID_POPUP_FEEDBACK); + protected void onError(AjaxRequestTarget target) { + FeedbackAlerts feedback = (FeedbackAlerts) getForm().get(ID_POPUP_FEEDBACK); target.add(feedback); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { runConfirmPerformed(target, reportModel); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.java index 3d616c9a0b3..f555939f175 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.java @@ -29,7 +29,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -244,7 +243,7 @@ private Table getConnectorHostTable() { */ private IModel createDeleteConfirmString(final String oneDeleteKey, final String moreDeleteKey, final boolean resources) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java index 1ef37338f54..e16ba2d1cc4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java @@ -42,7 +42,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.TextArea; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; import org.jetbrains.annotations.NotNull; @@ -93,7 +92,7 @@ protected ResourceVisualizationDto load() { @Override protected IModel createPageTitleModel() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { return getString("PageResourceVisualization.title", resourceObject.getName()); @@ -164,12 +163,12 @@ public boolean isVisible() { AjaxSubmitButton back = new AjaxSubmitButton(ID_BACK) { @Override - public void onSubmit(AjaxRequestTarget ajaxRequestTarget, org.apache.wicket.markup.html.form.Form form) { + public void onSubmit(AjaxRequestTarget ajaxRequestTarget) { redirectBack(); } @Override - protected void onError(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java index e1604e683be..f49ceee480c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java @@ -38,7 +38,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -432,7 +431,7 @@ private Table getConnectorHostTable() { */ private IModel createDeleteConfirmString(final String oneDeleteKey, final String moreDeleteKey, final boolean resources) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceConnectorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceConnectorPanel.java index a8a8244ce1c..545bf7d54e1 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceConnectorPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceConnectorPanel.java @@ -21,7 +21,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; @@ -77,7 +76,7 @@ public ResourceConnectorPanel(String id, ShadowKindType kind, private void initLayout(final IModel> model, final PageBase parentPage) { setOutputMarkupId(true); - IModel> statsModel = new AbstractReadOnlyModel>() { + IModel> statsModel = new IModel>() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java index 30a53b152fd..6190d54b984 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java @@ -37,7 +37,6 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.RepeatingView; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -617,7 +616,7 @@ public void populateItem(Item>> cellIt @Override protected IModel createLinkModel(final IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -646,7 +645,7 @@ public void onClick(AjaxRequestTarget target, IModel> @Override protected IModel createLinkModel(final IModel> rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -805,7 +804,7 @@ public InlineMenuItemAction initAction() { private static final long serialVersionUID = 1L; @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { if (getRowModel() == null){ updateResourceObjectStatusPerformed(null, target, true); } else { @@ -826,7 +825,7 @@ public InlineMenuItemAction initAction() { private static final long serialVersionUID = 1L; @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { if (getRowModel() == null){ updateResourceObjectStatusPerformed(null, target, false); } else { @@ -847,7 +846,7 @@ public InlineMenuItemAction initAction() { private static final long serialVersionUID = 1L; @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { if (getRowModel() == null){ deleteResourceObjectPerformed(null, target); } else { @@ -870,7 +869,7 @@ public InlineMenuItemAction initAction() { private static final long serialVersionUID = 1L; @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { if (getRowModel() == null){ importResourceObject(null, target); } else { @@ -898,7 +897,7 @@ public InlineMenuItemAction initAction() { private static final long serialVersionUID = 1L; @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { if (getRowModel() == null){ changeOwner(null, target, null, Operation.REMOVE); } else { @@ -919,7 +918,7 @@ public InlineMenuItemAction initAction() { private static final long serialVersionUID = 1L; @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { final SelectableBean shadow = getRowModel().getObject(); ObjectBrowserPanel browser = new ObjectBrowserPanel( pageBase.getMainPopupBodyId(), UserType.class, @@ -1041,7 +1040,7 @@ private void deleteAccountConfirmedPerformed(AjaxRequestTarget target, Operation private IModel createDeleteConfirmString(final ShadowType selected, final String oneDeleteKey, final String moreDeleteKey) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java index a025c61a17e..92e2ef32ddd 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java @@ -31,7 +31,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; 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; @@ -174,7 +173,7 @@ public boolean isVisible() { }); add(intent); - Label realObjectClassLabel = new Label(ID_REAL_OBJECT_CLASS, new AbstractReadOnlyModel() { + Label realObjectClassLabel = new Label(ID_REAL_OBJECT_CLASS, new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionResultPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionResultPanel.java index 2f351647f64..78a29e66335 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionResultPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionResultPanel.java @@ -16,6 +16,7 @@ package com.evolveum.midpoint.web.page.admin.resources.component; import java.util.List; +import java.util.Optional; import com.evolveum.midpoint.gui.api.page.PageBase; import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour; @@ -71,15 +72,17 @@ public boolean isVisible() { AjaxLazyLoadPanel resultsPanel = new AjaxLazyLoadPanel(ID_RESULT) { @Override public Component getLazyLoadComponent(String id) { - return new TestConnectionMessagesPanel(id, resourceOid, (PageBase) parentPage); + return new TestConnectionMessagesPanel(id, resourceOid, (PageBase) parentPage); } @Override - protected void onComponentLoaded(Component component, AjaxRequestTarget target){ - isLoaded = true; - target.add(component); + protected void onContentLoaded(Component content, Optional optionalTarget) { + isLoaded = true; + AjaxRequestTarget target = (AjaxRequestTarget) optionalTarget.get(); + target.add(content); target.add(messageLabel); } + }; contentPanel.add(resultsPanel); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java index 8465c85d0ff..e68f3ba2440 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java @@ -185,12 +185,12 @@ private void initButtons(Form mainForm) { AjaxSubmitButton save = new AjaxSubmitButton(ID_SAVE, createStringResource("pageAccount.button.save")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java index 2f5903bb2a6..3dec15b00e2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java @@ -48,7 +48,6 @@ import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.IChoiceRenderer; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyPanel.java index d4f24b2e98e..37e10201d80 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyPanel.java @@ -150,7 +150,7 @@ private void initButtons(Form mainForm) { createStringResource("PageBase.button.cancel")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { cancelPerformed(target); } }; @@ -160,7 +160,7 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { createStringResource("PageBase.button.save")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java index cb32a8d80d8..d9728684761 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java @@ -40,7 +40,6 @@ import org.apache.wicket.markup.html.form.EnumChoiceRenderer; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -225,7 +224,7 @@ private void initLayout() { final DropDownChoice resource = new DropDownChoice<>(ID_RESOURCE, new PropertyModel<>(model, TaskAddDto.F_RESOURCE), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -256,7 +255,7 @@ protected void onUpdate(AjaxRequestTarget target) { final DropDownChoice focusType = new DropDownChoice<>(ID_FOCUS_TYPE, new PropertyModel<>(model, TaskAddDto.F_FOCUS_TYPE), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -337,7 +336,7 @@ public boolean isEnabled() { mainForm.add(objectClass); DropDownChoice type = new DropDownChoice<>(ID_CATEGORY, new PropertyModel<>(model, TaskAddDto.F_CATEGORY), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -571,12 +570,12 @@ private void initButtons(final Form mainForm) { createStringResource("PageBase.button.save")) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java index 3fbc60ab20f..d3c1442373a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java @@ -52,7 +52,6 @@ import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; 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.request.mapper.parameter.PageParameters; @@ -209,7 +208,7 @@ protected void initLayout() { refreshModel = new Model<>(new AutoRefreshDto()); refreshModel.getObject().setInterval(getRefreshInterval()); - IModel> prismObjectModel = new AbstractReadOnlyModel>() { + IModel> prismObjectModel = new IModel>() { @Override public PrismObject getObject() { return objectWrapperModel.getObject().getObject(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java index c8c64702964..e45b444529f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java @@ -85,7 +85,6 @@ import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; @@ -382,7 +381,7 @@ protected String translate(Enum en) { @Override public void populateItem(Item> item, String componentId, final IModel rowModel) { - item.add(new Label(componentId, new AbstractReadOnlyModel() { + item.add(new Label(componentId, new IModel() { @Override public Object getObject() { @@ -583,7 +582,7 @@ public void populateItem(Item> item, String componentId, @Override public void populateItem(Item> item, String componentId, final IModel rowModel) { - item.add(new Label(componentId, new AbstractReadOnlyModel() { + item.add(new Label(componentId, new IModel() { @Override public Object getObject() { @@ -607,7 +606,7 @@ public IModel getDataModel(IModel rowModel) { public void populateItem(final Item> item, final String componentId, final IModel rowModel) { - DateLabelComponent dateLabel = new DateLabelComponent(componentId, new AbstractReadOnlyModel() { + DateLabelComponent dateLabel = new DateLabelComponent(componentId, new IModel() { @Override public Date getObject() { @@ -646,7 +645,7 @@ public IModel getDataModel(IModel rowModel) { @Override public void populateItem(Item> item, String componentId, final IModel rowModel) { - item.add(new Label(componentId, new AbstractReadOnlyModel() { + item.add(new Label(componentId, new IModel() { @Override public Object getObject() { @@ -666,7 +665,7 @@ public IModel getDataModel(IModel rowModel) { @Override protected IModel createTitleModel(final IModel rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -683,7 +682,7 @@ public String getObject() { @Override protected IModel createIconModel(final IModel rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { @@ -711,7 +710,7 @@ public static AbstractExportableColumn createProgressColumn(Pag @Override public void populateItem(Item> cellItem, String componentId, final IModel rowModel) { - cellItem.add(new Label(componentId, new AbstractReadOnlyModel() { + cellItem.add(new Label(componentId, new IModel() { @Override public Object getObject() { rowModel.getObject().ensureSubtasksLoaded(pageBase); @@ -1818,7 +1817,7 @@ private void initLayout() { DropDownChoice categorySelect = new DropDownChoice(ID_CATEGORY, new PropertyModel(searchModel, TasksSearchDto.F_CATEGORY), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { @@ -1853,13 +1852,13 @@ public String getDisplayValue(String object) { AjaxSubmitButton clearButton = new AjaxSubmitButton(ID_SEARCH_CLEAR) { @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { PageTasks page = (PageTasks) getPage(); page.clearSearchPerformed(target); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { PageTasks page = (PageTasks) getPage(); target.add(page.getFeedbackPanel()); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java index 47b732f8c7e..deac3d649e9 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java @@ -43,7 +43,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.request.mapper.parameter.PageParameters; @@ -184,7 +183,7 @@ protected void populateItem(ListItem item) { // Execution WebMarkupContainer executionContainer = new WebMarkupContainer(ID_EXECUTION_CONTAINER); - Label execution = new Label(ID_EXECUTION, new AbstractReadOnlyModel() { + Label execution = new Label(ID_EXECUTION, new IModel() { @Override public String getObject() { @@ -193,7 +192,7 @@ public String getObject() { return getString(TaskDtoExecutionStatus.class.getSimpleName() + "." + executionStatus.name()); } else { return getString(TaskDtoExecutionStatus.class.getSimpleName() + "." + executionStatus.name() + ".withTimestamp", - new AbstractReadOnlyModel() { + new IModel() { @Override public String getObject() { if (taskDtoModel.getObject().getCompletionTimestamp() != null) { @@ -207,7 +206,7 @@ public String getObject() { } }); executionContainer.add(execution); - Label node = new Label(ID_NODE, new AbstractReadOnlyModel() { + Label node = new Label(ID_NODE, new IModel() { @Override public String getObject() { TaskDto dto = taskDtoModel.getObject(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskChangesPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskChangesPanel.java index 0f4f1f03693..06e08294734 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskChangesPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskChangesPanel.java @@ -37,7 +37,7 @@ public TaskChangesPanel(String id, IModel model) { } protected void initLayout() { -// add(new Label(ID_TITLE, new AbstractReadOnlyModel() { +// add(new Label(ID_TITLE, new IModel() { // @Override // public String getObject() { // return getString(getModelObject().getTitleKey()); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java index 6b6516530c3..8acfc031cc4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java @@ -268,12 +268,12 @@ public boolean isVisible() { AjaxSubmitButton saveButton = new AjaxSubmitButton(ID_SAVE, parentPage.createStringResource("pageTaskEdit.button.save")) { @Override - protected void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form form) { + protected void onSubmit(AjaxRequestTarget target) { parentPage.getController().savePerformed(target); } @Override - protected void onError(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form form) { + protected void onError(AjaxRequestTarget target) { target.add(parentPage.getFeedbackPanel()); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.java index 1357004c638..4c914cb376e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.java @@ -40,7 +40,6 @@ import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -49,6 +48,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Optional; /** * @author semancik @@ -79,7 +79,9 @@ private void initLayout(final IModel taskDtoModel, final PageBase pageB add(resultTablePanel); add(new AjaxFallbackLink(ID_SHOW_RESULT) { - public void onClick(AjaxRequestTarget target) { + @Override + public void onClick(Optional optionalTarget) { + AjaxRequestTarget target = (AjaxRequestTarget) optionalTarget.get(); OperationResult opResult = taskDtoModel.getObject().getTaskOperationResult(); OperationResultPanel body = new OperationResultPanel( pageBase.getMainPopupBodyId(), @@ -100,7 +102,7 @@ private List> initResultColumns() { @Override public void populateItem(Item> cellItem, String componentId, IModel rowModel) { - Label label = new Label(componentId, new AbstractReadOnlyModel() { + Label label = new Label(componentId, new IModel() { @Override public String getObject() { return WebComponentUtil.nl2br(rowModel.getObject().getMessage()); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java index 7e4a05b83da..76eb16dab1e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java @@ -48,7 +48,6 @@ import org.apache.wicket.markup.html.form.EnumChoiceRenderer; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.form.validation.IFormValidator; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -128,7 +127,7 @@ private void initLayoutForInfoPanel() { // last start WebMarkupContainer lastStartedContainer = new WebMarkupContainer(ID_LAST_STARTED_CONTAINER); - Label lastStart = new Label(ID_LAST_STARTED, new AbstractReadOnlyModel() { + Label lastStart = new Label(ID_LAST_STARTED, new IModel() { @Override public String getObject() { TaskDto dto = taskDtoModel.getObject(); @@ -141,7 +140,7 @@ public String getObject() { }); lastStartedContainer.add(lastStart); - Label lastStartAgo = new Label(ID_LAST_STARTED_AGO, new AbstractReadOnlyModel() { + Label lastStartAgo = new Label(ID_LAST_STARTED_AGO, new IModel() { @Override public String getObject() { TaskDto dto = taskDtoModel.getObject(); @@ -159,7 +158,7 @@ public String getObject() { // last finish WebMarkupContainer lastFinishedContainer = new WebMarkupContainer(ID_LAST_FINISHED_CONTAINER); - Label lastFinished = new Label(ID_LAST_FINISHED, new AbstractReadOnlyModel() { + Label lastFinished = new Label(ID_LAST_FINISHED, new IModel() { @Override public String getObject() { TaskDto dto = taskDtoModel.getObject(); @@ -172,7 +171,7 @@ public String getObject() { }); lastFinishedContainer.add(lastFinished); - Label lastFinishedAgo = new Label(ID_LAST_FINISHED_AGO, new AbstractReadOnlyModel() { + Label lastFinishedAgo = new Label(ID_LAST_FINISHED_AGO, new IModel() { @Override public String getObject() { TaskDto dto = taskDtoModel.getObject(); @@ -202,7 +201,7 @@ public String getObject() { add(lastFinishedContainer); WebMarkupContainer nextRunContainer = new WebMarkupContainer(ID_NEXT_RUN_CONTAINER); - Label nextRun = new Label(ID_NEXT_RUN, new AbstractReadOnlyModel() { + Label nextRun = new Label(ID_NEXT_RUN, new IModel() { @Override public String getObject() { TaskDto dto = taskDtoModel.getObject(); @@ -217,7 +216,7 @@ public String getObject() { }); nextRunContainer.add(nextRun); - Label nextRunIn = new Label(ID_NEXT_RUN_IN, new AbstractReadOnlyModel() { + Label nextRunIn = new Label(ID_NEXT_RUN_IN, new IModel() { @Override public String getObject() { TaskDto dto = taskDtoModel.getObject(); @@ -239,7 +238,7 @@ public String getObject() { add(nextRunContainer); WebMarkupContainer nextRetryContainer = new WebMarkupContainer(ID_NEXT_RETRY_CONTAINER); - Label nextRetry = new Label(ID_NEXT_RETRY, new AbstractReadOnlyModel() { + Label nextRetry = new Label(ID_NEXT_RETRY, new IModel() { @Override public String getObject() { TaskDto dto = taskDtoModel.getObject(); @@ -252,7 +251,7 @@ public String getObject() { }); nextRetryContainer.add(nextRetry); - Label nextRetryIn = new Label(ID_NEXT_RETRY_IN, new AbstractReadOnlyModel() { + Label nextRetryIn = new Label(ID_NEXT_RETRY_IN, new IModel() { @Override public String getObject() { TaskDto dto = taskDtoModel.getObject(); @@ -488,7 +487,7 @@ public void setObject(ThreadStopActionType object) { schedulingTable.add(taskGroupLimitContainer); WebMarkupContainer allowedNodesContainer = new WebMarkupContainer(ID_ALLOWED_NODES_CONTAINER); - allowedNodesContainer.add(new Label(ID_ALLOWED_NODES, new AbstractReadOnlyModel() { + allowedNodesContainer.add(new Label(ID_ALLOWED_NODES, new IModel() { @Override public String getObject() { return taskDtoModel.getObject().getAllowedNodes(parentPage.getNodeListModel().getObject()); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSubtasksAndThreadsTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSubtasksAndThreadsTabPanel.java index b8268a3130b..1c5ab78cfc1 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSubtasksAndThreadsTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSubtasksAndThreadsTabPanel.java @@ -36,7 +36,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.TextField; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.model.ResourceModel; @@ -128,7 +127,7 @@ public boolean isVisible() { columns.add(new EnumPropertyColumn<>(createStringResourceStatic(this, "TaskStatePanel.subtaskState"), WorkerThreadDto.F_EXECUTION_STATUS)); columns.add(new PropertyColumn(createStringResourceStatic(this, "TaskStatePanel.subtaskObjectsProcessed"), WorkerThreadDto.F_PROGRESS)); ISortableDataProvider threadsProvider = new ListDataProvider<>(this, - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { List rv = new ArrayList<>(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java index df57676f2bc..818051f51c6 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java @@ -37,7 +37,6 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.*; import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.wicket.datetime.PatternDateConverter; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import java.util.Date; @@ -196,7 +195,7 @@ protected IModel getDisplayNameModel() { @Override protected IModel getTitleModel() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { TaskDto taskDto = parentPage.getTaskDto(); @@ -228,7 +227,7 @@ public String getObject() { @Override protected IModel getTitle2Model() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { if (parentPage.getTaskDto().isWorkflow()) { @@ -249,7 +248,7 @@ public String getObject() { @Override protected IModel getTitle3Model() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { if (parentPage.getTaskDto().isWorkflow()) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.java index b1a8583c416..166be32a9ca 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.java @@ -49,6 +49,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Optional; /** * @author mederly @@ -144,7 +145,8 @@ public boolean isVisible() { IModel showNextStagesModel = new PropertyModel<>(taskDtoModel, TaskDto.F_IN_STAGE_BEFORE_LAST_ONE); add(new SwitchableApprovalProcessPreviewsPanel(ID_PREVIEWS_PANEL, taskOidModel, showNextStagesModel, parentPage)); add(new AjaxFallbackLink(ID_SHOW_PARENT) { - public void onClick(AjaxRequestTarget target) { + public void onClick(Optional optionalTarget) { + AjaxRequestTarget target = (AjaxRequestTarget) optionalTarget.get(); String oid = taskDtoModel.getObject().getParentTaskOid(); if (oid != null) { PageParameters parameters = new PageParameters(); @@ -152,6 +154,7 @@ public void onClick(AjaxRequestTarget target) { ((PageBase) getPage()).navigateToNext(PageTaskEdit.class, parameters); } } + }); add(WebComponentUtil.createHelp(ID_SHOW_PARENT_HELP)); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfParentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfParentPanel.java index 871c9c7f34e..3e23d7685c0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfParentPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfParentPanel.java @@ -29,7 +29,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider; import org.apache.wicket.markup.html.WebMarkupContainer; 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; @@ -78,7 +77,7 @@ private void initLayout(final IModel taskDtoModel) { final String changesId = ID_CHANGES_PREFIX + i; final String changesContentId = changesId + ID_CHANGES_CONTENT_SUFFIX; final WebMarkupContainer changes = new WebMarkupContainer(changesId); - final IModel changesModel = new AbstractReadOnlyModel() { + final IModel changesModel = new IModel() { @Override public TaskChangesDto getObject() { return taskDtoModel.getObject().getChangesForIndex(index); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/ActionsExecutedInformationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/ActionsExecutedInformationPanel.java index 9215515d813..d1a123e3cf9 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/ActionsExecutedInformationPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/ActionsExecutedInformationPanel.java @@ -29,7 +29,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 org.apache.wicket.model.PropertyModel; @@ -37,6 +36,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Optional; /** * @author mederly @@ -68,7 +68,7 @@ protected void initLayout() { WebMarkupContainer tableLinesContainer = new WebMarkupContainer(ID_OBJECTS_TABLE_LINES_CONTAINER); ListView tableLines = new ListView(ID_OBJECTS_TABLE_LINES, - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { final ActionsExecutedInformationDto modelObject = getModelObject(); @@ -84,7 +84,7 @@ public List getObject() { } ) { protected void populateItem(final ListItem item) { - item.add(new Label(ID_OBJECT_TYPE, new AbstractReadOnlyModel() { + item.add(new Label(ID_OBJECT_TYPE, new IModel() { @Override public String getObject() { String key = item.getModelObject().getObjectTypeLocalizationKey(); @@ -95,13 +95,13 @@ public String getObject() { } } })); - item.add(new Label(ID_OPERATION, new AbstractReadOnlyModel() { + item.add(new Label(ID_OPERATION, new IModel() { @Override public String getObject() { return createStringResource(item.getModelObject().getOperation()).getString(); } })); - item.add(new Label(ID_CHANNEL, new AbstractReadOnlyModel() { + item.add(new Label(ID_CHANNEL, new IModel() { @Override public String getObject() { String channel = item.getModelObject().getChannel(); @@ -124,7 +124,7 @@ public String getObject() { tableLinesContainer.setOutputMarkupId(true); add(tableLinesContainer); - final Label showResultingActionsOnlyLabel = new Label(ID_SHOW_RESULTING_ACTIONS_ONLY_LABEL, new AbstractReadOnlyModel() { + final Label showResultingActionsOnlyLabel = new Label(ID_SHOW_RESULTING_ACTIONS_ONLY_LABEL, new IModel() { @Override public String getObject() { return showResultingActionsOnly ? @@ -136,9 +136,9 @@ public String getObject() { add(showResultingActionsOnlyLabel); add(new AjaxFallbackLink(ID_SHOW_RESULTING_ACTIONS_ONLY_LINK) { @Override - public void onClick(AjaxRequestTarget ajaxRequestTarget) { + public void onClick(Optional ajaxRequestTarget) { showResultingActionsOnly = !showResultingActionsOnly; - ajaxRequestTarget.add(ActionsExecutedInformationPanel.this); + ajaxRequestTarget.get().add(ActionsExecutedInformationPanel.this); } }); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/IterativeInformationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/IterativeInformationPanel.java index 9de1ab784f3..24393eab519 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/IterativeInformationPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/IterativeInformationPanel.java @@ -30,7 +30,6 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.IterativeTaskInformationType; import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import javax.xml.datatype.XMLGregorianCalendar; @@ -75,7 +74,7 @@ public IterativeInformationPanel(String id, IModel model, f protected void initLayout(PageBase pageBase) { - Label executionTime = new Label(ID_EXECUTION_TIME, new AbstractReadOnlyModel() { + Label executionTime = new Label(ID_EXECUTION_TIME, new IModel() { @Override public String getObject() { TaskDto dto = getModel().getObject().getTaskDto(); @@ -99,7 +98,7 @@ public String getObject() { }); add(executionTime); - Label processedSuccess = new Label(ID_OBJECTS_PROCESSED_SUCCESS, new AbstractReadOnlyModel() { + Label processedSuccess = new Label(ID_OBJECTS_PROCESSED_SUCCESS, new IModel() { @Override public String getObject() { TaskCurrentStateDto dto = getModelObject(); @@ -119,7 +118,7 @@ public String getObject() { }); add(processedSuccess); - Label processedSuccessTime = new Label(ID_OBJECTS_PROCESSED_SUCCESS_TIME, new AbstractReadOnlyModel() { + Label processedSuccessTime = new Label(ID_OBJECTS_PROCESSED_SUCCESS_TIME, new IModel() { @Override public String getObject() { TaskCurrentStateDto dto = getModelObject(); @@ -141,7 +140,7 @@ public String getObject() { }); add(processedSuccessTime); - Label lastProcessedSuccess = new Label(ID_LAST_OBJECT_PROCESSED_SUCCESS, new AbstractReadOnlyModel() { + Label lastProcessedSuccess = new Label(ID_LAST_OBJECT_PROCESSED_SUCCESS, new IModel() { @Override public String getObject() { TaskCurrentStateDto dto = getModelObject(); @@ -162,7 +161,7 @@ public String getObject() { }); add(lastProcessedSuccess); - Label lastProcessedSuccessTime = new Label(ID_LAST_OBJECT_PROCESSED_SUCCESS_TIME, new AbstractReadOnlyModel() { + Label lastProcessedSuccessTime = new Label(ID_LAST_OBJECT_PROCESSED_SUCCESS_TIME, new IModel() { @Override public String getObject() { TaskCurrentStateDto dto = getModelObject(); @@ -192,7 +191,7 @@ public String getObject() { }); add(lastProcessedSuccessTime); - Label processedFailure = new Label(ID_OBJECTS_PROCESSED_FAILURE, new AbstractReadOnlyModel() { + Label processedFailure = new Label(ID_OBJECTS_PROCESSED_FAILURE, new IModel() { @Override public String getObject() { TaskCurrentStateDto dto = getModelObject(); @@ -213,7 +212,7 @@ public String getObject() { }); add(processedFailure); - Label processedFailureTime = new Label(ID_OBJECTS_PROCESSED_FAILURE_TIME, new AbstractReadOnlyModel() { + Label processedFailureTime = new Label(ID_OBJECTS_PROCESSED_FAILURE_TIME, new IModel() { @Override public String getObject() { TaskCurrentStateDto dto = getModelObject(); @@ -235,7 +234,7 @@ public String getObject() { }); add(processedFailureTime); - Label lastProcessedFailure = new Label(ID_LAST_OBJECT_PROCESSED_FAILURE, new AbstractReadOnlyModel() { + Label lastProcessedFailure = new Label(ID_LAST_OBJECT_PROCESSED_FAILURE, new IModel() { @Override public String getObject() { TaskCurrentStateDto dto = getModelObject(); @@ -256,7 +255,7 @@ public String getObject() { }); add(lastProcessedFailure); - Label lastProcessedFailureTime = new Label(ID_LAST_OBJECT_PROCESSED_FAILURE_TIME, new AbstractReadOnlyModel() { + Label lastProcessedFailureTime = new Label(ID_LAST_OBJECT_PROCESSED_FAILURE_TIME, new IModel() { @Override public String getObject() { TaskCurrentStateDto dto = getModelObject(); @@ -286,7 +285,7 @@ public String getObject() { }); add(lastProcessedFailureTime); - Label lastError = new Label(ID_LAST_ERROR, new AbstractReadOnlyModel() { + Label lastError = new Label(ID_LAST_ERROR, new IModel() { @Override public String getObject() { TaskCurrentStateDto dto = getModelObject(); @@ -302,7 +301,7 @@ public String getObject() { }); add(lastError); - Label currentObjectProcessed = new Label(ID_CURRENT_OBJECT_PROCESSED, new AbstractReadOnlyModel() { + Label currentObjectProcessed = new Label(ID_CURRENT_OBJECT_PROCESSED, new IModel() { @Override public String getObject() { TaskCurrentStateDto dto = getModelObject(); @@ -318,7 +317,7 @@ public String getObject() { }); add(currentObjectProcessed); - Label currentObjectProcessedTime = new Label(ID_CURRENT_OBJECT_PROCESSED_TIME, new AbstractReadOnlyModel() { + Label currentObjectProcessedTime = new Label(ID_CURRENT_OBJECT_PROCESSED_TIME, new IModel() { @Override public String getObject() { TaskCurrentStateDto dto = getModelObject(); @@ -341,7 +340,7 @@ public String getObject() { }); add(currentObjectProcessedTime); - Label objectsTotal = new Label(ID_OBJECTS_TOTAL, new AbstractReadOnlyModel() { + Label objectsTotal = new Label(ID_OBJECTS_TOTAL, new IModel() { @Override public String getObject() { TaskCurrentStateDto dto = getModelObject(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskCurrentStateDtoModel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskCurrentStateDtoModel.java index db685cb6fb3..1a6ecf414dd 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskCurrentStateDtoModel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskCurrentStateDtoModel.java @@ -33,7 +33,6 @@ import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import java.util.Collection; @@ -41,7 +40,7 @@ /** * @author Pavol Mederly */ -public class TaskCurrentStateDtoModel extends AbstractReadOnlyModel { +public class TaskCurrentStateDtoModel implements IModel { private static final Trace LOGGER = TraceManager.getTrace(TaskCurrentStateDtoModel.class); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/QueryBasedHandlerPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/QueryBasedHandlerPanel.java index 6e3d6580b53..2b45e796908 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/QueryBasedHandlerPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/QueryBasedHandlerPanel.java @@ -20,7 +20,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.TextArea; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; @@ -43,7 +42,7 @@ public QueryBasedHandlerPanel(String id, IModel model) { private void initLayout() { WebMarkupContainer objectTypeContainer = new WebMarkupContainer(ID_OBJECT_TYPE_CONTAINER); - Label objectType = new Label(ID_OBJECT_TYPE, new AbstractReadOnlyModel() { + Label objectType = new Label(ID_OBJECT_TYPE, new IModel() { @Override public String getObject() { final String key = getModelObject().getObjectTypeKey(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/ResourceRelatedHandlerPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/ResourceRelatedHandlerPanel.java index b47da91c801..bf6eb9f26d8 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/ResourceRelatedHandlerPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/ResourceRelatedHandlerPanel.java @@ -45,7 +45,6 @@ import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.EnumChoiceRenderer; import org.apache.wicket.markup.html.form.TextField; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.util.string.Strings; @@ -127,7 +126,7 @@ public boolean isVisible() { final DropDownChoice resourceRef = new DropDownChoice<>(ID_RESOURCE_REF, new PropertyModel<>(getModel(), ResourceRelatedHandlerDto.F_RESOURCE_REFERENCE), - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { return createResourceList(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.java index 5fa8151e9a7..7a20c6a0892 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.java @@ -46,7 +46,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.StringResourceModel; @@ -147,7 +146,7 @@ protected IModel createIconModel(IModel rowModel) { columns.add(new AbstractColumn(createStringResource("Type")) { @Override public void populateItem(Item> cellItem, String componentId, final IModel rowModel) { - cellItem.add(new Label(componentId, new AbstractReadOnlyModel() { + cellItem.add(new Label(componentId, new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/SelectableFolderContent.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/SelectableFolderContent.java index 790a94c441f..b74dee18081 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/SelectableFolderContent.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/SelectableFolderContent.java @@ -16,10 +16,11 @@ package com.evolveum.midpoint.web.page.admin.users.component; +import java.util.Optional; + import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.extensions.markup.html.repeater.tree.AbstractTree; import org.apache.wicket.extensions.markup.html.repeater.tree.content.Folder; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import com.evolveum.midpoint.gui.api.util.WebComponentUtil; @@ -45,7 +46,7 @@ public SelectableFolderContent(String id, AbstractTree> @Override protected IModel newLabelModel(final IModel> model) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -58,14 +59,14 @@ public String getObject() { } @Override - protected void onClick(AjaxRequestTarget target) { + protected void onClick(Optional optionalTarget) { if (selected.getObject() != null) { - tree.updateNode(selected.getObject(), target); + tree.updateNode(selected.getObject(), optionalTarget.get()); } SelectableBean dto = getModelObject(); selected.setObject(dto); - tree.updateNode(dto, target); + tree.updateNode(dto, optionalTarget.get()); } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java index b09a25aea8c..23a0121666d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java @@ -63,7 +63,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.repeater.RepeatingView; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -625,7 +624,7 @@ private void recomputePerformed(SelectableBean orgToRecompute, AjaxRequ private void deleteNodePerformed(final SelectableBean orgToDelete, AjaxRequestTarget target) { ConfirmationPanel confirmationPanel = new ConfirmationPanel(getPageBase().getMainPopupBodyId(), - new AbstractReadOnlyModel() { + new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicy.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicy.java index 01a6e4de169..5f4b0ac4f6b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicy.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicy.java @@ -219,7 +219,7 @@ public void onClick(AjaxRequestTarget target) { AjaxSubmitButton saveButton = new AjaxSubmitButton(ID_SAVE_BUTTON,createStringResource("PageValuePolicy.button.save")) { @Override - protected void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationPanel.java index 74e20f10832..3e22080f489 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationPanel.java @@ -26,7 +26,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 org.apache.wicket.model.PropertyModel; @@ -47,7 +46,7 @@ public InformationPanel(String id, IModel model) { } private void initLayout() { - Label titleLabel = new Label(ID_TITLE, new LocalizableMessageModel(new AbstractReadOnlyModel() { + Label titleLabel = new Label(ID_TITLE, new LocalizableMessageModel(new IModel() { @Override public LocalizableMessageType getObject() { InformationType info = getModelObject(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancesPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancesPanel.java index f821492b6a2..9770849a0ea 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancesPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancesPanel.java @@ -27,7 +27,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -76,7 +75,7 @@ ID_REQUESTS_TABLE, provider, initColumns(view), tableId, pageSize) { protected Item customizeNewRowItem(Item item, final IModel rowModel) { - item.add(new AttributeAppender("class", new AbstractReadOnlyModel() { + item.add(new AttributeAppender("class", new IModel() { @Override public String getObject() { @@ -187,7 +186,7 @@ private IconColumn createOutcomeColumn() { return new IconColumn(createStringResource("pageProcessInstances.item.result")) { @Override protected IModel createIconModel(final IModel rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { return choose(rowModel, null, ApprovalOutcomeIcon.IN_PROGRESS.getIcon(), ApprovalOutcomeIcon.APPROVED.getIcon(), ApprovalOutcomeIcon.REJECTED.getIcon()); @@ -197,7 +196,7 @@ public String getObject() { @Override protected IModel createTitleModel(final IModel rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { return choose(rowModel, diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java index bdc3fe399b7..3fb1ce8672e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java @@ -43,6 +43,7 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; +import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxFallbackLink; import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider; @@ -50,12 +51,12 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextArea; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.request.mapper.parameter.PageParameters; import java.util.List; +import java.util.Optional; /** * @author mederly @@ -199,7 +200,7 @@ public boolean isVisible() { //primaryInfoColumn.add(new ScenePanel(ID_DELTAS_TO_BE_APPROVED, new PropertyModel(getModel(), WorkItemDto.F_DELTAS))); primaryInfoColumn.add(new TaskChangesPanel(ID_DELTAS_TO_BE_APPROVED, new PropertyModel<>(getModel(), WorkItemDto.F_CHANGES))); - primaryInfoColumn.add(new AttributeModifier("class", new AbstractReadOnlyModel() { + primaryInfoColumn.add(new AttributeModifier("class", new IModel() { @Override public String getObject() { return additionalInfoColumnVisible.isVisible() ? "col-md-5" : "col-md-12"; @@ -208,7 +209,7 @@ public String getObject() { add(primaryInfoColumn); add(new AjaxFallbackLink(ID_SHOW_REQUEST) { - public void onClick(AjaxRequestTarget target) { + public void onClick(Optional target) { String oid = WorkItemPanel.this.getModelObject().getTaskOid(); if (oid != null) { PageParameters parameters = new PageParameters(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemSummaryPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemSummaryPanel.java index dac5187dd19..5d8812e6a0e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemSummaryPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemSummaryPanel.java @@ -27,7 +27,6 @@ import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemDto; import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; import com.evolveum.midpoint.xml.ns._public.common.common_3.WorkItemType; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; @@ -101,7 +100,7 @@ protected String getTagBoxCssClass() { @Override protected IModel getTitleModel() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { UserType requester = dtoModel.getObject().getRequester(); @@ -123,7 +122,7 @@ public String getObject() { @Override protected IModel getTitle2Model() { - return new AbstractReadOnlyModel() { + return new IModel() { @Override public String getObject() { WorkItemType workItem = getModelObject(); @@ -135,7 +134,7 @@ public String getObject() { // @Override // protected IModel getTitle3Model() { -// return new AbstractReadOnlyModel() { +// return new IModel() { // @Override // public String getObject() { // WorkItemType workItem = getModelObject(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java index ad6cf51e217..fa11ddf239c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java @@ -30,7 +30,6 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem; 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.request.http.WebResponse; import org.springframework.http.HttpStatus; @@ -104,7 +103,7 @@ public PageError(Integer code, Exception ex) { exMessage = ex.getMessage(); } - final IModel message = new AbstractReadOnlyModel() { + final IModel message = new IModel() { @Override public String getObject() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java index 65358f77881..c73d9af1604 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java @@ -219,12 +219,12 @@ private void initButtons(Form form) { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { processResetPassword(target, form); } @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java index ae37c40d1f0..ac6001e23a4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java @@ -226,7 +226,7 @@ public void initButtons(Form mainForm) { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { savePerformed(target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageAbstractFlow.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageAbstractFlow.java index 25ce213defe..023f8a6b1eb 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageAbstractFlow.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageAbstractFlow.java @@ -127,13 +127,11 @@ private void initCaptchaAndButtons(WebMarkupContainer content) { private static final long serialVersionUID = 1L; @Override - protected void onError(AjaxRequestTarget target, - org.apache.wicket.markup.html.form.Form form) { + protected void onError(AjaxRequestTarget target) { showErrors(target); } - protected void onSubmit(AjaxRequestTarget target, - org.apache.wicket.markup.html.form.Form form) { + protected void onSubmit(AjaxRequestTarget target) { doRegistration(target); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java index 65c2998ff6e..c6774a208e2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java @@ -233,12 +233,12 @@ private void initButtons(Form mainForm) { private static final long serialVersionUID = 1L; @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { onSavePerformed(target); } }; @@ -250,12 +250,12 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { private static final long serialVersionUID = 1L; @Override - protected void onError(AjaxRequestTarget target, Form form) { + protected void onError(AjaxRequestTarget target) { onCancelPerformed(target); } @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { onCancelPerformed(target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java index 9377064a57c..2c6c59fbd5a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java @@ -175,14 +175,12 @@ public boolean isEnabled() { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, - Form form) { - propagatePassword(target, form); + protected void onSubmit(AjaxRequestTarget target) { + propagatePassword(target, getForm()); } @Override - protected void onError(AjaxRequestTarget target, - Form form) { + protected void onError(AjaxRequestTarget target) { getSession().error(getString("PageAccountActivation.account.activation.failed")); target.add(getFeedbackPanel()); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.java index 73bf77d6989..b1c19fbc559 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.java @@ -58,7 +58,7 @@ private void initLayout() { AjaxSubmitButton back = new AjaxSubmitButton(ID_BACK, createStringResource("PageAssignmentConflicts.back")) { @Override - public void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form form) { + public void onSubmit(AjaxRequestTarget target) { redirectBack(); } @@ -68,7 +68,7 @@ public void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.for AjaxSubmitButton submit = new AjaxSubmitButton(ID_SUBMIT, createStringResource("PageAssignmentConflicts.submit")) { @Override - public void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form form) { + public void onSubmit(AjaxRequestTarget target) { processConflictDecisions(); redirectBack(); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java index 9d72095bf11..059ec05a708 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java @@ -38,7 +38,6 @@ import org.apache.wicket.extensions.markup.html.tabs.ITab; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import javax.xml.namespace.QName; @@ -324,7 +323,7 @@ public boolean isVisible(){ private void initTargetUserSelectionPanel(WebMarkupContainer parametersPanel){ UserSelectionButton targetUserPanel = new UserSelectionButton(ID_TARGET_USER_PANEL, - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { return getRoleCatalogStorage().getTargetUserList(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java index 2190c1dd913..a77967a49b2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java @@ -50,7 +50,6 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.markup.html.form.TextArea; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.jetbrains.annotations.NotNull; @@ -144,7 +143,7 @@ public IModel getLabel() { mainForm.add(panel); UserSelectionButton targetUserPanel = new UserSelectionButton(ID_TARGET_USER_PANEL, - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { return getSessionStorage().getRoleCatalog().getTargetUserList(); @@ -232,12 +231,12 @@ public boolean isEnabled(){ createStringResource("PageAssignmentsList.resolveConflicts")) { @Override - protected void onError(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form form) { + protected void onError(AjaxRequestTarget target) { target.add(getFeedbackPanel()); } @Override - protected void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form form) { + protected void onSubmit(AjaxRequestTarget target) { PageAssignmentsList.this.navigateToNext(PageAssignmentConflicts.class); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.java index 600fe36e733..7ea9f0b34fa 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.java @@ -35,7 +35,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer; 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 org.apache.wicket.model.Model; @@ -81,7 +80,7 @@ protected void initLeftSidePanel(){ private void initSourceUserSelectionPanel(WebMarkupContainer sourceUserPanel){ UserSelectionButton sourceUserButton = new UserSelectionButton(ID_SOURCE_USER_BUTTON, - new AbstractReadOnlyModel>() { + new IModel>() { @Override public List getObject() { List usersList = new ArrayList<>(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.java index d61cdfe4843..22cf21e09e7 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.java @@ -10,7 +10,6 @@ import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; /** @@ -41,7 +40,7 @@ private void initLayout() { add(container); Label statusIconLabel = new Label(ID_STATUS_ICON); - statusIconLabel.add(new AttributeAppender("class", new AbstractReadOnlyModel() { + statusIconLabel.add(new AttributeAppender("class", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -54,7 +53,7 @@ public String getObject() { container.add(statusIconLabel); Label existingAssignment = new Label(ID_EXISTING_ASSIGNMENT, - new AbstractReadOnlyModel() { + new IModel() { private static final long serialVersionUID = 1L; @Override @@ -69,7 +68,7 @@ public String getObject() { return ""; } }); - existingAssignment.add(new AttributeAppender("style", new AbstractReadOnlyModel() { + existingAssignment.add(new AttributeAppender("style", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -80,7 +79,7 @@ public String getObject() { container.add(existingAssignment); Label addedAssignment = new Label(ID_ADDED_ASSIGNMENT, - new AbstractReadOnlyModel() { + new IModel() { private static final long serialVersionUID = 1L; @Override @@ -95,7 +94,7 @@ public String getObject() { return ""; } }); - addedAssignment.add(new AttributeAppender("style", new AbstractReadOnlyModel() { + addedAssignment.add(new AttributeAppender("style", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -105,7 +104,7 @@ public String getObject() { })); container.add(addedAssignment); - AbstractReadOnlyModel removeButtonTitleModel = new AbstractReadOnlyModel() { + IModel removeButtonTitleModel = new IModel() { private static final long serialVersionUID = 1L; @Override @@ -117,7 +116,7 @@ public String getObject() { }; AjaxSubmitButton removeButton = new AjaxSubmitButton(ID_REMOVE_BUTTON, removeButtonTitleModel) { @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { AssignmentConflictPanel.this.removeAssignmentPerformed(getModelObject().getAssignment1(), target); } }; @@ -136,7 +135,7 @@ public boolean isEnabled() { }); container.add(removeButton); - AbstractReadOnlyModel unselectButtonTitleModel = new AbstractReadOnlyModel() { + IModel unselectButtonTitleModel = new IModel() { private static final long serialVersionUID = 1L; @Override @@ -149,7 +148,7 @@ public String getObject() { AjaxSubmitButton unselectButton = new AjaxSubmitButton(ID_UNSELECT_BUTTON, unselectButtonTitleModel) { @Override - public void onSubmit(AjaxRequestTarget target, Form form) { + public void onSubmit(AjaxRequestTarget target) { AssignmentConflictPanel.this.removeAssignmentPerformed(getModelObject().getAssignment2(), target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java index f0a84dc811c..fb84ee6b2a4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java @@ -30,7 +30,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.PasswordTextField; import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -155,7 +154,7 @@ private List> initColumns() { @Override protected IModel createIconModel(final IModel rowModel) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 1L; @Override @@ -181,7 +180,7 @@ public String getObject() { public void populateItem(Item> item, String componentId, final IModel rowModel) { super.populateItem(item, componentId, rowModel); - final ImagePanel imagePanel = (ImagePanel) item.get(0); + final ImagePanel imagePanel = (ImagePanel) item.get(componentId); final PasswordAccountDto passwordAccountDto = rowModel.getObject(); @@ -237,7 +236,7 @@ public boolean isEnabled() { @Override public void populateItem(Item> item, String componentId, final IModel rowModel) { - item.add(new Label(componentId, new AbstractReadOnlyModel() { + item.add(new Label(componentId, new IModel() { private static final long serialVersionUID = 1L; @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java index 3debaf4eda7..1060b045688 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java @@ -94,7 +94,7 @@ public IModel getBody() { }; @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { + protected void onSubmit(AjaxRequestTarget target) { performSearch(getSearchText()); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.java index a1bb360188c..af3ca181794 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.java @@ -26,7 +26,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.repeater.RepeatingView; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.protocol.http.WebApplication; @@ -133,7 +132,7 @@ protected void onComponentTag(final ComponentTag tag) { } }); - linkItem.add(new Label(ID_LABEL, new AbstractReadOnlyModel() { + linkItem.add(new Label(ID_LABEL, new IModel() { @Override public String getObject() { @@ -145,7 +144,7 @@ public String getObject() { } })); - Label description = new Label(ID_DESCRIPTION, new AbstractReadOnlyModel() { + Label description = new Label(ID_DESCRIPTION, new IModel() { @Override public String getObject() {