Changeset 867

Timestamp:

May 9, 2013, 12:37:17 PM (12 years ago)

Author:

s10k

Message:

xmlTools: 0.8f nows checks for empty strings and null string to avoid problems like the one fixed on 0.8e

Location:

xmlTools/trunk/posUpdate

Files:

• ParametersParser.cs (modified) (3 diffs)
• Program.cs (modified) (1 diff)
• XmlPatch.cs (modified) (8 diffs)
• XmlTools.cs (modified) (9 diffs)

xmlTools/trunk/posUpdate/ParametersParser.cs

@@ -107 +107 @@
             foreach (string currentFile in filesToProcess)
             {
-                if (valPositions != null)
+                if (!String.IsNullOrEmpty(valPositions))
                 {
                     myTools.replaceAll(currentFile, value, valPositions);
@@ -130 +130 @@
             XmlPatch myPatch;
 
-            if (forceInFiles != "")
+            if (!String.IsNullOrEmpty(forceInFiles))
             {
                 myPatch = new XmlPatch(globalFileName, forceInFiles, globalNoBackups);
@@ -196 +196 @@
             List<String> filesToProccess = new List<String>();
 
-            if (filename == "") // No filename? Process everything xml file found.
+            if (String.IsNullOrEmpty(filename)) // No filename? Process everything xml file found.
             {
                 List<string> allXmlFiles = Util.getAllXmlFiles();

xmlTools/trunk/posUpdate/Program.cs

@@ -11 +11 @@
     class Program
     {
-        public static readonly string toolsVersion = "0.8e";
+        public static readonly string toolsVersion = "0.8f";
         private static appErrors lastError = appErrors.NO_ERROR;
 

xmlTools/trunk/posUpdate/XmlPatch.cs

@@ -96 +96 @@
             try
             {
-                if (forceFiles == null)
+                if (String.IsNullOrEmpty(forceFiles))
                 {
                     File = getPatchParameter(operation, "File");
@@ -115 +115 @@
             }
 
-            if (Element == "")
+            if (String.IsNullOrEmpty(Element))
             {
                 return false;
@@ -122 +122 @@
             //---------------------------------------------------Parse Operation command (end)
             List<String> filesToProcess = new List<String>();
-            if (File == "")
+            if (String.IsNullOrEmpty(File))
             {
                 filesToProcess = Util.getAllXmlFiles(); //no file specified, use all xml files found in same folder
@@ -188 +188 @@
             try
             {
-                if (forceFiles == null)
+                if (String.IsNullOrEmpty(forceFiles))
                 {
                     File = getPatchParameter(operation, "File");
@@ -207 +207 @@
             }
 
-            if (Element == "")
+            if (String.IsNullOrEmpty(Element))
             {
                 return false;
@@ -215 +215 @@
 
             List<String> filesToProcess = new List<String>();
-            if (File == "")
+            if (String.IsNullOrEmpty(File))
             {
                 filesToProcess = Util.getAllXmlFiles(); //no file specified, use all xml files found in same folder
@@ -272 +272 @@
             command = command.Replace("@COMMAND ", ""); //get only the command to process
 
-            if (command.Trim() == "")
+            if (String.IsNullOrEmpty(command.Trim()))
             {
                 Program.printAppError(Program.appErrors.PATCH_COMMAND_NOT_FOUND, "Error parsing commandOperation in Patch file: Command is empty.");
@@ -299 +299 @@
                     }
 
-                    if (paramType != "")
+                    if (!String.IsNullOrEmpty(paramType))
                     {
                         int startIdx = command.IndexOf(paramType) + paramType.Length;

xmlTools/trunk/posUpdate/XmlTools.cs

@@ -41 +41 @@
             Util.getAllSpecificElements(xdoc.DocumentElement, ref myElements, this.posElement, this.posParentElement); //Returns all after "Oni" element
 
-            if (valuePositions != "")
+            if (!String.IsNullOrEmpty(valuePositions))
             {
                 checkValidSpecificPositions(valuePositions, value, myElements[0].InnerText);
@@ -50 +50 @@
                 if (element.Name == posElement)
                 {
-                    if (posParentElement != "" && element.ParentNode.Name != posParentElement)
+                    if (!String.IsNullOrEmpty(posParentElement) && element.ParentNode.Name != posParentElement)
                     {
                         continue;
                     }
-                    if (valuePositions == "") //replace every value for the new
+                    if (String.IsNullOrEmpty(valuePositions)) //replace every value for the new
                     {
                         element.InnerText = value;
@@ -91 +91 @@
                 if (element.Name == posElement)
                 {
-                    if (posParentElement != "" && element.ParentNode.Name != posParentElement)
+                    if (!String.IsNullOrEmpty(posParentElement) && element.ParentNode.Name != posParentElement)
                     {
                         continue;
@@ -141 +141 @@
                 if (element.Name == posElement)
                 {
-                    if (posParentElement != "" && element.ParentNode.Name != posParentElement)
+                    if (!String.IsNullOrEmpty(posParentElement) && element.ParentNode.Name != posParentElement)
                     {
                         continue;
@@ -185 +185 @@
                 if (element.Name == posElement)
                 {
-                    if (posParentElement != "" && element.ParentNode.Name != posParentElement)
+                    if (!String.IsNullOrEmpty(posParentElement) && element.ParentNode.Name != posParentElement)
                     {
                         continue;
@@ -230 +230 @@
             Util.getAllSpecificElements(xdoc.DocumentElement, ref myElements, this.posElement, this.posParentElement); //Returns all after "Oni" element
 
-            if (valuePositions == null)
+            if (String.IsNullOrEmpty(valuePositions))
             {
                 newXmlLastPos = new XmlNumberValue(newValue);
@@ -239 +239 @@
             }
 
-            if (valuePositions != null)
+            if (!String.IsNullOrEmpty(valuePositions))
             {
                 checkValidSpecificPositions(valuePositions, newValue, myElements[0].InnerText);
@@ -246 +246 @@
             foreach (XmlNode element in myElements)
             {
-                if (element.Name == this.posElement && (this.posParentElement == "" || this.posParentElement == element.ParentNode.Name))
+                if (element.Name == this.posElement && (String.IsNullOrEmpty(this.posParentElement) || this.posParentElement == element.ParentNode.Name))
                 {
                     XmlNumberValue xmlCurrValue = new XmlNumberValue(element.InnerText);
 
-                    if (xmlLastPos != null)
+                    if (xmlLastPos!=null)
                     {
                         newXmlLastPos = XmlNumberValue.sum(newXmlLastPos, XmlNumberValue.difference(xmlCurrValue, xmlLastPos));
@@ -258 +258 @@
                     else
                     { // first time just assign to last value
-                        if (valueRelation != null)
+                        if (!String.IsNullOrEmpty(valueRelation))
                         {
                             newXmlLastPos = XmlNumberValue.difference(newXmlLastPos, XmlNumberValue.difference(new XmlNumberValue(valueRelation), xmlCurrValue));