Merge branch 'feature/form-refactoring' of github.com:Evolveum/midpoi…

…nt into feature/form-refactoring

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/BaseFocusPanel.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SimplePanel.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/AddCapabilityDialog.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/ExpressionVariableEditorDialog.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationActionEditorDialog.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyDialog.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LoggerValidator.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentEntitlements.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AsyncUpdatePanel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,10 @@
 package com.evolveum.midpoint.web.component;
 
 import com.evolveum.midpoint.web.resource.img.ImgResources;
-import com.evolveum.midpoint.web.component.util.BaseSimplePanel;
+import com.evolveum.midpoint.web.component.util.BasePanel;
 import com.evolveum.midpoint.web.component.util.FutureUpdateBehavior;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.basic.Label;
@@ -32,13 +33,13 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 
-import java.util.concurrent.Callable;
+import java.io.Serializable;
 import java.util.concurrent.Future;
 
 /**
  * @author lazyman
  */
-public abstract class AsyncUpdatePanel<V, T> extends BaseSimplePanel {
+public abstract class AsyncUpdatePanel<V, T extends Serializable> extends BasePanel<T> {
 
     private static final ResourceReference PRELOADER =
             new PackageResourceReference(ImgResources.class, "ajax-loader.gif");
@@ -59,7 +60,8 @@ public AsyncUpdatePanel(String id, IModel<V> callableParameterModel) {
     }
 
     public AsyncUpdatePanel(String id, IModel<V> callableParameterModel, Duration durationSecs) {
-        super(id, new Model());
+        super(id, new Model<T>());
+        initLayout();
 
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
         future = GuiComponents.submitCallable(createCallable(auth, callableParameterModel));
@@ -82,7 +84,7 @@ protected void onUpdateError(AjaxRequestTarget target, Exception ex) {
         add(behaviour);
     }
 
-    protected void initLayout() {
+    private void initLayout() {
         add(getLoadingComponent(ID_LOADING));
         add(new Label(ID_BODY));
     }

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java

@@ -30,11 +30,12 @@
 import org.apache.wicket.request.resource.ByteArrayResource;
 
 import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.prism.polystring.PolyString;
 import com.evolveum.midpoint.web.component.prism.ObjectWrapper;
-import com.evolveum.midpoint.web.component.util.PrismPropertyWrapperModel;
-import com.evolveum.midpoint.web.component.util.ReadOnlyWrapperModel;
 import com.evolveum.midpoint.web.component.util.SummaryTag;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+import com.evolveum.midpoint.web.model.PrismPropertyRealValueFromObjectWrapperModel;
+import com.evolveum.midpoint.web.model.ReadOnlyWrapperModel;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
@@ -74,17 +75,17 @@ public FocusSummaryPanel(String id, final IModel<ObjectWrapper<O>> model) {
 
 		box.add(new AttributeModifier("class", BOX_CSS_CLASS + " " + getBoxAdditionalCssClass()));
 
-		box.add(new Label(ID_DISPLAY_NAME, new PrismPropertyWrapperModel<>(model, getDisplayNamePropertyName())));
-		box.add(new Label(ID_IDENTIFIER, new PrismPropertyWrapperModel<>(model, getIdentifierPropertyName())));
+		box.add(new Label(ID_DISPLAY_NAME, new PrismPropertyRealValueFromObjectWrapperModel<>(model, getDisplayNamePropertyName())));
+		box.add(new Label(ID_IDENTIFIER, new PrismPropertyRealValueFromObjectWrapperModel<>(model, getIdentifierPropertyName())));
 		if (getTitlePropertyName() == null) {
 			box.add(new Label(ID_TITLE, " "));
 		} else {
-			box.add(new Label(ID_TITLE, new PrismPropertyWrapperModel<>(model, getTitlePropertyName(), " ")));
+			box.add(new Label(ID_TITLE, new PrismPropertyRealValueFromObjectWrapperModel<>(model, getTitlePropertyName(), " ")));
 		}
 
-		box.add(new Label(ID_ORGANIZATION, new ReadOnlyWrapperModel<O>(model) {
+		box.add(new Label(ID_ORGANIZATION, new ReadOnlyWrapperModel<String,O>(model) {
 			@Override
-			public Object getObject() {
+			public String getObject() {
 				Collection<PrismObject<OrgType>> parentOrgs = getWrapper().getParentOrgs();
 				if (parentOrgs.isEmpty()) {
 					return "";
@@ -94,11 +95,11 @@ public Object getObject() {
 				for (PrismObject<OrgType> org: parentOrgs) {
 					OrgType orgType = org.asObjectable();
 					if (orgType.getOrgType().contains("functional")) {
-						return orgType.getDisplayName();
+						return PolyString.getOrig(orgType.getDisplayName());
 					}
 				}
 				// Just use the first one as a fallback
-				return parentOrgs.iterator().next().asObjectable().getDisplayName();
+				return PolyString.getOrig(parentOrgs.iterator().next().asObjectable().getDisplayName());
 			}
 		}));
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java

@@ -20,15 +20,16 @@
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.component.util.LoadableModel;
 import com.evolveum.midpoint.web.component.util.SimplePanel;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+import com.evolveum.midpoint.web.model.LoadableModel;
 import com.evolveum.midpoint.web.page.admin.configuration.component.ObjectPolicyDialog;
 import com.evolveum.midpoint.web.page.admin.configuration.dto.ObjectPolicyConfigurationTypeDto;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.web.util.WebModelUtils;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectTemplateType;
+
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxLink;

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java

@@ -417,8 +417,12 @@ public boolean isVisible(int index) {
             if (visibilities.length > 0) {
                 Boolean visible = visibilities[index];
                 if (visible == null) {
-                    visible = tabs.getObject().get(index).isVisible();
-                    visibilities[index] = visible;
+                    List<T> tabsList = tabs.getObject();
+                    T tab = tabsList == null || tabsList.size() == 0 ? null :  tabs.getObject().get(index);
+                    visible = tab != null && tab.isVisible();
+                    if (tab != null) {
+                        visibilities[index] = visible;
+                    }
                 }
                 return visible;
             } else {

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeValuePanel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,15 +25,14 @@
 import com.evolveum.midpoint.web.component.input.TextPanel;
 import com.evolveum.midpoint.web.component.input.TriStateComboPanel;
 import com.evolveum.midpoint.web.component.prism.InputPanel;
-import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.component.util.BasePanel;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType;
 
 import org.apache.commons.lang.ClassUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.FormComponent;
@@ -48,7 +47,7 @@
 /**
  * @author lazyman
  */
-public class ACAttributeValuePanel extends SimplePanel<ACValueConstructionDto> {
+public class ACAttributeValuePanel extends BasePanel<ACValueConstructionDto> {
 
     private static final String ID_INPUT = "input";
     private static final String ID_ADD = "add";
@@ -57,10 +56,10 @@ public class ACAttributeValuePanel extends SimplePanel<ACValueConstructionDto> {
     public ACAttributeValuePanel(String id, IModel<ACValueConstructionDto> iModel, Form form) {
         super(id, iModel);
 
-        initPanel(form);
+        initLayout(form);
     }
 
-    private void initPanel(Form form) {
+    private void initLayout(Form form) {
         ACValueConstructionDto dto = getModel().getObject();
         PrismPropertyDefinition definition = dto.getAttribute().getDefinition();
         boolean required = definition.getMinOccurs() > 0;

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,9 +38,9 @@
 import com.evolveum.midpoint.web.component.input.DropDownChoicePanel;
 import com.evolveum.midpoint.web.component.input.TwoStateBooleanPanel;
 import com.evolveum.midpoint.web.component.prism.InputPanel;
-import com.evolveum.midpoint.web.component.util.LoadableModel;
-import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.component.util.BasePanel;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+import com.evolveum.midpoint.web.model.LoadableModel;
 import com.evolveum.midpoint.web.page.PageBase;
 import com.evolveum.midpoint.web.page.admin.configuration.component.ChooseTypePanel;
 import com.evolveum.midpoint.web.page.admin.dto.ObjectViewDto;
@@ -79,7 +79,7 @@
 /**
  * @author lazyman
  */
-public class AssignmentEditorPanel extends SimplePanel<AssignmentEditorDto> {
+public class AssignmentEditorPanel extends BasePanel<AssignmentEditorDto> {
 
     private static final Trace LOGGER = TraceManager.getTrace(AssignmentEditorPanel.class);
 
@@ -131,7 +131,7 @@ protected List<ACAttributeDto> load() {
             }
         };
 
-        initPanelLayout();
+        initLayout();
     }
 
     @Override
@@ -142,7 +142,7 @@ public void renderHead(IHeaderResponse response) {
                 new PackageResourceReference(AssignmentEditorPanel.class, "AssignmentEditorPanel.css")));
     }
 
-    private void initPanelLayout() {
+    private void initLayout() {
         WebMarkupContainer headerRow = new WebMarkupContainer(ID_HEADER_ROW);
         headerRow.add(AttributeModifier.append("class", createHeaderClassModel(getModel())));
         headerRow.setOutputMarkupId(true);

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,11 +35,12 @@
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenu;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
-import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.component.util.BasePanel;
 import com.evolveum.midpoint.web.page.admin.users.component.*;
 import com.evolveum.midpoint.web.page.admin.users.dto.UserDtoStatus;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
@@ -52,6 +53,7 @@
 import org.apache.wicket.model.Model;
 
 import javax.xml.namespace.QName;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -60,7 +62,7 @@
 /**
  * @author shood
  */
-public class AssignmentTablePanel<T extends ObjectType> extends SimplePanel<List<AssignmentEditorDto>> {
+public class AssignmentTablePanel<T extends ObjectType> extends BasePanel<List<AssignmentEditorDto>> {
 
 	private static final Trace LOGGER = TraceManager.getTrace(AssignmentTablePanel.class);
 
@@ -86,7 +88,7 @@ public AssignmentTablePanel(String id, IModel<String> label,
 			IModel<List<AssignmentEditorDto>> assignmentModel) {
 		super(id, assignmentModel);
 
-		initPanelLayout(label);
+		initLayout(label);
 	}
 
 	public List<AssignmentType> getAssignmentTypeList() {
@@ -101,7 +103,7 @@ private IModel<List<AssignmentEditorDto>> getAssignmentModel() {
 		return getModel();
 	}
 
-	private void initPanelLayout(IModel<String> labelText) {
+	private void initLayout(IModel<String> labelText) {
 		final WebMarkupContainer assignments = new WebMarkupContainer(ID_ASSIGNMENTS);
 		assignments.setOutputMarkupId(true);
 		add(assignments);

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,15 @@
 
 package com.evolveum.midpoint.web.component.data;
 
+<<<<<<< HEAD
 import java.util.List;
+=======
+import com.evolveum.midpoint.prism.query.ObjectPaging;
+import com.evolveum.midpoint.web.component.util.BasePanel;
+import com.evolveum.midpoint.web.page.PageBase;
+import com.evolveum.midpoint.web.session.UserProfileStorage;
+import com.evolveum.midpoint.web.util.WebMiscUtil;
+>>>>>>> 90ecb7cacae574040d698ee04b30902e86884cef
 
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
@@ -42,7 +50,7 @@
 /**
  * @author Viliam Repan (lazyman)
  */
-public class BoxedTablePanel<T> extends SimplePanel implements Table {
+public class BoxedTablePanel<T> extends BasePanel implements Table {
 
     private static final String ID_HEADER = "header";
     private static final String ID_FOOTER = "footer";

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.java

@@ -1,8 +1,8 @@
 package com.evolveum.midpoint.web.component.data;
 
-import com.evolveum.midpoint.web.component.util.LoadableModel;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.page.PageTemplate;
+import com.evolveum.midpoint.web.model.LoadableModel;
 
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxRequestTarget;

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/DoubleButtonPanel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,8 @@
 
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.data.column.DoubleButtonColumn;
-import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.component.util.BasePanel;
+
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.model.IModel;
@@ -27,7 +28,7 @@
 /**
  *  @author shood
  * */
-public class DoubleButtonPanel<T> extends SimplePanel<T>{
+public class DoubleButtonPanel<T> extends BasePanel<T>{
 
     private static final String ID_BUTTON_FIRST = "first";
     private static final String ID_BUTTON_SECOND = "second";
@@ -37,10 +38,10 @@ public class DoubleButtonPanel<T> extends SimplePanel<T>{
 
     public DoubleButtonPanel(String id, IModel<T> model){
         super(id, model);
-        createLayout();
+        initLayout();
     }
 
-    private void createLayout(){
+    private void initLayout(){
         AjaxButton firstButton = new AjaxButton(ID_BUTTON_FIRST, createButtonStringResource(getFirstCaption())) {
 
             @Override