[NUI] Clean NUI codes from Adaptor.cs to Window.cs (#652)

[platform/core/csapi/tizenfx.git] / src / Tizen.NUI / src / internal / Xaml / ApplyPropertiesVisitor.cs

diff --git a/src/Tizen.NUI/src/internal/Xaml/ApplyPropertiesVisitor.cs b/src/Tizen.NUI/src/internal/Xaml/ApplyPropertiesVisitor.cs
index d7302a1..af8a7ad 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Xaml/ApplyPropertiesVisitor.cs
+++ b/src/Tizen.NUI/src/internal/Xaml/ApplyPropertiesVisitor.cs
@@ -100,6 +100,8 @@ namespace Tizen.NUI.Xaml
             if (propertyName != XmlName.Empty || TryGetPropertyName(node, parentNode, out propertyName)) {
                 if (Skips.Contains(propertyName))
                     return;
+                if (parentElement == null)
+                    return;
                 if (parentElement.SkipProperties.Contains(propertyName))
                     return;
 
@@ -234,8 +236,7 @@ namespace Tizen.NUI.Xaml
             if (value.GetType().GetTypeInfo().GetCustomAttribute<AcceptEmptyServiceProviderAttribute>() == null)
                 serviceProvider = new XamlServiceProvider(node, Context);
 
-            if (serviceProvider != null && propertyName != XmlName.Empty)
-            {
+            if (serviceProvider != null && serviceProvider.IProvideValueTarget != null && propertyName != XmlName.Empty) {
                 ((XamlValueTargetProvider)serviceProvider.IProvideValueTarget).TargetProperty = GetTargetProperty(source, propertyName, Context, node);
             }
 
@@ -609,7 +610,7 @@ namespace Tizen.NUI.Xaml
             if (addMethod == null)
                 return false;
 
-            if (serviceProvider != null)
+            if (serviceProvider != null && serviceProvider.IProvideValueTarget != null)
                 ((XamlValueTargetProvider)serviceProvider.IProvideValueTarget).TargetProperty = targetProperty;
 
             addMethod.Invoke(collection, new [] { value.ConvertTo(addMethod.GetParameters() [0].ParameterType, (Func<TypeConverter>)null, serviceProvider) });