@openui5/sap.ui.mdc 1.111.1 → 1.112.0

package/src/sap/ui/mdc/field/FieldBase.js

@@ -86,7 +86,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.FieldBase
@@ -512,7 +512,8 @@ sap.ui.define([
 			defaultAggregation: "content"
 		},
 		renderer: FieldBaseRenderer,
-		_oManagedObjectModel: null
+		_oManagedObjectModel: null,
+		_oInvalidInput: null
 	});
 
 	// apply the message mixin so all message on the input will get the associated label-texts injected
@@ -626,8 +627,28 @@ sap.ui.define([
 		return this._oContentFactory;
 	};
 
+	var _setFocusTimer = function (oEvent) {
+		var oFieldHelp = _getFieldHelp.call(this);
+		if (oFieldHelp && !this._iFocusTimer && oFieldHelp.shouldOpenOnFocus() && !oFieldHelp.isOpen()) {
+			this._iFocusTimer = setTimeout(function () {
+				oFieldHelp.open(true);
+				this._redirectFocus(oEvent, oFieldHelp);
+				this._iFocusTimer = null;
+			}.bind(this),300);
+		}
+	};
+
+	var _clearFocusTimer = function () {
+		if (this._iFocusTimer) {
+			clearTimeout(this._iFocusTimer);
+			this._iFocusTimer = null;
+		}
+	};
+
 	FieldBase.prototype.exit = function() {
 
+		_clearFocusTimer.call(this);
+
 		var oFieldInfo = this.getFieldInfo();
 		if (oFieldInfo) {
 			// as aggregations are destroyed after exit
@@ -717,15 +738,13 @@ sap.ui.define([
 	};
 
 	FieldBase.prototype.onfocusin = function(oEvent) {
-
 		_connectFieldhelp.call(this);
-
+		_setFocusTimer.call(this, oEvent);
 	};
 
 	FieldBase.prototype.onsapfocusleave = function(oEvent) {
-
+		_clearFocusTimer.call(this);
 		_clearLiveChangeTimer.call(this);
-
 	};
 
 	// fire change event only if unit and currency field are left
@@ -742,7 +761,7 @@ sap.ui.define([
 					if (oPromise) {
 						_executeChange.call(this, undefined, undefined, undefined, oPromise);
 					} else {
-						_executeChange.call(this, this.getConditions(), !this._bParseError);
+						_executeChange.call(this, this.getConditions(), !this._isInvalidInput());
 					}
 				}
 			}
@@ -806,7 +825,7 @@ sap.ui.define([
 
 		// if same value is entered again no change event is triggered, So we need to close the suggestion here
 		var oFieldHelp = _getFieldHelp.call(this);
-		if (oFieldHelp && oFieldHelp.isOpen(true)) {
+		if (oFieldHelp && oFieldHelp.isOpen()) {
 			oFieldHelp.close();
 		}
 		this._sFilterValue = "";
@@ -820,19 +839,23 @@ sap.ui.define([
 
 	};
 
+	FieldBase.prototype._redirectFocus = function (oEvent, oFieldHelp) {
+		var oSource = oEvent.srcControl;
+		if (oFieldHelp.isOpen() && (!this._getContentFactory().isMeasure() || (oSource.getShowValueHelp && oSource.getShowValueHelp()))) {
+			oSource.addStyleClass("sapMFocus"); // to show focus outline again after navigation
+			oFieldHelp.removeFocus();
+		}
+	};
+
 	FieldBase.prototype.ontap = function(oEvent) {
 
 		// in "Select"-case the suggestion help should open on click into field
 		var oFieldHelp = _getFieldHelp.call(this);
 		if (oFieldHelp) {
-			if (oFieldHelp.shouldOpenOnClick() && !oFieldHelp.isOpen(true)) {
+			if (oFieldHelp.shouldOpenOnClick() && !oFieldHelp.isOpen()) {
 				oFieldHelp.open(true);
 			}
-			var oSource = oEvent.srcControl;
-			if (oFieldHelp.isOpen(true) && (!this._getContentFactory().isMeasure() || (oSource.getShowValueHelp && oSource.getShowValueHelp()))) {
-				oSource.addStyleClass("sapMFocus"); // to show focus outline again after navigation
-				oFieldHelp.removeFocus();
-			}
+			this._redirectFocus(oEvent, oFieldHelp);
 		}
 
 	};
@@ -926,7 +949,12 @@ sap.ui.define([
 			if (bValid) {
 				oPromise = Promise.resolve(this._getResultForPromise(aConditions));
 			} else {
-				oPromise = Promise.reject(vWrongValue);
+				var oException = this._getInvalidInputException();
+				if (oException) {
+					oPromise = Promise.reject(oException);
+				} else { // maybe e.g. DatePicker fires change with valid=false but no exception
+					oPromise = Promise.reject(vWrongValue);
+				}
 			}
 		}
 
@@ -951,7 +979,7 @@ sap.ui.define([
 
 			if (oPromise) {
 				bPending = true;
-			} else if (this._bParseError) {
+			} else if (this._isInvalidInput()) {
 				oPromise = Promise.reject();
 			} else {
 				oPromise = Promise.resolve(this._getResultForPromise(this.getConditions()));
@@ -961,7 +989,7 @@ sap.ui.define([
 				if (bPending) {
 					_executeChange.call(this, undefined, undefined, undefined, oPromise);
 				} else {
-					_executeChange.call(this, this.getConditions(), !this._bParseError, undefined, oPromise);
+					_executeChange.call(this, this.getConditions(), !this._isInvalidInput(), undefined, oPromise);
 				}
 			}
 
@@ -1133,7 +1161,7 @@ sap.ui.define([
 		}
 
 		if (oChanges.name === "conditions") {
-			this._bParseError = false; // if conditions updated from outside parse error is obsolete. If updated from inside no parse error occurs
+			this._resetInvalidInput(); // if conditions updated from outside parse error is obsolete. If updated from inside no parse error occurs
 			_handleConditionsChange.call(this, oChanges.current, oChanges.old);
 
 			// try to find the corresponding async. change
@@ -1827,9 +1855,9 @@ sap.ui.define([
 			this._getContentFactory().setUnitOriginalType(undefined);
 		}
 
-		if (this._bParseError) {
+		if (this._isInvalidInput()) {
 			// as wrong input get lost if content control is destroyed.
-			this._bParseError = false;
+			this._resetInvalidInput();
 			this._removeUIMessage();
 		}
 
@@ -2075,10 +2103,36 @@ sap.ui.define([
 
 	}
 
+	FieldBase.prototype._setInvalidInput = function(oException, vValue, sReason) {
+
+		this._oInvalidInput = {exception: oException, value: vValue, reason: sReason};
+
+	};
+
+	FieldBase.prototype._getInvalidInputException = function() {
+
+		return this._oInvalidInput && this._oInvalidInput.exception;
+
+	};
+
+	FieldBase.prototype._resetInvalidInput = function() {
+
+		this._oInvalidInput = null;
+
+	};
+
+	FieldBase.prototype._isInvalidInput = function() {
+
+		return !!this._oInvalidInput;
+
+	};
+
 	function _handleParseError(oEvent) {
 
 		// as change event if inner control is fired even Input is wrong, check parse exception from binding
-		this._bParseError = true;
+		var vValue = oEvent.getParameter("newValue");
+		var oException = oEvent.getParameter("exception");
+		this._setInvalidInput(oException, vValue, "ParseError");
 		this._sFilterValue = "";
 
 	}
@@ -2086,12 +2140,12 @@ sap.ui.define([
 	function _handleValidationError(oEvent) {
 
 		// as change event if inner control is fired even Input is wrong, check validation exception from binding
-		this._bParseError = true;
+		var vValue = oEvent.getParameter("newValue");
+		var oException = oEvent.getParameter("exception");
+		this._setInvalidInput(oException, vValue, "ValidationError");
 		this._sFilterValue = "";
 
 		// try to find the corresponding async. change and reject it
-		var vValue = oEvent.getParameter("newValue");
-		var oException = oEvent.getParameter("exception");
 		var aWrongConditions = oException && oException instanceof ConditionValidateException && oException.getConditions(); // we store the conditions in the ConditionValidationException
 		var bFound = false;
 		var i = 0;
@@ -2119,7 +2173,7 @@ sap.ui.define([
 
 	function _handleValidationSuccess(oEvent) {
 
-		this._bParseError = false; // if last valif value is entered again no condition is updated
+		this._resetInvalidInput(); // if last valid value is entered again no condition is updated
 
 	}
 
@@ -2152,7 +2206,7 @@ sap.ui.define([
 
 		if (oChange.changeEvent.parameters.hasOwnProperty("valid")) {
 			bValid = oChange.changeEvent.parameters["valid"];
-		} else if (this._bParseError) {
+		} else if (this._isInvalidInput()) {
 			// this might be result of a value that cannot be parsed
 			bValid = false;
 		}
@@ -2221,7 +2275,7 @@ sap.ui.define([
 		if (oFieldHelp && (!this._getContentFactory().isMeasure() || oSource.getShowValueHelp())) {
 			if (bEscPressed) {
 				// close FieldHelp if escape pressed and not repoen it for last typed characters
-				if (oFieldHelp.isOpen(true)) {
+				if (oFieldHelp.isOpen()) {
 					oFieldHelp.close();
 					_setConditionsOnFieldHelp.call(this, this.getConditions(), oFieldHelp); // reset conditions
 					_clearLiveChangeTimer.call(this);
@@ -2245,6 +2299,9 @@ sap.ui.define([
 					this._bIgnoreInputValue = false; // after typing the input value is the current one and should be used
 					this._vLiveChangeValue = vValue;
 					if (!this._fnLiveChangeTimer) {
+
+						_clearFocusTimer.call(this);
+
 						this._fnLiveChangeTimer = debounce(function() {
 							var sDisplay = this.getDisplay();
 							// remove "(", ")" from serach string
@@ -2454,7 +2511,7 @@ sap.ui.define([
 		}
 
 		var aHelpConditions;
-		if (this._bParseError && this.getMaxConditionsForHelp() === 1) {
+		if (this._isInvalidInput() && this.getMaxConditionsForHelp() === 1) {
 			// if parsing error and single value case do not see the old (outdated) condition as selected
 			// TODO: handling if error only on unit or number part
 			aHelpConditions = [];
@@ -2481,6 +2538,9 @@ sap.ui.define([
 		var oFieldHelp = _getFieldHelp.call(this);
 
 		if (oFieldHelp) {
+			if (this._fnLiveChangeTimer) { // as live change might pending we need to update the filterValue
+				this._fnLiveChangeTimer.flush();
+			}
 			oFieldHelp.setFilterValue(this._sFilterValue); // use types value for filtering, even if reopening FieldHelp
 			var aConditions = this.getConditions();
 			_setConditionsOnFieldHelp.call(this, aConditions, oFieldHelp);
@@ -2615,8 +2675,8 @@ sap.ui.define([
 			}
 
 			// after selection input cannot be wrong
-			if (this._bParseError) { // only remove messages set by Field itself, message from outside should stay.
-				this._bParseError = false;
+			if (this._isInvalidInput()) { // only remove messages set by Field itself, message from outside should stay.
+				this._resetInvalidInput();
 				this._removeUIMessage();
 				bChangeAfterError = true;
 			}
@@ -2789,7 +2849,7 @@ sap.ui.define([
 		//		// also in display mode to get right text
 		//		_handleConditionsChange.call(this, this.getConditions());
 		if (!isEditing && !this._bPendingConditionUpdate && this.getConditions().length > 0 &&
-			(this.getMaxConditions() !== 1 || (this.getDisplay() !== FieldDisplay.Value && !this._bParseError))
+			(this.getMaxConditions() !== 1 || (this.getDisplay() !== FieldDisplay.Value && !this._isInvalidInput()))
 			&& this._oManagedObjectModel) {
 			// update tokens in MultiValue
 			// update text/value only if no parse error, otherwise wrong value would be removed
@@ -3076,7 +3136,7 @@ sap.ui.define([
 
 			oPromise.then(function(vResult) {// vResult can be a condition or an array of conditions
 				oChange.result = vResult;
-				this._bParseError = false;
+				this._resetInvalidInput();
 				var aConditions = this.getConditions();
 				if (deepEqual(vResult, aConditions)) {
 					// parsingResult is same as current value -> no update will happen
@@ -3090,7 +3150,7 @@ sap.ui.define([
 					// unknown error -> just raise it
 					throw oException;
 				}
-				this._bParseError = true;
+				this._setInvalidInput(oException, undefined, "AsyncParsing");
 				fReject(oException);
 				_removeAsyncChange.call(this, oChange);
 			}.bind(this));

package/src/sap/ui/mdc/field/FieldInfoBase.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A <code>FieldInfoBase</code> element is a base class that shows any kind of information related to the <code>Field</code> control, for example, navigation targets or contact details.
 	 * @extends sap.ui.mdc.Element
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 * @constructor
 	 * @private
 	 * @since 1.54.0

package/src/sap/ui/mdc/field/FieldInput.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>FieldInput</code> control is used to render an input field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.Input
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/FieldInputRenderUtil.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class Functions uses in <code>FieldInputRenderer</code> and <code>FieldMultiInputRenderer</code> to adjust aria attributes.
 	 *
 	 * @author SAP SE
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 * @since 1.86.0
 	 * @alias sap.ui.mdc.field.FieldInputRenderUtil
 	 *

package/src/sap/ui/mdc/field/FieldMultiInput.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>FieldMultiInput</code> control is used to render a multi-input field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.MultiInput
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/ListFieldHelpItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.ListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/MultiValueFieldItem.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Base type for <code>MultiValueFieldItem</code> control.
 	 * @extends sap.ui.core.Element
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/TokenDisplay.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>TokenDisplay</code> control is used to render a field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.Token
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/TokenizerDisplay.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>TokenizerDisplay</code> control is used to render a Tokenizer inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.Tokenizer
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/content/DateContent.js

@@ -281,7 +281,7 @@ sap.ui.define([
 			var oType = oContentFactory.retrieveDataType(); // TODO: do we need to create data type right now?
 			var sBaseType = oContentFactory.getField().getBaseType();
 			var oFormatOptions = oType.getFormatOptions();
-			var oUsedFormatOptions = {UTC: true}; // we always work with UTC dates
+			var oUsedFormatOptions = {};
 			var oDateRangeFormatOptions = {};
 
 			if (oFormatOptions.style) {
@@ -292,7 +292,6 @@ sap.ui.define([
 
 			if (sBaseType === BaseType.DateTime) {
 				oDateRangeFormatOptions.datetime = oUsedFormatOptions;
-				oDateRangeFormatOptions.datetime.UTC =  oType.getFormatOptions().UTC === true; // for DateTime we have to set it depending on the type UTC setting
 			}
 
 			// use Date FormatOptions anyhow for Operations supporting only dates

package/src/sap/ui/mdc/filterbar/FilterBarBase.js

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * @class The <code>FilterBarBase</code> control is used as a faceless base class for common functionality of any MDC FilterBar derivation.
 	 * @extends sap.ui.mdc.Control
 	 * @author SAP SE
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -1666,7 +1666,7 @@ sap.ui.define([
 						this._filterItemRemoved(oFilterField);
 					}
 
-					this._oFilterBarLayout.rerender();
+					this._oFilterBarLayout.invalidate();
 				}
 			}
 		}

package/src/sap/ui/mdc/filterbar/FilterBarBaseRenderer.js

@@ -33,6 +33,9 @@ sap.ui.define([],
 		FilterBarBaseRenderer.render = function (oRm, oControl) {
 			oRm.openStart("div", oControl);
 			oRm.class(FilterBarBaseRenderer.CSS_CLASS);
+			if (oControl.isA("sap.ui.mdc.filterbar.p13n.AdaptationFilterBar") && oControl.getProperty("_useFixedWidth")) {
+				oRm.style("width", oControl.getWidth());
+			}
 			oRm.openEnd();
 			var oInnerLayout = oControl.getAggregation("layout") ? oControl.getAggregation("layout").getInner() : null;
 			oRm.renderControl(oInnerLayout);

package/src/sap/ui/mdc/filterbar/PropertyHelper.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/filterbar/p13n/AdaptationFilterBar.js

@@ -15,20 +15,34 @@ sap.ui.define([
 	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class The <code>AdaptationFilterBar</code> control is used for a lightweight FilterBar implementation for p13n use cases.
-	 * The <code>AdaptationFilterBar</code> should only be used if the consuming control implements atleast the <code>IFilterSource</code>
+	 * The <code>AdaptationFilterBar</code> should only be used if the consuming control implements at least the <code>IFilterSource</code>
 	 * interface to provide basic filter functionality.
 	 *
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 * @constructor
 	 * @private
+	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.80.0
 	 * @alias sap.ui.mdc.filterbar.p13n.AdaptationFilterBar
 	 */
 	var AdaptationFilterBar = FilterBarBase.extend("sap.ui.mdc.filterbar.p13n.AdaptationFilterBar", {
 		metadata: {
 			library: "sap.ui.mdc",
+			properties: {
+				/**
+				 * Determines whether the <code>AdaptationFilterBar</code> has a fixed width.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc
+				 */
+				_useFixedWidth: {
+					type: "boolean",
+					defaultValue: false,
+					visibility: "hidden"
+				}
+			},
 			associations: {
 				/**
 				 * Determines the parent on which the condition changes should be applied on.
@@ -49,6 +63,8 @@ sap.ui.define([
 		renderer: FilterBarBaseRenderer
 	});
 
+	AdaptationFilterBar.prototype.WIDTH = "30rem";
+
 	AdaptationFilterBar.prototype.init = function() {
 		FilterBarBase.prototype.init.apply(this,arguments);
 		this.addStyleClass("sapUIAdaptationFilterBar");
@@ -87,6 +103,17 @@ sap.ui.define([
 		return this._oFilterBarLayout.getInitialFocusedControl();
 	};
 
+	/**
+	 * Getter for the fixed width of the <code>AdaptationFilterBar</code>
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc
+	 * @returns {string} The fixed width of the <code>AdaptationFilterBar</code>
+	 */
+	AdaptationFilterBar.prototype.getWidth = function() {
+		return this.WIDTH;
+	};
+
 	AdaptationFilterBar.prototype.applySettings = function() {
 		FilterBarBase.prototype._applySettings.apply(this, arguments);
 		this._waitForAdaptControlAndPropertyHelper().then(function() {

package/src/sap/ui/mdc/filterbar/vh/FilterBar.js

@@ -56,7 +56,7 @@ sap.ui.define(
 		 * The metadata information is provided via the {@link sap.ui.mdc.FilterBarDelegate FilterBarDelegate} implementation. This implementation has to be provided by the application.
 		 * @extends sap.ui.mdc.filterbar.FilterBarBase
 		 * @author SAP SE
-		 * @version 1.111.1
+		 * @version 1.112.0
 		 * @constructor
 		 * @private
 		 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/flexibility/Chart.flexibility.js

@@ -12,7 +12,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.mdc.flexibility.Chart
 	 * @author SAP SE
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 */
 	return {
 		addItem: ChartItemFlex.addItem,

package/src/sap/ui/mdc/flexibility/FilterBar.flexibility.js

@@ -12,7 +12,7 @@ sap.ui.define(['./FilterItemFlex', './ConditionFlex', './PropertyInfoFlex'], fun
 	 *
 	 * @alias sap.ui.mdc.flexibility.FilterBar
 	 * @author SAP SE
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 */
 
 	return {

package/src/sap/ui/mdc/flexibility/FilterItemFlex.js

@@ -12,7 +12,7 @@ sap.ui.define(['./ItemBaseFlex'], function(ItemBaseFlex) {
 	 *
 	 * @alias sap.ui.mdc.flexibility.FilterBar
 	 * @author SAP SE
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 */
 
 	var oFilterItemFlex = Object.assign({}, ItemBaseFlex);

package/src/sap/ui/mdc/flexibility/GroupFlex.js

@@ -6,8 +6,9 @@
 sap.ui.define([
 	"sap/m/p13n/Engine",
 	"sap/ui/mdc/flexibility/Util",
-	"sap/ui/fl/changeHandler/Base"
-], function(Engine, Util, FLChangeHandlerBase) {
+	"sap/ui/fl/changeHandler/Base",
+	"sap/ui/fl/changeHandler/condenser/Classification"
+], function(Engine, Util, FLChangeHandlerBase, CondenserClassification) {
 	"use strict";
 
 	var fRebindControl = function (oControl) {
@@ -146,19 +147,65 @@ sap.ui.define([
 	};
 
 	var Group = {};
-	Group.removeGroup = Util.createChangeHandler({
-		apply: fRemoveGroup,
-		revert: fAddGroup
-	});
-
 	Group.addGroup = Util.createChangeHandler({
 		apply: fAddGroup,
-		revert: fRemoveGroup
+		revert: fRemoveGroup,
+		getCondenserInfo: function(oChange, mPropertyBag) {
+			return {
+				affectedControl: {id: oChange.getContent().name},
+				affectedControlIdProperty: "name",
+				targetContainer: oChange.getSelector(),
+				targetAggregation: "groupLevels",
+				customAggregation: mPropertyBag.modifier.bySelector(oChange.getSelector(), mPropertyBag.appComponent).getGroupConditions().groupLevels,
+				classification: CondenserClassification.Create,
+				setTargetIndex: function(oChange, iNewTargetIndex) {
+					oChange.getContent().index = iNewTargetIndex;
+				},
+				getTargetIndex: function(oChange) {
+					return oChange.getContent().index;
+				}
+			};
+		}
+	});
+
+	Group.removeGroup = Util.createChangeHandler({
+		apply: fRemoveGroup,
+		revert: fAddGroup,
+		getCondenserInfo: function(oChange, mPropertyBag) {
+			return {
+				affectedControl: {id: oChange.getContent().name},
+				affectedControlIdProperty: "name",
+				targetContainer: oChange.getSelector(),
+				targetAggregation: "groupLevels",
+				customAggregation: mPropertyBag.modifier.bySelector(oChange.getSelector(), mPropertyBag.appComponent).getGroupConditions().groupLevels,
+				classification: CondenserClassification.Destroy,
+				sourceIndex: oChange.getRevertData().index
+			};
+		}
 	});
 
 	Group.moveGroup = Util.createChangeHandler({
 		apply: fMoveGroup,
-		revert: fMoveGroup
+		revert: fMoveGroup,
+		getCondenserInfo: function(oChange, mPropertyBag) {
+			return {
+				affectedControl: {id: oChange.getContent().name},
+				affectedControlIdProperty: "name",
+				targetContainer: oChange.getSelector(),
+				targetAggregation: "groupLevels",
+				classification: CondenserClassification.Move,
+				sourceIndex: oChange.getContent().index,
+				customAggregation: mPropertyBag.modifier.bySelector(oChange.getSelector(), mPropertyBag.appComponent).getGroupConditions().groupLevels,
+				sourceContainer: oChange.getSelector(),
+				sourceAggregation: "groupLevels",
+				setTargetIndex: function(oChange, iNewTargetIndex) {
+					oChange.getContent().index = iNewTargetIndex;
+				},
+				getTargetIndex: function(oChange) {
+					return oChange.getContent().index;
+				}
+			};
+		}
 	});
 
 	return Group;