[NUI] fix SVACE issues 2nd trial (#263)

diff --git a/src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs b/src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs
index 4db5ce2..70ef16b 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs
+++ b/src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs
@@ -66,7 +66,7 @@ namespace Tizen.NUI.Xaml
                        else if (!type.GetTypeInfo().DeclaredConstructors.Any(ci => ci.IsPublic && ci.GetParameters().Length == 0) &&
                                 !ValidateCtorArguments(type, node, out ctorargname))
                        {
-                               throw new XamlParseException($"The Property {ctorargname} is required to create a {type.FullName} object.", node);
+                               throw new XamlParseException($"The Property {ctorargname} is required to create a {type?.FullName} object.", node);
                        }
                        else
                        {

diff --git a/src/Tizen.NUI/src/internal/Xaml/MarkupExtensionParser.cs b/src/Tizen.NUI/src/internal/Xaml/MarkupExtensionParser.cs
index 16ad97d..46f4c53 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Xaml/MarkupExtensionParser.cs
+++ b/src/Tizen.NUI/src/internal/Xaml/MarkupExtensionParser.cs
@@ -75,7 +75,7 @@ namespace Tizen.NUI.Xaml
                                        (Func<TypeConverter>)null, serviceProvider);
                        }
 
-                       setter.Invoke(markupExtension, new[] { value });
+                       setter?.Invoke(markupExtension, new[] { value });
                }
        }
 }
\ No newline at end of file

diff --git a/src/Tizen.NUI/src/internal/Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Tizen.NUI/src/internal/Xaml/MarkupExtensions/StaticResourceExtension.cs
index 089395d..39d7e55 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Xaml/MarkupExtensions/StaticResourceExtension.cs
+++ b/src/Tizen.NUI/src/internal/Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -69,7 +69,7 @@ namespace Tizen.NUI.Xaml
                                if (opImplicit != null) {
                                        //convert the OnPlatform<T> to T
                                        var opPlatformImplicitConversionOperator = resource.GetType().GetImplicitConversionOperator(fromType: resource.GetType(), toType: tType);
-                                       resource = opPlatformImplicitConversionOperator.Invoke(null, new[] { resource });
+                                       resource = opPlatformImplicitConversionOperator?.Invoke(null, new[] { resource });
 
                                        //and convert to toType
                                        resource = opImplicit.Invoke(null, new[] { resource });

diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/EventTrigger.cs b/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/EventTrigger.cs
index 0363f6a..1a9cd29 100755 (executable)
--- a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/EventTrigger.cs
+++ b/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/EventTrigger.cs
@@ -65,7 +65,7 @@ namespace Tizen.NUI.Binding
                        try
                        {
                                _eventinfo = bindable.GetType().GetRuntimeEvent(Event);
-                               _handlerdelegate = s_handlerinfo.CreateDelegate(_eventinfo.EventHandlerType, this);
+                               _handlerdelegate = s_handlerinfo.CreateDelegate(_eventinfo?.EventHandlerType, this);
                        }
                        catch (Exception)
                        {

diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ObservableWrapper.cs b/src/Tizen.NUI/src/internal/XamlBinding/ObservableWrapper.cs
index f2abf9a..41d9742 100755 (executable)
--- a/src/Tizen.NUI/src/internal/XamlBinding/ObservableWrapper.cs
+++ b/src/Tizen.NUI/src/internal/XamlBinding/ObservableWrapper.cs
@@ -180,7 +180,7 @@ namespace Tizen.NUI.Binding
                                        handler(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Move, e.NewItems, outerNewIndex, outerOldIndex));
                                        break;
                                case NotifyCollectionChangedAction.Remove:
-                                       if (e.OldStartingIndex == -1 || e.OldItems.Count > 1)
+                                       if (e.OldStartingIndex == -1 || e.OldItems?.Count > 1)
                                                goto case NotifyCollectionChangedAction.Reset;
 
                                        var removedItem = e.OldItems[0] as TRestrict;
@@ -192,11 +192,11 @@ namespace Tizen.NUI.Binding
                                        handler(this, args);
                                        break;
                                case NotifyCollectionChangedAction.Replace:
-                                       if (e.NewStartingIndex == -1 || e.OldStartingIndex == -1 || e.NewItems.Count > 1)
+                                       if (e.NewStartingIndex == -1 || e.OldStartingIndex == -1 || e.NewItems?.Count > 1)
                                                goto case NotifyCollectionChangedAction.Reset;
 
                                        var newReplaceItem = e.NewItems[0] as TRestrict;
-                                       var oldReplaceItem = e.OldItems[0] as TRestrict;
+                                       var oldReplaceItem = e.OldItems?[0] as TRestrict;
 
                                        if ((newReplaceItem == null || !newReplaceItem.Owned) && (oldReplaceItem == null || !oldReplaceItem.Owned))
                                        {

diff --git a/src/Tizen.NUI/src/public/CustomViewRegistry.cs b/src/Tizen.NUI/src/public/CustomViewRegistry.cs
index 812c1c5..58292f7 100755 (executable)
--- a/src/Tizen.NUI/src/public/CustomViewRegistry.cs
+++ b/src/Tizen.NUI/src/public/CustomViewRegistry.cs
@@ -229,7 +229,14 @@ namespace Tizen.NUI
             {
                 // Create the control
                 CustomView newControl = controlConstructor();
-                return newControl.GetPtrfromView();  // return pointer to handle
+                if (newControl != null)
+                {
+                    return newControl.GetPtrfromView();  // return pointer to handle
+                }
+                else
+                {
+                    return IntPtr.Zero;
+                }
             }
             else
             {
@@ -461,23 +468,23 @@ namespace Tizen.NUI
                 {
                     PropertyMap map = new PropertyMap();
                     ok = propValue.Get(map);
-                    if( ok )
+                    if (ok)
                     {
-                        propertyInfo.SetValue( view, map );
+                        propertyInfo.SetValue(view, map);
                     }
                 }
                 else if (type.Equals(typeof(PropertyArray)))
                 {
                     PropertyArray array = new PropertyArray();
                     ok = propValue.Get(array);
-                    if( ok )
+                    if (ok)
                     {
-                        propertyInfo.SetValue( view, array );
+                        propertyInfo.SetValue(view, array);
                     }
                 }
                 else
                 {
-                    throw new global::System.InvalidOperationException("SetPropertyValue Unimplemented type for Property Value for " + type.FullName );
+                    throw new global::System.InvalidOperationException("SetPropertyValue Unimplemented type for Property Value for " + type.FullName);
                 }
                 if (!ok)
                 {

diff --git a/src/Tizen.NUI/src/public/XamlBinding/Element.cs b/src/Tizen.NUI/src/public/XamlBinding/Element.cs
index 4f2f9d0..e1e2f95 100755 (executable)
--- a/src/Tizen.NUI/src/public/XamlBinding/Element.cs
+++ b/src/Tizen.NUI/src/public/XamlBinding/Element.cs
@@ -233,7 +233,7 @@ namespace Tizen.NUI.Binding
                                RealParent = value;
                                if (RealParent != null)
                                {
-                                       OnParentResourcesChanged(RealParent.GetMergedResources());
+                                       OnParentResourcesChanged(RealParent?.GetMergedResources());
                                        ((IElement)RealParent).AddResourcesChangedListener(OnParentResourcesChanged);
                                }