[Monodevelop-patches-list] r1472 - trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-04-16 19:05:37 -0400 (Fri, 16 Apr 2004)
New Revision: 1472

Modified:
   trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/ChangeLog
   trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs
Log:
set the column of the error


Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/ChangeLog	2004-04-16 21:58:20 UTC (rev 1471)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/ChangeLog	2004-04-16 23:05:37 UTC (rev 1472)
@@ -3,6 +3,7 @@
 	* JavaBindingCompilerService.cs:
 	rework error parsing to work off of Streams instead of temp files
 	allows javac errors to work, gcj maybe not	
+	set the column of the error
 
 2004-04-09  John Luke  <jluke at cfl.rr.com>
 

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs	2004-04-16 21:58:20 UTC (rev 1471)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs	2004-04-16 23:05:37 UTC (rev 1472)
@@ -185,11 +185,16 @@
 				
 				if (next == null)
 					break;
-				
+
+				CompilerError error = new CompilerError ();
+
+				int errorCol = 0;
+				string col = next.Trim ();
+				if (col.Length ==1 && col == "^")
+					errorCol = next.IndexOf ("^");
+
 				compilerOutput += next + "\n";
-					
-				CompilerError error = new CompilerError();
-				
+
 				int index1 = next.IndexOf(".java:");
 				if (index1 < 0)
 					continue;				
@@ -198,21 +203,19 @@
 				string s2 = next.Substring(index1 + 6);									
 				int index2  = s2.IndexOf(":");				
 				int line = Int32.Parse(next.Substring(index1 + 6,index2));
-					
-//				error.Column = Int32.Parse(pos2[1]);
-//				error.IsWarning   = what[0] == "warning";
-//				error.ErrorNumber = what[what.Length - 1];				
+				//error.IsWarning   = what[0] == "warning";
+				//error.ErrorNumber = what[what.Length - 1];
 								
-				error.Column = 25;
+				error.Column = errorCol;
 				error.Line   	= line;
-				error.ErrorText = next.Substring(index1 + index2 + 7);
-				error.FileName  = Path.GetFullPath(next.Substring(0, index1) + ".java"); //Path.GetFileName(filename);
-				cr.Errors.Add(error);
-				
+				error.ErrorText = next.Substring (index1 + index2 + 7);
+				error.FileName  = Path.GetFullPath (next.Substring (0, index1) + ".java"); //Path.GetFileName(filename);
+				cr.Errors.Add (error);
 			}
-			sr.Close();			
-			return new DefaultCompilerResult(cr, compilerOutput);
 
+			sr.Close ();			
+			return new DefaultCompilerResult (cr, compilerOutput);
 		}
 	}
 }
+