Merge branch 'master' into feature/dependency-analyze

Evolveum · Mar 31, 2016 · 8d5a1ad · 8d5a1ad
2 parents 2c0b951 + 8d79462
commit 8d5a1ad
Show file tree

Hide file tree

Showing 32 changed files with 1,400 additions and 415 deletions.
diff --git a/.../com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.java b/.../com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.java
@@ -102,6 +102,7 @@ public String getObject() {
             protected void populateItem(final ListItem<T> item) {
                 AutoCompleteSettings autoCompleteSettings = new AutoCompleteSettings();
                 autoCompleteSettings.setShowListOnEmptyInput(true);
+                autoCompleteSettings.setMaxHeightInPx(200);
                 AutoCompleteTextField<String> autoCompleteEditor = new AutoCompleteTextField<String>(ID_TEXT,
                         createTextModel(item.getModel()), autoCompleteSettings) {
 

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/component/input/AutoCompleteTextPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/component/input/AutoCompleteTextPanel.java
@@ -45,6 +45,7 @@ public AutoCompleteTextPanel(String id, final IModel<T> model, Class clazz) {
         AutoCompleteSettings autoCompleteSettings = new AutoCompleteSettings();
         autoCompleteSettings.setShowListOnEmptyInput(true);
         autoCompleteSettings.setShowListOnFocusGain(true);
+        autoCompleteSettings.setMaxHeightInPx(200);
         autoCompleteSettings.setShowCompleteListOnFocusGain(true);
         final AutoCompleteTextField<T> input = new AutoCompleteTextField<T>(ID_INPUT, model, autoCompleteSettings) {
 

diff --git a/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java b/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
@@ -341,6 +341,7 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
 
         AutoCompleteSettings autoCompleteSettings = new AutoCompleteSettings();
         autoCompleteSettings.setShowListOnEmptyInput(true);
+        autoCompleteSettings.setMaxHeightInPx(200);
         AutoCompleteTextField<String> editorObjectClass = new AutoCompleteTextField<String>(ID_EDITOR_OBJECT_CLASS,
                 new PropertyModel<String>(model, SchemaHandlingDto.F_SELECTED_OBJECT_CLASS), autoCompleteSettings) {
 

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
@@ -331,6 +331,7 @@ public boolean isEnabled() {
 
         AutoCompleteSettings autoCompleteSettings = new AutoCompleteSettings();
         autoCompleteSettings.setShowListOnEmptyInput(true);
+        autoCompleteSettings.setMaxHeightInPx(200);
         final AutoCompleteTextField<String> objectClass = new AutoCompleteTextField<String>(ID_OBJECT_CLASS,
                 new PropertyModel<String>(model, TaskAddDto.F_OBJECT_CLASS), autoCompleteSettings) {
 

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
@@ -606,6 +606,7 @@ public boolean isEnabled() {
 
         AutoCompleteSettings autoCompleteSettings = new AutoCompleteSettings();
         autoCompleteSettings.setShowListOnEmptyInput(true);
+        autoCompleteSettings.setMaxHeightInPx(200);
         final AutoCompleteTextField<String> objectClass = new AutoCompleteTextField<String>(ID_OBJECT_CLASS,
                 new PropertyModel<String>(model, TaskDto.F_OBJECT_CLASS), autoCompleteSettings) {
 

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -3014,6 +3014,7 @@ operation.com.evolveum.midpoint.model.impl.lens.ChangeExecutor.execute.focus.Use
 operation.com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta=Execute delta (Model)
 operation.com.evolveum.midpoint.task.api.Task.listSubtasksDeeply=List subtasts deeply (Task)
 operation.com.evolveum.midpoint.task.api.Task.listSubtasksRaw=List subtasks raw (Task)
+operation.com.evolveum.midpoint.web.page.self.PageSelfCredentials.savePassword=Password is successfully changed
 PageError.button.home=Home
 PageResource.tab.content.account=Accounts
 PageResource.tab.content.entitlement=Entitlements

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2014 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.
@@ -784,6 +784,26 @@ public static <O extends Objectable, X> ObjectDelta<O> createModificationDeleteP
     	return objectDelta;
     }
 
+    /**
+     * Convenience method for quick creation of object deltas that replace a single object reference.
+     */
+    public static <O extends Objectable, X> ObjectDelta<O> createModificationReplaceReference(Class<O> type, String oid, QName referenceName,
+    		PrismContext prismContext, PrismReferenceValue... refValues) {
+    	ItemPath propertyPath = new ItemPath(referenceName);
+    	return createModificationReplaceReference(type, oid, propertyPath, prismContext, refValues);
+    }
+
+    /**
+     * Convenience method for quick creation of object deltas that replace a single object reference.
+     */
+    public static <O extends Objectable, X> ObjectDelta<O> createModificationReplaceReference(Class<O> type, String oid, 
+    		ItemPath refPath, PrismContext prismContext, PrismReferenceValue... refValues) {
+    	ObjectDelta<O> objectDelta = new ObjectDelta<O>(type, ChangeType.MODIFY, prismContext);
+    	objectDelta.setOid(oid);
+    	fillInModificationReplaceReference(objectDelta, refPath, refValues);
+    	return objectDelta;
+    }
+
     public <X> void addModificationReplaceProperty(QName propertyQName, X... propertyValues) {
     	addModificationReplaceProperty(new ItemPath(propertyQName), propertyValues);
     }