[mapguide-commits] r5063 - trunk/Tools/Maestro/Maestro/ResourceEditors

[svn_mapguide at osgeo.org]

Author: jng
Date: 2010-08-03 07:59:30 +0000 (Tue, 03 Aug 2010)
New Revision: 5063

Modified:
   trunk/Tools/Maestro/Maestro/ResourceEditors/XmlEditorControl.cs
Log:
This submission fixes the find functionality (not find and replace) of the XML editor


Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/XmlEditorControl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/XmlEditorControl.cs	2010-07-30 21:28:00 UTC (rev 5062)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/XmlEditorControl.cs	2010-08-03 07:59:30 UTC (rev 5063)
@@ -142,7 +142,7 @@
 				toolStripTextBox_Replace.Text = szReplace;
 
 			if ((!String.IsNullOrEmpty(szFind)) && (!String.IsNullOrEmpty(szReplace)))
-				XML_FindAndReplace_Click( szFind, szReplace, false);
+				XML_FindAndReplace_Click( szFind, szReplace, false, true);
 		}
 
 		public XmlEditorControl(EditorInterface editor)
@@ -807,9 +807,9 @@
 				return;
 			}
 
-			XML_FindAndReplace_Click(szFind, szReplace, true);
+			XML_FindAndReplace_Click(szFind, szReplace, true, true);
 		}
-		public void XML_FindAndReplace_Click( String szFind, String szReplace, bool kFromUI)
+		public void XML_FindAndReplace_Click( String szFind, String szReplace, bool kFromUI, bool replace)
 		{
 			// find start 
 			int iStartSearching = textEditor.SelectionStart;
@@ -840,8 +840,16 @@
 				szFindInstance = szFind;
 			}
 
-            textEditor.Text = textEditor.Text.Replace(szFindInstance, szReplace);
-            String szHighlight = szReplace;
+            String szHighlight = string.Empty;
+            if (replace)
+            {
+                textEditor.Text = textEditor.Text.Replace(szFindInstance, szReplace);
+                szHighlight = szReplace;
+            }
+            else
+            {
+                szHighlight = szFind;
+            }
 
 			int iFound = textEditor.Text.IndexOf(szHighlight, iStartSearching);
 			if (iFound > -1)
@@ -866,7 +874,7 @@
 				return;
 			}
 
-			XML_FindAndReplace_Click(szFind, null, true);
+			XML_FindAndReplace_Click(szFind, null, true, false);
 		}
 	}
 }