Replace 'string_value != "" && string_value != null' by '!string.IsNullOrEmpty(string_value)'

SlavaRa · SlavaRa · commit 41405426e51e · 2015-09-01T19:34:29.000+03:00
Replace 'string_value == "" &amp;&amp; string_value == null' by 'string.IsNullOrEmpty(string_value)'
Small cleanup...
diff --git a/External/Plugins/AS3Context/Context.cs b/External/Plugins/AS3Context/Context.cs
@@ -389,7 +389,6 @@ private string MatchPlayerGlobalAny(ref int majorVersion, ref int minorVersion,
         {
             char S = Path.DirectorySeparatorChar;
             string libPlayer = sdkLibs + S + "player";
-            string playerglobal = null;
             for (int i = minorVersion; i >= 0; i--)
             {
                 string version = majorVersion + "." + i;
@@ -399,7 +398,8 @@ private string MatchPlayerGlobalAny(ref int majorVersion, ref int minorVersion,
                     return libPlayer + S + version + S + "playerglobal.swc";
                 }
             }
-            if (playerglobal == null && Directory.Exists(libPlayer + S + majorVersion))
+            string playerglobal = null;
+            if (Directory.Exists(libPlayer + S + majorVersion))
                 playerglobal = "player" + S + majorVersion + S + "playerglobal.swc";
 
             if (playerglobal == null && majorVersion > 9)
@@ -841,7 +841,6 @@ public override bool OnCompletionInsert(ScintillaControl sci, int position, stri
                         return true;
                     }
                 }
-                if (insert == null) return false;
                 if (trigger == '.')
                 {
                     sci.InsertText(position + text.Length, insert.Substring(1));
diff --git a/External/Plugins/ASCompletion/Completion/ASGenerator.cs b/External/Plugins/ASCompletion/Completion/ASGenerator.cs
@@ -1366,7 +1366,7 @@ private static void EventMetatag(ClassModel inClass, ScintillaControl Sci, Membe
             }
             else value = resolve.Member.Type;
 
-            if (value == "" || value == null)
+            if (string.IsNullOrEmpty(value))
                 return;
 
             Regex re1 = new Regex("'(?:[^'\\\\]|(?:\\\\\\\\)|(?:\\\\\\\\)*\\\\.{1})*'");
@@ -3191,7 +3191,7 @@ private static void addTypeOnce(List<string> typesUsed, string qualifiedName)
 
         private static string getQualifiedType(string type, ClassModel aType)
         {
-            if (type == null || type == "") return "*";
+            if (string.IsNullOrEmpty(type)) return "*";
             if (type.IndexOf('<') > 0) // Vector.<Point>
             {
                 Match mGeneric = Regex.Match(type, "<([^>]+)>");
diff --git a/External/Plugins/ASCompletion/Context/ASContext.cs b/External/Plugins/ASCompletion/Context/ASContext.cs
@@ -1557,7 +1557,7 @@ static public string GetLastStringToken(string str, string sep)
         static public void ParseVersion(string version, ref int majorVersion, ref int minorVersion)
         {
             //if (version == "0.0") return;
-            if (version == null || version == "") return;
+            if (string.IsNullOrEmpty(version)) return;
             string[] parts = version.Split('.');
             int.TryParse(parts[0], out majorVersion);
             if (parts.Length > 1) int.TryParse(parts[1], out minorVersion);
diff --git a/External/Plugins/ASCompletion/Model/ASFileParser.cs b/External/Plugins/ASCompletion/Model/ASFileParser.cs
@@ -82,7 +82,7 @@ public static TypeDefinitionKind Parse(string comment, MemberModel model)
         }
         public static TypeDefinitionKind Parse(string comment, MemberModel model, bool detectKindOnly)
         {
-            if (model != null && comment != null && comment != "")
+            if (model != null && !string.IsNullOrEmpty(comment))
             {
                 switch (model.Type)
                 {
@@ -108,7 +108,7 @@ public static TypeDefinitionKind ParseTypedObject(string comment, MemberModel mo
         }
         public static TypeDefinitionKind ParseTypedObject(string comment, MemberModel model, bool detectKindOnly)
         {
-            if (model != null && comment != null && comment != "")
+            if (model != null && !string.IsNullOrEmpty(comment))
             {
                 Match m = ASFileParserRegexes.ValidObjectType.Match(comment);
                 if (m.Success)
@@ -130,7 +130,7 @@ public static TypeDefinitionKind ParseTypedArray(string comment, MemberModel mod
         }
         public static TypeDefinitionKind ParseTypedArray(string comment, MemberModel model, bool detectKindOnly)
         {
-            if (model != null && comment != null && comment != "")
+            if (model != null && !string.IsNullOrEmpty(comment))
             {
                 Match m = ASFileParserRegexes.ValidTypeName.Match(comment);
                 if (m.Success)
@@ -153,7 +153,7 @@ public static TypeDefinitionKind ParseTypedCallback(string comment, MemberModel
         }
         public static TypeDefinitionKind ParseTypedCallback(string comment, MemberModel model, bool detectKindOnly)
         {
-            if (model != null && comment != null && comment != ""
+            if (model != null && !string.IsNullOrEmpty(comment)
                 && (model.Flags & FlagType.Function) == 0)
             {
                 MemberModel fnModel = extractTypedCallbackModel(comment);
diff --git a/External/Plugins/BookmarkPanel/PluginUI.cs b/External/Plugins/BookmarkPanel/PluginUI.cs
@@ -481,7 +481,7 @@ private void UpdateMarkers(String filename)
             ListViewGroup group = this.FindGroup(document.FileName);
             if (group == null) return;
             List<Int32> markers = this.GetMarkers(document.SciControl);
-            if (group != null && this.NeedRefresh(document.SciControl, markers, group.Items))
+            if (this.NeedRefresh(document.SciControl, markers, @group.Items))
             {
                 Int32 index = 0;
                 ListViewItem item;
diff --git a/External/Plugins/CodeAnalyzer/PMDRunner.cs b/External/Plugins/CodeAnalyzer/PMDRunner.cs
@@ -44,7 +44,7 @@ public static void Analyze(String pmdPath, String projectPath, String sourcePath
         private void RunPMD(String pmdPath, String projectPath, String sourcePath, String pmdRuleset)
         {
             String args = "-Xmx256m -jar \"" + pmdPath + "\" -s \"" + sourcePath + "\" -o \"" + projectPath + "\"";
-            if (pmdRuleset != "" && pmdRuleset != null && File.Exists(pmdRuleset)) args += " -r \"" + pmdRuleset + "\"";
+            if (!string.IsNullOrEmpty(pmdRuleset) && File.Exists(pmdRuleset)) args += " -r \"" + pmdRuleset + "\"";
             this.SetStatusText(TextHelper.GetString("Info.RunningFlexPMD"));
             this.pmdRunner = new ProcessRunner();
             this.pmdRunner.ProcessEnded += new ProcessEndedHandler(this.PmdRunnerProcessEnded);
diff --git a/External/Plugins/ProjectManager/Controls/Icons.cs b/External/Plugins/ProjectManager/Controls/Icons.cs
@@ -215,7 +215,7 @@ public static FDImage GetResource(string resourceID)
 
         public static FDImage GetImageForFile(string file)
         {
-            if (file == null || file == string.Empty)
+            if (string.IsNullOrEmpty(file))
                 return BlankFile;
             string ext = Path.GetExtension(file).ToLower();
             if (FileInspector.IsActionScript(file, ext))
diff --git a/External/Plugins/ProjectManager/PluginMain.cs b/External/Plugins/ProjectManager/PluginMain.cs
@@ -742,7 +742,7 @@ public void OpenLastProject()
         {
             // try to open the last opened project
             string lastProject = Settings.LastProject;
-            if (lastProject != null && lastProject != "" && File.Exists(lastProject))
+            if (!string.IsNullOrEmpty(lastProject) && File.Exists(lastProject))
             {
                 SetProject(projectActions.OpenProjectSilent(lastProject), false, true);
             }

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,6 @@ private string MatchPlayerGlobalAny(ref int majorVersion, ref int minorVersion,`
`389`	`389`	`{`
`390`	`390`	`char S = Path.DirectorySeparatorChar;`
`391`	`391`	`string libPlayer = sdkLibs + S + "player";`
`392`		`- string playerglobal = null;`
`393`	`392`	`for (int i = minorVersion; i >= 0; i--)`
`394`	`393`	`{`
`395`	`394`	`string version = majorVersion + "." + i;`
`@@ -399,7 +398,8 @@ private string MatchPlayerGlobalAny(ref int majorVersion, ref int minorVersion,`
`399`	`398`	`return libPlayer + S + version + S + "playerglobal.swc";`
`400`	`399`	`}`
`401`	`400`	`}`
`402`		`- if (playerglobal == null && Directory.Exists(libPlayer + S + majorVersion))`
	`401`	`+ string playerglobal = null;`
	`402`	`+ if (Directory.Exists(libPlayer + S + majorVersion))`
`403`	`403`	`playerglobal = "player" + S + majorVersion + S + "playerglobal.swc";`
`404`	`404`
`405`	`405`	`if (playerglobal == null && majorVersion > 9)`
`@@ -841,7 +841,6 @@ public override bool OnCompletionInsert(ScintillaControl sci, int position, stri`
`841`	`841`	`return true;`
`842`	`842`	`}`
`843`	`843`	`}`
`844`		`- if (insert == null) return false;`
`845`	`844`	`if (trigger == '.')`
`846`	`845`	`{`
`847`	`846`	`sci.InsertText(position + text.Length, insert.Substring(1));`
Original file line number	Diff line number	Diff line change
`@@ -1366,7 +1366,7 @@ private static void EventMetatag(ClassModel inClass, ScintillaControl Sci, Membe`
`1366`	`1366`	`}`
`1367`	`1367`	`else value = resolve.Member.Type;`
`1368`	`1368`
`1369`		`- if (value == "" \|\| value == null)`
	`1369`	`+ if (string.IsNullOrEmpty(value))`
`1370`	`1370`	`return;`
`1371`	`1371`
`1372`	`1372`	`Regex re1 = new Regex("'(?:[^'\\\\]\|(?:\\\\\\\\)\|(?:\\\\\\\\)\\\\.{1})'");`
`@@ -3191,7 +3191,7 @@ private static void addTypeOnce(List<string> typesUsed, string qualifiedName)`
`3191`	`3191`
`3192`	`3192`	`private static string getQualifiedType(string type, ClassModel aType)`
`3193`	`3193`	`{`
`3194`		`- if (type == null \|\| type == "") return "*";`
	`3194`	`+ if (string.IsNullOrEmpty(type)) return "*";`
`3195`	`3195`	`if (type.IndexOf('<') > 0) // Vector.<Point>`
`3196`	`3196`	`{`
`3197`	`3197`	`Match mGeneric = Regex.Match(type, "<([^>]+)>");`
Original file line number	Diff line number	Diff line change
`@@ -1557,7 +1557,7 @@ static public string GetLastStringToken(string str, string sep)`
`1557`	`1557`	`static public void ParseVersion(string version, ref int majorVersion, ref int minorVersion)`
`1558`	`1558`	`{`
`1559`	`1559`	`//if (version == "0.0") return;`
`1560`		`- if (version == null \|\| version == "") return;`
	`1560`	`+ if (string.IsNullOrEmpty(version)) return;`
`1561`	`1561`	`string[] parts = version.Split('.');`
`1562`	`1562`	`int.TryParse(parts[0], out majorVersion);`
`1563`	`1563`	`if (parts.Length > 1) int.TryParse(parts[1], out minorVersion);`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public static TypeDefinitionKind Parse(string comment, MemberModel model)`
`82`	`82`	`}`
`83`	`83`	`public static TypeDefinitionKind Parse(string comment, MemberModel model, bool detectKindOnly)`
`84`	`84`	`{`
`85`		`- if (model != null && comment != null && comment != "")`
	`85`	`+ if (model != null && !string.IsNullOrEmpty(comment))`
`86`	`86`	`{`
`87`	`87`	`switch (model.Type)`
`88`	`88`	`{`
`@@ -108,7 +108,7 @@ public static TypeDefinitionKind ParseTypedObject(string comment, MemberModel mo`
`108`	`108`	`}`
`109`	`109`	`public static TypeDefinitionKind ParseTypedObject(string comment, MemberModel model, bool detectKindOnly)`
`110`	`110`	`{`
`111`		`- if (model != null && comment != null && comment != "")`
	`111`	`+ if (model != null && !string.IsNullOrEmpty(comment))`
`112`	`112`	`{`
`113`	`113`	`Match m = ASFileParserRegexes.ValidObjectType.Match(comment);`
`114`	`114`	`if (m.Success)`
`@@ -130,7 +130,7 @@ public static TypeDefinitionKind ParseTypedArray(string comment, MemberModel mod`
`130`	`130`	`}`
`131`	`131`	`public static TypeDefinitionKind ParseTypedArray(string comment, MemberModel model, bool detectKindOnly)`
`132`	`132`	`{`
`133`		`- if (model != null && comment != null && comment != "")`
	`133`	`+ if (model != null && !string.IsNullOrEmpty(comment))`
`134`	`134`	`{`
`135`	`135`	`Match m = ASFileParserRegexes.ValidTypeName.Match(comment);`
`136`	`136`	`if (m.Success)`
`@@ -153,7 +153,7 @@ public static TypeDefinitionKind ParseTypedCallback(string comment, MemberModel`
`153`	`153`	`}`
`154`	`154`	`public static TypeDefinitionKind ParseTypedCallback(string comment, MemberModel model, bool detectKindOnly)`
`155`	`155`	`{`
`156`		`- if (model != null && comment != null && comment != ""`
	`156`	`+ if (model != null && !string.IsNullOrEmpty(comment)`
`157`	`157`	`&& (model.Flags & FlagType.Function) == 0)`
`158`	`158`	`{`
`159`	`159`	`MemberModel fnModel = extractTypedCallbackModel(comment);`
Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ private void UpdateMarkers(String filename)`
`481`	`481`	`ListViewGroup group = this.FindGroup(document.FileName);`
`482`	`482`	`if (group == null) return;`
`483`	`483`	`List<Int32> markers = this.GetMarkers(document.SciControl);`
`484`		`- if (group != null && this.NeedRefresh(document.SciControl, markers, group.Items))`
	`484`	`+ if (this.NeedRefresh(document.SciControl, markers, @group.Items))`
`485`	`485`	`{`
`486`	`486`	`Int32 index = 0;`
`487`	`487`	`ListViewItem item;`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public static void Analyze(String pmdPath, String projectPath, String sourcePath`
`44`	`44`	`private void RunPMD(String pmdPath, String projectPath, String sourcePath, String pmdRuleset)`
`45`	`45`	`{`
`46`	`46`	`String args = "-Xmx256m -jar \"" + pmdPath + "\" -s \"" + sourcePath + "\" -o \"" + projectPath + "\"";`
`47`		`- if (pmdRuleset != "" && pmdRuleset != null && File.Exists(pmdRuleset)) args += " -r \"" + pmdRuleset + "\"";`
	`47`	`+ if (!string.IsNullOrEmpty(pmdRuleset) && File.Exists(pmdRuleset)) args += " -r \"" + pmdRuleset + "\"";`
`48`	`48`	`this.SetStatusText(TextHelper.GetString("Info.RunningFlexPMD"));`
`49`	`49`	`this.pmdRunner = new ProcessRunner();`
`50`	`50`	`this.pmdRunner.ProcessEnded += new ProcessEndedHandler(this.PmdRunnerProcessEnded);`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ public static FDImage GetResource(string resourceID)`
`215`	`215`
`216`	`216`	`public static FDImage GetImageForFile(string file)`
`217`	`217`	`{`
`218`		`- if (file == null \|\| file == string.Empty)`
	`218`	`+ if (string.IsNullOrEmpty(file))`
`219`	`219`	`return BlankFile;`
`220`	`220`	`string ext = Path.GetExtension(file).ToLower();`
`221`	`221`	`if (FileInspector.IsActionScript(file, ext))`
Original file line number	Diff line number	Diff line change
`@@ -742,7 +742,7 @@ public void OpenLastProject()`
`742`	`742`	`{`
`743`	`743`	`// try to open the last opened project`
`744`	`744`	`string lastProject = Settings.LastProject;`
`745`		`- if (lastProject != null && lastProject != "" && File.Exists(lastProject))`
	`745`	`+ if (!string.IsNullOrEmpty(lastProject) && File.Exists(lastProject))`
`746`	`746`	`{`
`747`	`747`	`SetProject(projectActions.OpenProjectSilent(lastProject), false, true);`
`748`	`748`	`}`