[Rubyeclipse-commit] org.rubypeople.eclipse.shams/src/org/rubypeople/eclipse/shams/resources ShamFile.java,1.14,1.15 ShamResource.java,1.11,1.12

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.eclipse.shams/src/org/rubypeople/eclipse/shams/resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29270/src/org/rubypeople/eclipse/shams/resources

Modified Files:
	ShamFile.java ShamResource.java 
Log Message:
Incorporate current JRuby head.
Fixed bug in RubySourceFileCollectionVisitor.java that caused NullPointerException.
Fixed bug where UT Failures open up class not method.

Index: ShamFile.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.eclipse.shams/src/org/rubypeople/eclipse/shams/resources/ShamFile.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ShamFile.java	12 Nov 2005 19:16:08 -0000	1.14
--- ShamFile.java	24 Dec 2005 01:43:03 -0000	1.15
***************
*** 25,28 ****
--- 25,29 ----
  import org.eclipse.core.runtime.QualifiedName;
  import org.eclipse.core.runtime.content.IContentDescription;
+ import org.eclipse.core.runtime.content.IContentType;
  
  public class ShamFile extends ShamResource implements IFile {
***************
*** 319,324 ****
  	 */
  	public IContentDescription getContentDescription() throws CoreException {
! 		// TODO Auto-generated method stub
! 		return null;
  	}
  
--- 320,324 ----
  	 */
  	public IContentDescription getContentDescription() throws CoreException {
! 		return new ShamContentDescription();
  	}
  
***************
*** 347,350 ****
--- 347,377 ----
      }
  
+     private final class ShamContentDescription implements IContentDescription {
+         public boolean isRequested(QualifiedName key) {
+             // TODO Auto-generated method stub
+             return false;
+         }
+ 
+         public String getCharset() {
+             // TODO Auto-generated method stub
+             return null;
+         }
+ 
+         public IContentType getContentType() {
+             // TODO Auto-generated method stub
+             return null;
+         }
+ 
+         public Object getProperty(QualifiedName key) {
+             // TODO Auto-generated method stub
+             return null;
+         }
+ 
+         public void setProperty(QualifiedName key, Object value) {
+             // TODO Auto-generated method stub
+             
+         }
+     }
+ 
      private class MonitoredInputStream extends InputStream {
  

Index: ShamResource.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.eclipse.shams/src/org/rubypeople/eclipse/shams/resources/ShamResource.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ShamResource.java	22 Nov 2005 01:23:47 -0000	1.11
--- ShamResource.java	24 Dec 2005 01:43:04 -0000	1.12
***************
*** 11,15 ****
  package org.rubypeople.eclipse.shams.resources;
  
- import java.io.File;
  import java.net.URI;
  
--- 11,14 ----