From: <iam...@us...> - 2010-03-17 11:48:35
|
Revision: 1328 http://eulergui.svn.sourceforge.net/eulergui/?rev=1328&view=rev Author: iamlolive Date: 2010-03-17 11:48:24 +0000 (Wed, 17 Mar 2010) Log Message: ----------- cursor offset has moved from TextEditor to ResultManagement Modified Paths: -------------- trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java trunk/eulergui/src/main/java/n3_project/ResultManagement.java Modified: trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java =================================================================== --- trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java 2010-03-17 11:21:41 UTC (rev 1327) +++ trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java 2010-03-17 11:48:24 UTC (rev 1328) @@ -136,11 +136,7 @@ } public void setCaretPosition(int line, int col) { - if (line >= 1) - line--; - if (col >= 1) - col--; - + int position = jedit.getLineStartOffset(line) + col; //TODO the parser erroneously places the end of line errors. They are placed at the beginning of the next line. We correct that behaviour (on purpose?) if (col == 0) Modified: trunk/eulergui/src/main/java/n3_project/ResultManagement.java =================================================================== --- trunk/eulergui/src/main/java/n3_project/ResultManagement.java 2010-03-17 11:21:41 UTC (rev 1327) +++ trunk/eulergui/src/main/java/n3_project/ResultManagement.java 2010-03-17 11:48:24 UTC (rev 1328) @@ -212,7 +212,12 @@ String errorMessage = result.getErrorMessage(); int lineNumber = result.getParseResult().getLineNumber(); int columnNumber = result.getParseResult().getColumnNumber(); + if (lineNumber >= 1) + lineNumber--; + if (columnNumber >= 1) + columnNumber--; + TextEditor editor = projectGUI.getEditorManagement().openJavaEditor(source, "(Error at line "+lineNumber+")", true); editor.showError(errorMessage, lineNumber, columnNumber); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |