rhodes 3.0.2 → 3.1.0.beta.1

data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java

@@ -1,21 +1,29 @@
-/*
- *  rhodes
- *
- *  Copyright (C) 2008 Rhomobile, Inc. All rights reserved.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rho.sync;
 
 import j2me.util.LinkedList;
@@ -315,6 +323,8 @@ public class SyncThread extends ThreadQueue
 		
 		if ( getSyncEngine().isSyncing() )
 		{
+			LOG.INFO("STOP sync in progress.");
+			
 			getSyncEngine().stopSyncByUser();
 			getInstance().stopWait();
 			
@@ -456,6 +466,18 @@ public class SyncThread extends ThreadQueue
 				return RubyConstant.QNIL;
 			}
 		});
+
+		klass.getSingletonClass().defineMethod("is_syncing", new RubyNoArgMethod() {
+			protected RubyValue run(RubyValue receiver, RubyBlock block) {
+				try{
+					return ObjectFactory.createBoolean( getSyncEngine().isSyncing() );
+				}catch(Exception e)
+				{
+					LOG.ERROR("is_syncing failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
+		});
 		
 		klass.getSingletonClass().defineMethod("login",
 				new RubyVarArgMethod() {

data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyDir.java

@@ -225,7 +225,8 @@ public class RubyDir extends RubyBasic {
     //@RubyLevelMethod(name="mkdir", singleton=true)
     public static RubyValue mkdir(RubyValue receiver, RubyValue arg) {
         String dir = arg.toStr();
-        File file = new File(dir, "rw");
+       	File file = new File(dir + (dir.endsWith("/") ? "" : "/"), "dw");
+        
         if (file.isDirectory() || file.mkdir()) {
             return ObjectFactory.FIXNUM0;
         }

data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyIOFileExecutor.java

@@ -60,15 +60,20 @@ class RubyIOFileExecutor implements RubyIOExecutor {
 			}
             return true;
         } catch (FileNotFoundException e) {
-            return false;
+        	throw new RubyException(RubyRuntime.SystemCallErrorClass, "No such file or directory");
+            //return false;
         } catch (IOException e) {
             file_ = null;
-            return false;
+            throw new RubyException(RubyRuntime.IOErrorClass, e.toString());
+            //return false;
         }
     }
 
     public boolean eof() {
         try {
+        	if (null == file_)
+        		return true;
+        		
             return file_.length() == file_.getFilePointer();
         } catch (IOException e) {
             throw new RubyException(RubyRuntime.IOErrorClass, e.toString());

data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyTime.java

@@ -273,7 +273,7 @@ public class RubyTime extends RubyBasic {
         }
 
         int i = 0;
-        int year = ((RubyFixnum) args.get(i++)).toInt();
+        int year = args.get(i++).toInt();
         int month = 0;
         if ( args.size() > i )
         {
@@ -282,22 +282,52 @@ public class RubyTime extends RubyBasic {
         		month = ((RubyFixnum) mon).toInt();
         	else if ( mon instanceof RubyString )
         	{
-        		String strMon = mon.toStr();
-        		for ( int m = 0; m < month_shorts.length; m++ )
-        			if ( month_shorts[m].equalsIgnoreCase(strMon) )
-        			{
-        				month = m+1;
-        				break;
-        			}
+        		month = -1;
+        		try{
+        			month = mon.toInt();        		
+        		}catch(Exception exc){
+        			
+        		}
+        		
+        		if ( month == -1 )
+        		{
+	        		String strMon = mon.toStr();
+	        		for ( int m = 0; m < month_shorts.length; m++ )
+	        			if ( month_shorts[m].equalsIgnoreCase(strMon) )
+	        			{
+	        				month = m+1;
+	        				break;
+	        			}
+        		}
         	}
         }
         
-        int day = (args.size() <= i) ? 0 : ((RubyFixnum) args.get(i++)).toInt();
-        int hour = (args.size() <= i) ? 0 : ((RubyFixnum) args.get(i++)).toInt();
-        int min = (args.size() <= i) ? 0 : ((RubyFixnum) args.get(i++)).toInt();
-        int sec = (args.size() <= i) ? 0 : ((RubyFixnum) args.get(i++)).toInt();
+        int day = (args.size() <= i) ? 0 : args.get(i++).toInt();
+        int hour = (args.size() <= i) ? 0 : args.get(i++).toInt();
+        int min = (args.size() <= i) ? 0 : args.get(i++).toInt();
+        
+        int sec = 0;
+        int millis = 0;
+        
+        if ( args.size() > i )
+        {
+        	RubyValue sec_fract = args.get(i++);
+        	if ( sec_fract instanceof RubyFixnum)
+        		sec = sec_fract.toInt();
+        	else if ( sec_fract instanceof RubyString )
+        	{
+        		String strSec = sec_fract.toStr();
+        		int nDot = strSec.indexOf('.');
+        		if ( nDot >= 0 )
+        		{
+        			sec = Integer.parseInt(strSec.substring(0, nDot));
+        			millis = Integer.parseInt(strSec.substring(nDot+1));
+        		}else
+        			sec = sec_fract.toInt();
+        	}
+        }
         Calendar calendar = Calendar.getInstance(zone);
-        CalendarMe.set(calendar, year, month - 1, day, hour, min, sec);
+        CalendarMe.set(calendar, year, month - 1, day, hour, min, sec, millis);
         return new RubyTime(calendar);
     }
 

data/platform/bb/RubyVM/src/j2me/lang/ArrayMe.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package j2me.lang;
 
 public class ArrayMe {

data/platform/bb/RubyVM/src/j2me/lang/AssertMe.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package j2me.lang;
 
 public class AssertMe {

data/platform/bb/RubyVM/src/j2me/lang/CalendarMe.java

@@ -1,10 +1,36 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package j2me.lang;
 
 import java.util.Calendar;
 
 public class CalendarMe {
     public static void set(Calendar clndThis, int year, int month, int date, int hourOfDay, int minute,
-            int second)
+            int second, int millis)
 	{
     	clndThis.set(Calendar.YEAR, year);
     	clndThis.set(Calendar.MONTH, month);
@@ -12,6 +38,7 @@ public class CalendarMe {
     	clndThis.set(Calendar.HOUR_OF_DAY, hourOfDay);
     	clndThis.set(Calendar.MINUTE, minute);
     	clndThis.set(Calendar.SECOND, second);
+    	clndThis.set(Calendar.MILLISECOND, millis);
 	}
 
 }

data/platform/bb/RubyVM/src/j2me/lang/CharacterDataLatin1.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package j2me.lang;
 
 import j2me.lang.AssertMe;

data/platform/bb/RubyVM/src/j2me/lang/CharacterMe.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package j2me.lang;
 
 public class CharacterMe {

data/platform/bb/RubyVM/src/j2me/lang/Convert.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package j2me.lang;
 import j2me.math.HugeInt;
 import j2me.lang.ArrayMe;

data/platform/bb/RubyVM/src/j2me/lang/MathEx.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package j2me.lang;
 
 import javolution.lang.MathLib;

data/platform/bb/RubyVM/src/j2me/lang/PrintStreamMe.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package j2me.lang;
 
 import java.io.PrintStream;