[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1873] trunk

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

Revision: 1873
          http://svn.sourceforge.net/rubyeclipse/?rev=1873&view=rev
Author:   cawilliams
Date:     2007-01-24 07:31:18 -0800 (Wed, 24 Jan 2007)

Log Message:
-----------
fix broken test

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

Modified: trunk/org.rubypeople.eclipse.shams/src/org/rubypeople/eclipse/shams/resources/ShamFile.java
===================================================================
--- trunk/org.rubypeople.eclipse.shams/src/org/rubypeople/eclipse/shams/resources/ShamFile.java	2007-01-24 14:50:49 UTC (rev 1872)
+++ trunk/org.rubypeople.eclipse.shams/src/org/rubypeople/eclipse/shams/resources/ShamFile.java	2007-01-24 15:31:18 UTC (rev 1873)
@@ -7,6 +7,7 @@
 import java.io.InputStream;
 import java.io.Reader;
 import java.net.URI;
+import java.nio.charset.Charset;
 
 import junit.framework.Assert;
 
@@ -48,7 +49,7 @@
 	}
 	
 	public String getCharset() throws CoreException {
-		return null;
+		return Charset.defaultCharset().name();
 	}
 
 	public ShamFile(String fullPath, boolean readContentFromFile) {
@@ -312,8 +313,7 @@
 	 * @see org.eclipse.core.resources.IFile#getCharset(boolean)
 	 */
 	public String getCharset(boolean checkImplicit) throws CoreException {
-		// TODO Auto-generated method stub
-		return null;
+		return getCharset();
 	}
 
 	/* (non-Javadoc)

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	2007-01-24 14:50:49 UTC (rev 1872)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RubyCodeAnalyzer.java	2007-01-24 15:31:18 UTC (rev 1873)
@@ -15,6 +15,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
 
 import org.eclipse.core.resources.IFile;
@@ -52,14 +53,14 @@
         String contents = readContents(reader);
         markerManager.removeProblemsAndTasksFor(file);
         try {
-            Node rootNode = parser.parse(file, reader);
+            Node rootNode = parser.parse(file, new StringReader(contents));
             if (rootNode == null) return;            
 			RubyLintVisitor visitor = new RubyLintVisitor(contents, new ProblemRequestorMarkerManager(file, markerManager));
             rootNode.accept(visitor);
             indexUpdater.update(file, rootNode, true);
         } catch (SyntaxException e) {
             // Should we really put a marker here? I think the normal parsing process will create syntax markers just fine
-            //markerManager.createSyntaxError(file, e);
+            markerManager.createSyntaxError(file, e);
         } finally {
             IoUtils.closeQuietly(reader);
         }


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