rhodes 2.0.0.beta2 → 2.0.0.beta3

data/platform/shared/rubyJVM/src/com/xruby/GeneratedMethods/RubyFile_Methods.java

@@ -9,6 +9,12 @@ klass.getSingletonClass().defineMethod( "exist?", new RubyOneArgMethod(){
 		return RubyFile.exist_question(receiver, arg);}
 });
 klass.getSingletonClass().aliasMethod("exists?","exist?");
+
+klass.getSingletonClass().defineMethod( "exist_injar?", new RubyOneArgMethod(){ 
+	protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){
+		return RubyFile.existinjar_question(receiver, arg);}
+});
+
 klass.getSingletonClass().defineMethod( "dirname", new RubyOneArgMethod(){ 
 	protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){
 		return RubyFile.dirname(receiver, arg);}

data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyFile.java

@@ -51,13 +51,28 @@ public class RubyFile extends RubyIO {
     ////@RubyLevelMethod(name="exist?", alias="exists?", singleton=true)
     public static RubyValue exist_question(RubyValue receiver, RubyValue arg) {
         String fileName = arg.toStr();
+        boolean bExist = false;
         if ( fileName.startsWith("/apps"))
-        	return ObjectFactory.createBoolean(RhoSupport.findClass(fileName)!=null);
+        	bExist = RhoSupport.findClass(fileName)!=null;
+        
+        if ( !bExist )
+        {        
+        	File file = new File(fileName);
+        	bExist = file.exists();
+        }
+        
+    	return ObjectFactory.createBoolean(bExist);
         
-        File file = new File(fileName);
-        return ObjectFactory.createBoolean(file.exists());
     }
 
+    public static RubyValue existinjar_question(RubyValue receiver, RubyValue arg) 
+    {
+        String fileName = arg.toStr();
+        boolean bExist = RhoSupport.findClass(fileName)!=null;
+    	return ObjectFactory.createBoolean(bExist);
+        
+    }
+    
     ////@RubyLevelMethod(name="directory?", singleton=true)
     public static RubyValue directory_question(RubyValue receiver, RubyValue arg) {
         String fileName = arg.toStr();

data/platform/shared/rubyJVM/src/j2me/io/File.java

@@ -8,6 +8,12 @@
  */
 package j2me.io;
 
+import java.io.IOException;
+
+import com.rho.FilePath;
+import com.rho.RhoClassFactory;
+import com.rho.file.IFileAccess;
+
 import j2me.lang.UnsupportedOperationException;
 
 /**
@@ -47,19 +53,41 @@ public class File {
             return null;
         }
         return _path.substring(0, index);
-        }
-    
-    public boolean exists() {
-        throw new UnsupportedOperationException(
-                "File operations not supported for J2ME build");
     }
 
-    public boolean isDirectory() {
-        throw new UnsupportedOperationException(
-                "File operations not supported for J2ME build");
+    public String getName() 
+    {
+    	if ( _path == null || _path.length() == 0)
+    		return "";
+    	
+        int index = _path.lastIndexOf('/');
+        if ( index < 0 )
+        	index = _path.lastIndexOf('\\');
+
+        if ( index < 0 )
+        	return _path;
+        
+        return _path.substring(index+1, _path.length());
+    }
+    
+    public boolean exists() 
+    {
+    	try
+    	{
+    		String strPath = _path;
+	        if (!strPath.startsWith("file:")) 
+           		strPath = FilePath.join(RhoClassFactory.createFile().getDirPath(""), strPath);
+    		
+	        com.rho.file.IRAFile fs = RhoClassFactory.createFSRAFile();
+	        fs.open(strPath);
+	    	return fs.exists();
+    	}catch(Exception exc)
+    	{
+    		return false;
+    	}
     }
 
-    public String getName() {
+    public boolean isDirectory() {
         throw new UnsupportedOperationException(
                 "File operations not supported for J2ME build");
     }