[NUI] Rollback split-nui (#887)

[platform/core/csapi/tizenfx.git] / src / Tizen.NUI / src / internal / XamlBinding / ObservableWrapper.cs

diff --git a/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ObservableWrapper.cs b/src/Tizen.NUI/src/internal/XamlBinding/ObservableWrapper.cs
similarity index 96%
rename from src/Tizen.NUI.Xaml/src/internal/XamlBinding/ObservableWrapper.cs
rename to src/Tizen.NUI/src/internal/XamlBinding/ObservableWrapper.cs
index e4a057b..2a220ea 100755 (executable)
--- a/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ObservableWrapper.cs
+++ b/src/Tizen.NUI/src/internal/XamlBinding/ObservableWrapper.cs
@@ -5,7 +5,7 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
 
-namespace Tizen.NUI.XamlBinding
+namespace Tizen.NUI.Binding
 {
     internal class ObservableWrapper<TTrack, TRestrict> : IList<TRestrict>, INotifyCollectionChanged where TTrack : Element where TRestrict : TTrack
     {
@@ -160,7 +160,7 @@ namespace Tizen.NUI.XamlBinding
                     if (e.NewStartingIndex == -1 || e.NewItems?.Count > 1)
                         goto case NotifyCollectionChangedAction.Reset;
 
-                    var newItem = e.NewItems[0] as TRestrict;
+                    var newItem = e.NewItems?[0] as TRestrict;
                     if (newItem == null || !newItem.Owned)
                         break;
 
@@ -171,7 +171,7 @@ namespace Tizen.NUI.XamlBinding
                     if (e.NewStartingIndex == -1 || e.OldStartingIndex == -1 || e.NewItems?.Count > 1)
                         goto case NotifyCollectionChangedAction.Reset;
 
-                    var movedItem = e.NewItems[0] as TRestrict;
+                    var movedItem = e.NewItems?[0] as TRestrict;
                     if (movedItem == null || !movedItem.Owned)
                         break;
 
@@ -183,7 +183,7 @@ namespace Tizen.NUI.XamlBinding
                     if (e.OldStartingIndex == -1 || e.OldItems?.Count > 1)
                         goto case NotifyCollectionChangedAction.Reset;
 
-                    var removedItem = e.OldItems[0] as TRestrict;
+                    var removedItem = e.OldItems?[0] as TRestrict;
                     if (removedItem == null || !removedItem.Owned)
                         break;
 
@@ -195,7 +195,7 @@ namespace Tizen.NUI.XamlBinding
                     if (e.NewStartingIndex == -1 || e.OldStartingIndex == -1 || e.NewItems?.Count > 1)
                         goto case NotifyCollectionChangedAction.Reset;
 
-                    var newReplaceItem = e.NewItems[0] as TRestrict;
+                    var newReplaceItem = e.NewItems?[0] as TRestrict;
                     var oldReplaceItem = e.OldItems?[0] as TRestrict;
 
                     if ((newReplaceItem == null || !newReplaceItem.Owned) && (oldReplaceItem == null || !oldReplaceItem.Owned))