jEdit

Revision: 20933
          http://jedit.svn.sourceforge.net/jedit/?rev=20933&view=rev
Author:   kpouer
Date:     2012-01-23 23:26:26 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
fixed error location

Modified Paths:
--------------
    plugins/Checkstyle/trunk/src/com/kpouer/jedit/checkstyle/CheckstyleParse.java

Modified: plugins/Checkstyle/trunk/src/com/kpouer/jedit/checkstyle/CheckstyleParse.java
===================================================================
--- plugins/Checkstyle/trunk/src/com/kpouer/jedit/checkstyle/CheckstyleParse.java	2012-01-23 23:07:02 UTC (rev 20932)
+++ plugins/Checkstyle/trunk/src/com/kpouer/jedit/checkstyle/CheckstyleParse.java	2012-01-23 23:26:26 UTC (rev 20933)
@@ -3,7 +3,7 @@
  * :tabSize=8:indentSize=8:noTabs=false:
  * :folding=explicit:collapseFolds=1:
  *
- * Copyright (C) 2010 Matthieu Casanova
+ * Copyright (C) 2010-2012 Matthieu Casanova
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -36,6 +36,7 @@
 import org.gjt.sp.jedit.syntax.ModeProvider;
 import org.gjt.sp.util.IOUtilities;
 import org.gjt.sp.util.Log;
+import org.gjt.sp.util.Task;
 import org.xml.sax.InputSource;
 
 import javax.swing.text.Segment;
@@ -48,7 +49,7 @@
 /**
  * @author Matthieu Casanova
  */
-public class CheckstyleParse implements Runnable, AuditListener
+public class CheckstyleParse extends Task implements AuditListener
 {
 	private final List<File> file;
 
@@ -216,7 +217,8 @@
 		return getConfiguration(path);
 	}
 
-	public void run()
+	@Override
+	public void _run()
 	{
 		if (file.isEmpty())
 			return;
@@ -237,27 +239,32 @@
 		}
 	}
 
+	@Override
 	public void auditStarted(AuditEvent auditEvent)
 	{
 		segment = new Segment();
 	}
 
+	@Override
 	public void auditFinished(AuditEvent auditEvent)
 	{
 		segment = null;
 	}
 
+	@Override
 	public void fileStarted(AuditEvent auditEvent)
 	{
 		buffer = jEdit.openTemporary(jEdit.getActiveView(), null, auditEvent.getFileName(), false);
 		skip = buffer.isDirty();
 	}
 
+	@Override
 	public void fileFinished(AuditEvent auditEvent)
 	{
 		buffer = null;
 	}
 
+	@Override
 	public void addError(AuditEvent auditEvent)
 	{
 		if (skip)
@@ -279,7 +286,7 @@
 		int start = column == 0 ? 0 : column - 1;
 		int reduce = 0;
 		int lineIndex = line == 0 ? 0 : line - 1;
-		if (buffer != null && buffer.getBooleanProperty("noTabs"))
+		if (buffer != null && !buffer.getBooleanProperty("noTabs"))
 		{
 			int tabSize = buffer.getTabSize();
 			int maxIndent = start % tabSize;
@@ -300,10 +307,11 @@
 				     auditEvent.getFileName(),
 				     lineIndex,
 				     start,
-				     start + 1,
+				     start,
 				     auditEvent.getMessage());
 	}
 
+	@Override
 	public void addException(AuditEvent auditEvent, Throwable throwable)
 	{
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 21140
          http://jedit.svn.sourceforge.net/jedit/?rev=21140&view=rev
Author:   kpouer
Date:     2012-02-17 13:16:45 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
fixed column width with tabs

Modified Paths:
--------------
    plugins/Checkstyle/trunk/src/com/kpouer/jedit/checkstyle/CheckstyleParse.java

Modified: plugins/Checkstyle/trunk/src/com/kpouer/jedit/checkstyle/CheckstyleParse.java
===================================================================
--- plugins/Checkstyle/trunk/src/com/kpouer/jedit/checkstyle/CheckstyleParse.java	2012-02-16 16:31:43 UTC (rev 21139)
+++ plugins/Checkstyle/trunk/src/com/kpouer/jedit/checkstyle/CheckstyleParse.java	2012-02-17 13:16:45 UTC (rev 21140)
@@ -39,7 +39,6 @@
 import org.gjt.sp.util.Task;
 import org.xml.sax.InputSource;
 
-import javax.swing.text.Segment;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -62,8 +61,6 @@
 	 */
 	private boolean skip;
 
-	private Segment segment;
-
 	public CheckstyleParse(Buffer buffer, DefaultErrorSource errorSource)
 	{
 		this.errorSource = errorSource;
@@ -242,13 +239,11 @@
 	@Override
 	public void auditStarted(AuditEvent auditEvent)
 	{
-		segment = new Segment();
 	}
 
 	@Override
 	public void auditFinished(AuditEvent auditEvent)
 	{
-		segment = null;
 	}
 
 	@Override
@@ -283,26 +278,16 @@
 			level = ErrorSource.WARNING;
 		}
 
-		int start = column == 0 ? 0 : column - 1;
-		int reduce = 0;
+		int start;
 		int lineIndex = line == 0 ? 0 : line - 1;
 		if (buffer != null && !buffer.getBooleanProperty("noTabs"))
 		{
-			int tabSize = buffer.getTabSize();
-			int maxIndent = start % tabSize;
-			buffer.getLineText(lineIndex, segment);
-			for (int i = 0; i < segment.length() && maxIndent > 0; i++)
-			{
-				if (segment.charAt(i) == '\t')
-				{
-					maxIndent--;
-					reduce = reduce + tabSize - 1;
-				}
-				else
-					break;
-			}
+			start = buffer.getOffsetOfVirtualColumn(lineIndex, column,  null);
 		}
-		start = Math.max(0, start - reduce);
+		else
+		{
+			start = column == 0 ? 0 : column - 1;
+		}
 		errorSource.addError(level,
 				     auditEvent.getFileName(),
 				     lineIndex,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.