Merge pull request #871 from SlavaRa/feature/refactor_1

elsassph · elsassph · commit 7a7d793a230d · 2015-09-24T13:07:37.000+01:00
Small code cleanup
diff --git a/External/Plugins/AS2Context/PluginMain.cs b/External/Plugins/AS2Context/PluginMain.cs
@@ -108,7 +108,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/ASClassWizard/PluginMain.cs b/External/Plugins/ASClassWizard/PluginMain.cs
@@ -106,7 +106,7 @@ public void Dispose()
             // Nothing here...
         }
         
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             Project project;
             switch (e.Type)
diff --git a/External/Plugins/ASCompletion/PluginMain.cs b/External/Plugins/ASCompletion/PluginMain.cs
@@ -156,7 +156,7 @@ public void Dispose()
         /**
         * Handles the incoming events
         */
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             try
             {
@@ -270,7 +270,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
 
                         if (command.StartsWith("ASCompletion."))
                         {
-                            string cmdData = (de.Data is string) ? (string)de.Data : null;
+                            string cmdData = de.Data as string;
 
                             // add a custom classpath
                             if (command == "ASCompletion.ClassPath")
diff --git a/External/Plugins/AirProperties/PluginMain.cs b/External/Plugins/AirProperties/PluginMain.cs
@@ -121,7 +121,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/BasicCompletion/PluginMain.cs b/External/Plugins/BasicCompletion/PluginMain.cs
@@ -121,7 +121,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             ITabbedDocument document = PluginBase.MainForm.CurrentDocument;
             if (document == null || !document.IsEditable) return;
diff --git a/External/Plugins/BookmarkPanel/PluginMain.cs b/External/Plugins/BookmarkPanel/PluginMain.cs
@@ -103,7 +103,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
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 (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/BridgeSettings/PluginMain.cs b/External/Plugins/BridgeSettings/PluginMain.cs
@@ -103,7 +103,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             // Nothing to do here..
         }
diff --git a/External/Plugins/CodeAnalyzer/PluginMain.cs b/External/Plugins/CodeAnalyzer/PluginMain.cs
@@ -107,7 +107,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/CodeFormatter/InfoCollector/AntlrUtilities.cs b/External/Plugins/CodeFormatter/InfoCollector/AntlrUtilities.cs
@@ -240,7 +240,7 @@ public static List<IToken> getPostHiddenTokens(ParserRuleReturnScope tree, Commo
             if (tree.Tree==null)
             {
                 //I think this only happens with implied semicolons
-                if (tree.Start is CommonToken && tree.Start!=null)
+                if (tree.Start is CommonToken)
                 {
                     //I think we should always be on at least token 1.  
                     IToken currentTok=rawTokens.Get(((CommonToken)tree.Start).TokenIndex);
diff --git a/External/Plugins/CodeFormatter/PluginMain.cs b/External/Plugins/CodeFormatter/PluginMain.cs
@@ -112,7 +112,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/CodeRefactor/PluginMain.cs b/External/Plugins/CodeRefactor/PluginMain.cs
@@ -120,7 +120,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/CssCompletion/PluginMain.cs b/External/Plugins/CssCompletion/PluginMain.cs
@@ -117,7 +117,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             ITabbedDocument document = PluginBase.MainForm.CurrentDocument;
             if (document == null || !document.IsEditable) return;
diff --git a/External/Plugins/DataEncoder/PluginMain.cs b/External/Plugins/DataEncoder/PluginMain.cs
@@ -105,7 +105,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/FileExplorer/PluginMain.cs b/External/Plugins/FileExplorer/PluginMain.cs
@@ -127,7 +127,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/FlashConnect/PluginMain.cs b/External/Plugins/FlashConnect/PluginMain.cs
@@ -109,7 +109,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             // Nothing to do here..
         }
diff --git a/External/Plugins/FlashDebugger/PluginMain.cs b/External/Plugins/FlashDebugger/PluginMain.cs
@@ -117,7 +117,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             if (debugManager == null) return;
             switch (e.Type)
diff --git a/External/Plugins/FlashLogViewer/PluginMain.cs b/External/Plugins/FlashLogViewer/PluginMain.cs
@@ -111,7 +111,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             StartType startType = this.settingObject.TrackingStartType;
             switch (e.Type)
diff --git a/External/Plugins/FlashViewer/PluginMain.cs b/External/Plugins/FlashViewer/PluginMain.cs
@@ -111,7 +111,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/HaXeContext/PluginMain.cs b/External/Plugins/HaXeContext/PluginMain.cs
@@ -110,7 +110,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/LayoutManager/PluginMain.cs b/External/Plugins/LayoutManager/PluginMain.cs
@@ -111,7 +111,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/MacroManager/PluginMain.cs b/External/Plugins/MacroManager/PluginMain.cs
@@ -111,7 +111,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             if (e.Type == EventType.UIStarted)
             {
diff --git a/External/Plugins/OutputPanel/PluginMain.cs b/External/Plugins/OutputPanel/PluginMain.cs
@@ -111,7 +111,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/PHPContext/PluginMain.cs b/External/Plugins/PHPContext/PluginMain.cs
@@ -107,7 +107,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/ResultsPanel/PluginMain.cs b/External/Plugins/ResultsPanel/PluginMain.cs
@@ -115,7 +115,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/SourceControl/PluginMain.cs b/External/Plugins/SourceControl/PluginMain.cs
@@ -109,7 +109,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/StartPage/PluginMain.cs b/External/Plugins/StartPage/PluginMain.cs
@@ -115,7 +115,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/TaskListPanel/PluginMain.cs b/External/Plugins/TaskListPanel/PluginMain.cs
@@ -110,7 +110,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Plugins/TaskListPanel/PluginUI.cs b/External/Plugins/TaskListPanel/PluginUI.cs
@@ -785,7 +785,7 @@ private void ListViewDoubleClick(Object sender, EventArgs e)
         /// <summary>
         /// Handles the internal events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             if (!this.isEnabled) return;
             ITabbedDocument document;
diff --git a/External/Plugins/XMLCompletion/PluginMain.cs b/External/Plugins/XMLCompletion/PluginMain.cs
@@ -103,7 +103,7 @@ public void Dispose()
         /// <summary>
         /// Handles the incoming events
         /// </summary>
-        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)
+        public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
         {
             switch (e.Type)
             {
diff --git a/External/Tools/FDBuild/Mono/GetOptions/OptionDetails.cs b/External/Tools/FDBuild/Mono/GetOptions/OptionDetails.cs
@@ -252,7 +252,7 @@ public override string ToString()
             {
                 string text1;
                 string text2;
-                bool flag1 = (this.LongForm != null) && (this.LongForm != string.Empty);
+                bool flag1 = !string.IsNullOrEmpty(this.LongForm);
                 if (this.OptionBundle.ParsingMode == OptionsParsingMode.Windows)
                 {
                     text2 = "/";
@@ -279,7 +279,7 @@ public override string ToString()
                     this.optionHelp = this.optionHelp + "[+|-]";
                 }
                 this.optionHelp = this.optionHelp + ("\t" + this.ShortDescription);
-                if ((this.AlternateForm != string.Empty) && (this.AlternateForm != null))
+                if (!string.IsNullOrEmpty(this.AlternateForm))
                 {
                     this.optionHelp = this.optionHelp + (" [short form: " + text2 + this.AlternateForm + "]");
                 }
diff --git a/PluginCore/ScintillaNet/Configuration/StyleClass.cs b/PluginCore/ScintillaNet/Configuration/StyleClass.cs
@@ -44,7 +44,7 @@ public StyleClass ParentClass
         {
             get
             {
-                if (inheritstyle != null && !inheritstyle.Equals(""))
+                if (!string.IsNullOrEmpty(inheritstyle))
                 {
                     return _parent.MasterScintilla.GetStyleClass(inheritstyle);
                 }
diff --git a/PluginCore/ScintillaNet/ScintillaControl.cs b/PluginCore/ScintillaNet/ScintillaControl.cs

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public void Dispose()`
`108`	`108`	`/// <summary>`
`109`	`109`	`/// Handles the incoming events`
`110`	`110`	`/// </summary>`
`111`		`- public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)`
	`111`	`+ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)`
`112`	`112`	`{`
`113`	`113`	`switch (e.Type)`
`114`	`114`	`{`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public void Dispose()`
`106`	`106`	`// Nothing here...`
`107`	`107`	`}`
`108`	`108`
`109`		`- public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)`
	`109`	`+ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)`
`110`	`110`	`{`
`111`	`111`	`Project project;`
`112`	`112`	`switch (e.Type)`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public void Dispose()`
`156`	`156`	`/**`
`157`	`157`	`* Handles the incoming events`
`158`	`158`	`*/`
`159`		`- public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)`
	`159`	`+ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)`
`160`	`160`	`{`
`161`	`161`	`try`
`162`	`162`	`{`
`@@ -270,7 +270,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)`
`270`	`270`
`271`	`271`	`if (command.StartsWith("ASCompletion."))`
`272`	`272`	`{`
`273`		`- string cmdData = (de.Data is string) ? (string)de.Data : null;`
	`273`	`+ string cmdData = de.Data as string;`
`274`	`274`
`275`	`275`	`// add a custom classpath`
`276`	`276`	`if (command == "ASCompletion.ClassPath")`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public void Dispose()`
`121`	`121`	`/// <summary>`
`122`	`122`	`/// Handles the incoming events`
`123`	`123`	`/// </summary>`
`124`		`- public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)`
	`124`	`+ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)`
`125`	`125`	`{`
`126`	`126`	`switch (e.Type)`
`127`	`127`	`{`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public void Dispose()`
`103`	`103`	`/// <summary>`
`104`	`104`	`/// Handles the incoming events`
`105`	`105`	`/// </summary>`
`106`		`- public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)`
	`106`	`+ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)`
`107`	`107`	`{`
`108`	`108`	`switch (e.Type)`
`109`	`109`	`{`
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 (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
`@@ -107,7 +107,7 @@ public void Dispose()`
`107`	`107`	`/// <summary>`
`108`	`108`	`/// Handles the incoming events`
`109`	`109`	`/// </summary>`
`110`		`- public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority prority)`
	`110`	`+ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)`
`111`	`111`	`{`
`112`	`112`	`switch (e.Type)`
`113`	`113`	`{`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ public static List<IToken> getPostHiddenTokens(ParserRuleReturnScope tree, Commo`
`240`	`240`	`if (tree.Tree==null)`
`241`	`241`	`{`
`242`	`242`	`//I think this only happens with implied semicolons`
`243`		`- if (tree.Start is CommonToken && tree.Start!=null)`
	`243`	`+ if (tree.Start is CommonToken)`
`244`	`244`	`{`
`245`	`245`	`//I think we should always be on at least token 1.`
`246`	`246`	`IToken currentTok=rawTokens.Get(((CommonToken)tree.Start).TokenIndex);`