[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1641] trunk/org.rubypeople.rdt.core/src/org/ rubypeople/rdt/internal/core/builder/RubyCodeAnalyzer.java

[<caw...@us...>]

Revision: 1641
          http://svn.sourceforge.net/rubyeclipse/?rev=1641&view=rev
Author:   cawilliams
Date:     2006-11-01 06:25:30 -0800 (Wed, 01 Nov 2006)

Log Message:
-----------
readContents was dropping end of line characters (it assumed end of line to be \n always) on many files - making offsets of positions off by the line number of the position (only for building)

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RubyCodeAnalyzer.java

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RubyCodeAnalyzer.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RubyCodeAnalyzer.java	2006-11-01 14:23:43 UTC (rev 1640)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RubyCodeAnalyzer.java	2006-11-01 14:25:30 UTC (rev 1641)
@@ -12,7 +12,6 @@
 
 package org.rubypeople.rdt.internal.core.builder;
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -44,7 +43,6 @@
 
     public void compileFile(IFile file) throws CoreException {
         Reader reader = new InputStreamReader(file.getContents());
-        // XXX Make sure readContents isn't dropping end of line characters 
         String contents = readContents(reader);
         markerManager.removeProblemsAndTasksFor(file);
         try {
@@ -62,12 +60,10 @@
 
 	private String readContents(Reader reader) {
 		try {
-			BufferedReader buff = new BufferedReader(reader);
+			int c = 0;
 			StringBuffer str = new StringBuffer();
-			String line;
-			while((line = buff.readLine()) != null) {
-				str.append(line);
-				str.append("\n");
+			while ((c = reader.read()) != -1) {
+				str.append((char) c);
 			}
 			return str.toString();
 		} catch (IOException e) {


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