Skip to content

Commit

Permalink
Merge "[INTERNAL] sap.ui.fl move FlexInfoSession to initial folder"
Browse files Browse the repository at this point in the history
  • Loading branch information
thuyboehm authored and Gerrit Code Review committed Sep 7, 2023
2 parents fc00bab + a753631 commit db2e26e
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ sap.ui.define([
"sap/ui/fl/apply/_internal/flexState/InitialPrepareFunctions",
"sap/ui/fl/apply/_internal/flexState/Loader",
"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
"sap/ui/fl/write/_internal/FlexInfoSession",
"sap/ui/fl/initial/_internal/FlexInfoSession",
"sap/ui/fl/LayerUtils",
"sap/ui/fl/requireAsync",
"sap/ui/fl/Utils"
Expand Down
8 changes: 4 additions & 4 deletions src/sap.ui.fl/src/sap/ui/fl/initial/_internal/Storage.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ sap.ui.define([
"sap/ui/fl/initial/_internal/StorageUtils",
"sap/ui/fl/initial/_internal/StorageResultMerger",
"sap/ui/fl/initial/_internal/storageResultDisassemble",
"sap/ui/fl/initial/_internal/FlexInfoSession",
"sap/ui/fl/write/api/Version",
"sap/ui/fl/Utils",
"sap/ui/fl/write/_internal/FlexInfoSession"
"sap/ui/fl/Utils"
], function(
StorageUtils,
StorageResultMerger,
storageResultDisassemble,
FlexInfoSession,
Version,
Utils,
FlexInfoSession
Utils
) {
"use strict";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ sap.ui.define([
"sap/ui/fl/initial/_internal/connectors/Utils",
"sap/ui/fl/write/_internal/connectors/Utils",
"sap/base/util/restricted/_pick",
"sap/ui/fl/write/_internal/FlexInfoSession",
"sap/ui/fl/initial/_internal/FlexInfoSession",
"sap/ui/core/BusyIndicator",
"sap/base/Log",
"sap/m/MessageBox"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ sap.ui.define([
"sap/ui/fl/Layer",
"sap/ui/fl/LayerUtils",
"sap/ui/fl/Utils",
"sap/ui/fl/write/_internal/FlexInfoSession",
"sap/ui/fl/initial/_internal/FlexInfoSession",
"sap/ui/fl/write/_internal/flexState/FlexObjectState",
"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sap.ui.define([
"sap/ui/fl/write/_internal/flexState/FlexObjectState",
"sap/ui/fl/write/_internal/Storage",
"sap/ui/fl/write/api/FeaturesAPI",
"sap/ui/fl/write/_internal/FlexInfoSession",
"sap/ui/fl/initial/_internal/FlexInfoSession",
"sap/ui/fl/ChangePersistenceFactory",
"sap/ui/fl/FlexControllerFactory",
"sap/ui/fl/Layer",
Expand Down
2 changes: 1 addition & 1 deletion src/sap.ui.fl/src/sap/ui/fl/write/api/ReloadInfoAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sap.ui.define([
"sap/ui/fl/write/api/FeaturesAPI",
"sap/ui/fl/write/api/PersistenceWriteAPI",
"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
"sap/ui/fl/write/_internal/FlexInfoSession"
"sap/ui/fl/initial/_internal/FlexInfoSession"
], function(
LayerUtils,
Layer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ sap.ui.define([
"sap/ui/fl/apply/_internal/flexState/FlexState",
"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
"sap/ui/fl/initial/_internal/Storage",
"sap/ui/fl/initial/_internal/FlexInfoSession",
"sap/ui/fl/ChangePersistenceFactory",
"sap/ui/fl/FlexControllerFactory",
"sap/ui/fl/Layer",
Expand All @@ -17,7 +18,6 @@ sap.ui.define([
"sap/ui/fl/Utils",
"sap/ui/fl/variants/VariantModel",
"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
"sap/ui/fl/write/_internal/FlexInfoSession",
"sap/ui/fl/write/api/Version",
"sap/ui/fl/write/_internal/flexState/FlexObjectState",
"sap/ui/fl/write/_internal/Storage",
Expand All @@ -34,6 +34,7 @@ sap.ui.define([
FlexState,
ManifestUtils,
InitialStorage,
FlexInfoSession,
ChangePersistenceFactory,
FlexControllerFactory,
Layer,
Expand All @@ -42,7 +43,6 @@ sap.ui.define([
Utils,
VariantModel,
ContextBasedAdaptationsAPI,
FlexInfoSession,
Version,
FlexObjectState,
Storage,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sap.ui.define([
"sap/ui/fl/write/_internal/Storage",
"sap/ui/fl/write/api/FeaturesAPI",
"sap/ui/fl/write/api/PersistenceWriteAPI",
"sap/ui/fl/write/_internal/FlexInfoSession",
"sap/ui/fl/initial/_internal/FlexInfoSession",
"sap/ui/fl/ChangePersistenceFactory",
"sap/ui/fl/ChangePersistence",
"sap/ui/fl/FlexControllerFactory",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
sap.ui.define([
"sap/base/util/UriParameters",
"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
"sap/ui/fl/initial/_internal/FlexInfoSession",
"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
"sap/ui/fl/write/_internal/FlexInfoSession",
"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
"sap/ui/fl/write/api/FeaturesAPI",
"sap/ui/fl/write/api/PersistenceWriteAPI",
"sap/ui/fl/write/api/ReloadInfoAPI",
Expand All @@ -18,9 +17,8 @@ sap.ui.define([
], function(
UriParameters,
ManifestUtils,
CompVariantState,
FlexInfoSession,
ContextBasedAdaptationsAPI,
CompVariantState,
FeaturesAPI,
PersistenceWriteAPI,
ReloadInfoAPI,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sap.ui.define([
"sap/ui/fl/write/api/ControlPersonalizationWriteAPI",
"sap/ui/fl/write/api/FeaturesAPI",
"sap/ui/fl/write/api/TranslationAPI",
"sap/ui/fl/write/_internal/FlexInfoSession",
"sap/ui/fl/initial/_internal/FlexInfoSession",
"sap/ui/fl/Layer",
"sap/ui/fl/Utils",
"sap/ui/rta/appVariant/AppVariantUtils",
Expand Down

0 comments on commit db2e26e

Please sign in to comment.