Fix for empty lang.Text

juileetikekar · juileetikekar · commit 82752edf9777 · 2024-06-03T13:55:08.000+02:00
diff --git a/src/AasxPackageLogic/EmptyListVisitor.cs b/src/AasxPackageLogic/EmptyListVisitor.cs
@@ -903,14 +903,14 @@ public override IClass TransformLangStringDefinitionTypeIec61360(ILangStringDefi
         {
             if (that != null)
             {
-                if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
+                if (!string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
                 {
-                    that = null;
+                    that.Text = "EMPTY";
                 }
-                
-                if (string.IsNullOrEmpty(that.Text))
+
+                if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
                 {
-                    that.Text = "EMPTY";
+                    that = null;
                 }
             }
             return that;
@@ -920,14 +920,14 @@ public override IClass TransformLangStringNameType(ILangStringNameType that)
         {
             if(that != null)
             {
-                if(string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
+                if (!string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
                 {
-                    that = null;
+                    that.Text = "EMPTY";
                 }
 
-                if (string.IsNullOrEmpty(that.Text))
+                if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
                 {
-                    that.Text = "EMPTY";
+                    that = null;
                 }
             }
             return that;
@@ -937,14 +937,14 @@ public override IClass TransformLangStringPreferredNameTypeIec61360(ILangStringP
         {
             if (that != null)
             {
-                if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
+                if (!string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
                 {
-                    that = null;
+                    that.Text = "EMPTY";
                 }
 
-                if (string.IsNullOrEmpty(that.Text))
+                if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
                 {
-                    that.Text = "EMPTY";
+                    that = null;
                 }
             }
             return that;
@@ -954,14 +954,14 @@ public override IClass TransformLangStringShortNameTypeIec61360(ILangStringShort
         {
             if (that != null)
             {
-                if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
+                if (!string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
                 {
-                    that = null;
+                    that.Text = "EMPTY";
                 }
 
-                if (string.IsNullOrEmpty(that.Text))
+                if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
                 {
-                    that.Text = "EMPTY";
+                    that = null;
                 }
             }
             return that;
@@ -971,14 +971,14 @@ public override IClass TransformLangStringTextType(ILangStringTextType that)
         {
             if (that != null)
             {
-                if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
+                if (!string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
                 {
-                    that = null;
+                    that.Text = "EMPTY";
                 }
 
-                if (string.IsNullOrEmpty(that.Text))
+                if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))
                 {
-                    that.Text = "EMPTY";
+                    that = null;
                 }
             }
             return that;

Original file line number	Diff line number	Diff line change
`@@ -903,14 +903,14 @@ public override IClass TransformLangStringDefinitionTypeIec61360(ILangStringDefi`
`903`	`903`	`{`
`904`	`904`	`if (that != null)`
`905`	`905`	`{`
`906`		`- if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
	`906`	`+ if (!string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
`907`	`907`	`{`
`908`		`- that = null;`
	`908`	`+ that.Text = "EMPTY";`
`909`	`909`	`}`
`910`		`-`
`911`		`- if (string.IsNullOrEmpty(that.Text))`
	`910`	`+`
	`911`	`+ if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
`912`	`912`	`{`
`913`		`- that.Text = "EMPTY";`
	`913`	`+ that = null;`
`914`	`914`	`}`
`915`	`915`	`}`
`916`	`916`	`return that;`
`@@ -920,14 +920,14 @@ public override IClass TransformLangStringNameType(ILangStringNameType that)`
`920`	`920`	`{`
`921`	`921`	`if(that != null)`
`922`	`922`	`{`
`923`		`- if(string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
	`923`	`+ if (!string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
`924`	`924`	`{`
`925`		`- that = null;`
	`925`	`+ that.Text = "EMPTY";`
`926`	`926`	`}`
`927`	`927`
`928`		`- if (string.IsNullOrEmpty(that.Text))`
	`928`	`+ if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
`929`	`929`	`{`
`930`		`- that.Text = "EMPTY";`
	`930`	`+ that = null;`
`931`	`931`	`}`
`932`	`932`	`}`
`933`	`933`	`return that;`
`@@ -937,14 +937,14 @@ public override IClass TransformLangStringPreferredNameTypeIec61360(ILangStringP`
`937`	`937`	`{`
`938`	`938`	`if (that != null)`
`939`	`939`	`{`
`940`		`- if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
	`940`	`+ if (!string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
`941`	`941`	`{`
`942`		`- that = null;`
	`942`	`+ that.Text = "EMPTY";`
`943`	`943`	`}`
`944`	`944`
`945`		`- if (string.IsNullOrEmpty(that.Text))`
	`945`	`+ if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
`946`	`946`	`{`
`947`		`- that.Text = "EMPTY";`
	`947`	`+ that = null;`
`948`	`948`	`}`
`949`	`949`	`}`
`950`	`950`	`return that;`
`@@ -954,14 +954,14 @@ public override IClass TransformLangStringShortNameTypeIec61360(ILangStringShort`
`954`	`954`	`{`
`955`	`955`	`if (that != null)`
`956`	`956`	`{`
`957`		`- if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
	`957`	`+ if (!string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
`958`	`958`	`{`
`959`		`- that = null;`
	`959`	`+ that.Text = "EMPTY";`
`960`	`960`	`}`
`961`	`961`
`962`		`- if (string.IsNullOrEmpty(that.Text))`
	`962`	`+ if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
`963`	`963`	`{`
`964`		`- that.Text = "EMPTY";`
	`964`	`+ that = null;`
`965`	`965`	`}`
`966`	`966`	`}`
`967`	`967`	`return that;`
`@@ -971,14 +971,14 @@ public override IClass TransformLangStringTextType(ILangStringTextType that)`
`971`	`971`	`{`
`972`	`972`	`if (that != null)`
`973`	`973`	`{`
`974`		`- if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
	`974`	`+ if (!string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
`975`	`975`	`{`
`976`		`- that = null;`
	`976`	`+ that.Text = "EMPTY";`
`977`	`977`	`}`
`978`	`978`
`979`		`- if (string.IsNullOrEmpty(that.Text))`
	`979`	`+ if (string.IsNullOrEmpty(that.Language) && string.IsNullOrEmpty(that.Text))`
`980`	`980`	`{`
`981`		`- that.Text = "EMPTY";`
	`981`	`+ that = null;`
`982`	`982`	`}`
`983`	`983`	`}`
`984`	`984`	`return that;`