rhodes 2.3.2 → 2.4.0.beta.1

data/platform/android/build/androidcommon.rb

@@ -39,7 +39,7 @@ def setup_ndk(ndkpath,apilevel)
   $ndktools = nil
   $ndkabi = "unknown"
   $ndkgccver = "unknown"
-  ["arm-eabi-4.4.0", "arm-eabi-4.2.1"].each do |abi|
+  ["arm-linux-androideabi-4.4.3", "arm-eabi-4.4.0", "arm-eabi-4.2.1"].each do |abi|
     variants = []
     variants << File.join(ndkpath, "toolchains", abi, "prebuilt", $ndkhost)
     variants << File.join(ndkpath, "build/prebuilt", $ndkhost, abi)

data/platform/android/build/librhocommon_build.files

@@ -13,6 +13,7 @@ platform/shared/common/RhoThread.cpp
 platform/shared/common/SplashScreen.cpp
 platform/shared/common/ThreadQueue.cpp
 platform/shared/common/Tokenizer.cpp
+platform/shared/common/RhoTime.cpp
 platform/shared/net/AsyncHttp.cpp
 platform/shared/net/CURLNetRequest.cpp
 platform/shared/net/HttpServer.cpp

data/platform/bb/Hsqldb/BlackBerry_App_Descriptor.xml

@@ -0,0 +1,20 @@
+<!-- This file has been generated by the BlackBerry Plugin for Eclipse v3.6.1. -->
+
+<Properties ModelVersion="1.1.2">
+  <General Title="" Version="0.0.1" Vendor="Vendor" Description=""/>
+  <Application Type="Library" MainMIDletName="" MainArgs="" HomeScreenPosition="0" StartupTier="7" IsSystemModule="true" IsAutostartup="false"/>
+  <Resources hasTitleResource="false" TitleResourceBundleName="" TitleResourceBundleRelativePath="" TitleResourceBundleClassName="" TitleResourceBundleKey="" DescriptionId="">
+    <Icons/>
+  </Resources>
+  <Compile OutputCompilerMessages="false" ConvertImages="false" CreateWarningForNoExportedRoutine="true" CompressResources="false" AliasList="">
+    <PreprocessorDefines/>
+  </Compile>
+  <Packaging PreBuildStep="" PostBuildStep="" CleanStep="" OutputFileName="Hsqldb" OutputFolder="deliverables" GenerateALXFile="false">
+    <AlxFiles/>
+  </Packaging>
+  <HiddenProperties>
+    <ClassProtection/>
+    <PackageProtection/>
+  </HiddenProperties>
+  <AlternateEntryPoints/>
+</Properties>

data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java

@@ -196,10 +196,6 @@ public class HsqlDBResult implements IDBResult
     {
     	return m_current == null;
     }
-    public boolean isOneEnd()
-    {
-    	return m_current == null;
-    }
     
     public void next() throws DBException
     {
@@ -261,7 +257,7 @@ public class HsqlDBResult implements IDBResult
         case Types.LONGVARCHAR :
         case Types.CHAR :
         case Types.VARCHAR_IGNORECASE :
-        	return ObjectFactory.createString((String)val);
+        	return ObjectFactory.createString(/*(String)*/val.toString());
         	
         case Types.TINYINT :
         case Types.SMALLINT :

data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java

@@ -155,7 +155,12 @@ public class HsqlDBStorage implements IDBStorage, Session.IDBCallback
 		return new HsqlDBResult();
 	}
 
-	public IDBResult executeSQL(String strStatement, Object[] values, boolean bReportNonUnique)
+	public IDBResult executeSQL(String strStatement, Object[] values, boolean bReportNonUnique)	throws DBException 
+	{
+		return executeSQL(strStatement, values, bReportNonUnique, false);
+	}
+	
+	public IDBResult executeSQL(String strStatement, Object[] values, boolean bReportNonUnique, boolean bNoCopy)
 			throws DBException {
 		
 		try {

data/platform/bb/Hsqldb/src/org/hsqldb/rowio/RowOutputBase.java

@@ -204,7 +204,7 @@ implements RowOutputInterface {
                 case Types.VARCHAR :
                 case Types.VARCHAR_IGNORECASE :
                 case Types.LONGVARCHAR :
-                    writeChar((String) o, t);
+                    writeChar(/*(String)*/ o.toString(), t);
                     break;
 
                 case Types.TINYINT :

data/platform/bb/Hsqldb/src/org/hsqldb/rowio/RowOutputBinary.java

@@ -265,7 +265,7 @@ public class RowOutputBinary extends RowOutputBase {
                     case Types.VARCHAR_IGNORECASE :
                     case Types.LONGVARCHAR :
                         s += 4;
-                        s += StringConverter.getUTFSize((String) o);
+                        s += StringConverter.getUTFSize(o.toString());//(String) o);
                         break;
 
                     case Types.TINYINT :

data/platform/bb/RubyVM/BlackBerry_App_Descriptor.xml

@@ -0,0 +1,20 @@
+<!-- This file has been generated by the BlackBerry Plugin for Eclipse v3.6.1. -->
+
+<Properties ModelVersion="1.1.2">
+  <General Title="" Version="0.0.1" Vendor="Vendor" Description=""/>
+  <Application Type="Library" MainMIDletName="" MainArgs="" HomeScreenPosition="0" StartupTier="7" IsSystemModule="true" IsAutostartup="false"/>
+  <Resources hasTitleResource="false" TitleResourceBundleName="" TitleResourceBundleRelativePath="" TitleResourceBundleClassName="" TitleResourceBundleKey="" DescriptionId="">
+    <Icons/>
+  </Resources>
+  <Compile OutputCompilerMessages="true" ConvertImages="true" CreateWarningForNoExportedRoutine="true" CompressResources="false" AliasList="">
+    <PreprocessorDefines/>
+  </Compile>
+  <Packaging PreBuildStep="" PostBuildStep="" CleanStep="" OutputFileName="RubyVM" OutputFolder="deliverables" GenerateALXFile="false">
+    <AlxFiles/>
+  </Packaging>
+  <HiddenProperties>
+    <ClassProtection/>
+    <PackageProtection/>
+  </HiddenProperties>
+  <AlternateEntryPoints/>
+</Properties>

data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java

@@ -27,6 +27,8 @@ public interface IRhoRubyHelper {
 	public void wakeUpGeoLocation();
 	
 	public NetResponse postUrl(String url, String body);
+	public NetResponse postUrlSync(String url, String body)throws Exception;
+	
 	public void navigateUrl(String url);
 	public void navigateBack();
 	public void app_exit();

data/platform/bb/RubyVM/src/com/rho/RhoLogOutputSink.java

@@ -16,7 +16,6 @@ public class RhoLogOutputSink implements IRhoLogSink {
 	}
 	
 	public int getCurPos() {
-		// TODO Auto-generated method stub
 		return 0;
 	}
 

data/platform/bb/RubyVM/src/com/rho/RhoLogger.java

@@ -171,16 +171,24 @@ public class RhoLogger {
 		if ( bOutputOnly )
 		{
 			System.out.print(m_strMessage);
+			if ( e != null && !(e instanceof com.xruby.runtime.lang.RubyException) )
+			{
+				System.out.print("TRACE: \n");
+				e.printStackTrace();
+			}
 			System.out.flush();
 		}else
 		{
 		    synchronized( m_SinkLock ){
 		    	getLogConf().sinkLogMessage( m_strMessage, bOutputOnly );
-			    if ( (isSimulator() || m_severity == L_FATAL) && e != null ){
-					//TODO: redirect printStackTrace to our log
-					//e.printStackTrace();
-			    }
 		    }
+		    
+		    if ( e != null&& !(e instanceof com.xruby.runtime.lang.RubyException) )
+			{
+				System.out.print("TRACE: \n");
+				e.printStackTrace();
+			}
+			System.out.flush();		    
 		}
 	    if ( m_severity == L_FATAL )
 	    	processFatalError();
@@ -234,12 +242,6 @@ public class RhoLogger {
 	}
 	public void ERROR_OUT(String message,Throwable e) {
 		logMessage( L_ERROR, message, e, true );
-		//System.out.print(m_category + ": " + message + ". " + ( e != null ? e.getClass().getName() : "Exception") + 
-		//		(e != null ? e.getMessage() : "" ) +"\n");
-		if ( e != null )
-			e.printStackTrace();
-		
-		System.out.flush();
 	}
 
 	public void ERROR_EVENT(String message,Throwable e) 

data/platform/bb/RubyVM/src/com/rho/RhoThread.java

@@ -64,6 +64,22 @@ public class RhoThread extends Thread
 			m_nState &= ~TS_STOPPING;
 		}
     }
+
+    public void waitMs(int nTimeoutMs)
+    {
+		synchronized (m_syncObj) {
+			try{
+				m_nState |= TS_WAIT;
+				m_syncObj.wait(nTimeoutMs);
+			}catch(Exception e)
+			{
+				LOG.ERROR("waitMs failed", e);
+			}finally{
+				m_nState &= ~TS_WAIT;
+			}
+		}
+    	
+    }
     
     public void wait(int nTimeout)
     {

data/platform/bb/RubyVM/src/com/rho/RhoTimer.java

@@ -0,0 +1,89 @@
+package com.rho;
+
+import java.util.Vector;
+
+public class RhoTimer {
+
+	class TimerItem
+    {
+        int m_nInterval;
+        TimeInterval m_oFireTime;
+        String m_strCallback;
+        String m_strCallbackData;
+
+        TimerItem(int nInterval, String szCallback, String szCallbackData)
+        {
+        	m_nInterval = nInterval;
+        	m_strCallback = szCallback;
+        	m_strCallbackData = szCallbackData;
+        	m_oFireTime = TimeInterval.getCurrentTime();
+        	m_oFireTime.addMillis(nInterval);
+        }
+    };
+
+    Vector/*<CTimerItem>*/ m_arItems = new Vector();
+    
+    private static RhodesApp RHODESAPP(){ return RhodesApp.getInstance(); }
+    
+    public void addTimer(int nInterval, String szCallback, String szCallbackData)
+    {
+        m_arItems.addElement(new TimerItem(nInterval, szCallback, szCallbackData));
+    }
+    
+    public long getNextTimeout()
+    {
+        if ( m_arItems.size() == 0 )
+            return 0;
+
+        TimeInterval curTime = TimeInterval.getCurrentTime();
+        long nMinInterval = 0xFFFFFFFF;
+
+        for( int i = 0; i < (int)m_arItems.size(); i++ )
+        {
+            long nInterval = 0;
+            if ( ((TimerItem)m_arItems.elementAt(i)).m_oFireTime.toULong() > curTime.toULong() )
+                nInterval = ((TimerItem)m_arItems.elementAt(i)).m_oFireTime.toULong() - curTime.toULong();
+
+            if ( nInterval < nMinInterval )
+                nMinInterval = nInterval;
+        }
+
+        if ( nMinInterval < 100 )
+            nMinInterval = 100;
+
+        return nMinInterval;
+    }
+
+    public boolean checkTimers()
+    {
+        boolean bRet = false;
+        TimeInterval curTime = TimeInterval.getCurrentTime();
+        for( int i = (int)m_arItems.size()-1; i >= 0; i--)
+        {
+            TimerItem oItem = (TimerItem)m_arItems.elementAt(i);
+            if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
+            {
+                m_arItems.removeElementAt(i);
+                if ( RHODESAPP().callTimerCallback(oItem.m_strCallback, oItem.m_strCallbackData) )
+                    bRet = true;
+            }
+        }
+
+        return bRet;
+    }
+
+    public void stopTimer(String szCallback)
+    {
+        if ( szCallback == null || szCallback.length() == 0 )
+            m_arItems.removeAllElements();
+
+        for( int i = (int)m_arItems.size()-1; i >= 0; i--)
+        {
+            TimerItem oItem = (TimerItem)m_arItems.elementAt(i);
+            if ( oItem.m_strCallback.compareTo(szCallback) == 0 )
+            {
+                m_arItems.removeElementAt(i);
+            }
+        }
+    }    
+}

data/platform/bb/RubyVM/src/com/rho/RhodesApp.java

@@ -28,7 +28,9 @@ public class RhodesApp
     
     int m_currentTabIndex = 0;
     String[] m_currentUrls = new String[5];
+    RhoTimer m_oTimer = new RhoTimer();
     
+    public RhoTimer     getTimer(){ return m_oTimer; }
     String getAppBackUrl(){return m_strAppBackUrl;}
 
     public static RhodesApp Create(String strRootPath)
@@ -225,18 +227,6 @@ public class RhodesApp
 
     	try{
 	        m_currentUrls[m_currentTabIndex] = canonicalizeRhoUrl(strUrl);
-	
-	        if ( RHOCONF().getBool("KeepTrackOfLastVisitedPage") )
-	        {
-	            if ( strUrl.startsWith(m_strHomeUrl) )
-	                strUrl = strUrl.substring(m_strHomeUrl.length());
-	
-	            int nFragment = strUrl.indexOf('#');
-	            if ( nFragment >= 0 )
-	                strUrl = strUrl.substring(0, nFragment);
-	
-	            RHOCONF().setString("LastVisitedPage",strUrl, true);		
-	        }
     	}catch(Exception exc)
     	{
     		LOG.ERROR("Save current location failed.", exc);
@@ -308,4 +298,21 @@ public class RhodesApp
     	}
     }
     
-}
+    public boolean callTimerCallback( String strUrl, String strData)
+    {
+        String strBody = "rho_callback=1";
+    		
+        if ( strData != null && strData.length() > 0 )
+            strBody += "&" + strData;
+
+        try
+        {
+	        IRhoRubyHelper helper = RhoClassFactory.createRhoRubyHelper();
+			NetResponse resp = helper.postUrlSync(canonicalizeRhoUrl(strUrl),strBody);
+        }catch(Exception exc)
+        {
+        	LOG.ERROR("callTimerCallback failed.", exc);
+        	return false;
+        }
+        return true;
+    }}

data/platform/bb/RubyVM/src/com/rho/SplashScreen.java

@@ -70,8 +70,7 @@ public class SplashScreen
 				int nEq = tok.indexOf('=');
 				if (nEq>=0)
 				{
-					String val = tok.substring(nEq+1);
-					val.trim();
+					String val = tok.substring(nEq+1).trim();
 					if ( val.length() > 0 )
 						m_nDelay = Integer.parseInt(val);
 				}

data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java

@@ -4,10 +4,10 @@ import j2me.util.LinkedList;
 
 public abstract class ThreadQueue extends RhoThread
 {
-	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
+	private final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
 		new RhoLogger("ThreadQueue");
 	
-	public static void setLogCategory(String category)
+	public void setLogCategory(String category)
 	{
 		LOG.setLogCategory(category);
 	}

data/platform/bb/RubyVM/src/com/rho/TimeInterval.java

@@ -30,6 +30,11 @@ public class TimeInterval
         return res;
     }
 
+    public void addMillis(int nMs)
+    {
+    	m_nativeTime += nMs;
+    }
+    
     public TimeInterval plusAssign(TimeInterval time){
         m_nativeTime += time.m_nativeTime;
         return this;

data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java

@@ -72,8 +72,27 @@ public class DBAdapter extends RubyBasic
 
 	public void executeBatchSQL(String strStatement)throws DBException{
 		LOG.TRACE("executeBatchSQL: " + strStatement);
-		
-		m_dbStorage.executeBatchSQL(strStatement);
+
+		Lock();
+		try{		
+			m_dbStorage.executeBatchSQL(strStatement);
+		}finally
+		{
+			Unlock();
+		}			
+	}
+
+	public IDBResult executeSQL(String strStatement, Object[] values, boolean bNoCopy)throws DBException{
+		LOG.TRACE("executeSQL: " + strStatement);
+		IDBResult res = null;
+		Lock();
+		try{
+			res = m_dbStorage.executeSQL(strStatement,values,false, bNoCopy);
+		}finally
+		{
+			Unlock();
+		}
+		return res;
 	}
 	
 	public IDBResult executeSQL(String strStatement, Object[] values)throws DBException{
@@ -332,8 +351,7 @@ public class DBAdapter extends RubyBasic
 	        int nPos = 0;
 			while (oTokenizer.hasMoreTokens()) 
 	        {
-				String tok = oTokenizer.nextToken();
-				tok.trim();
+				String tok = oTokenizer.nextToken().trim();
 				
 				switch(nPos)
 				{
@@ -508,7 +526,7 @@ public class DBAdapter extends RubyBasic
 					{
 						db.open( m_strDBPath, "", strEncryptionInfo );
 				    	IDBResult res = db.executeSQL("SELECT * FROM client_info", null, false);
-				    	if ( !res.isOneEnd() )
+				    	if ( !res.isEnd() )
 				    	{
 				    		m_strClientInfoInsert = createInsertStatement(res, "client_info");
 				    		m_dataClientInfo = res.getCurData();
@@ -543,7 +561,7 @@ public class DBAdapter extends RubyBasic
 		}
 		
 	}
-	
+/*	
 	static Vector m_dbAdapters = new Vector();
 	
 	public static DBAdapter findDBAdapterByBaseName(String strBaseName)
@@ -576,7 +594,7 @@ public class DBAdapter extends RubyBasic
 			item.commit();
 		}
 	}
-	
+*/	
     private void openDB(String strDBName, boolean bTemp)throws Exception
     {
     	if ( m_bIsOpen )
@@ -595,7 +613,7 @@ public class DBAdapter extends RubyBasic
 		
 		m_dbStorage.setDbCallback(new DBCallback(this));
 		
-		m_dbAdapters.addElement(this);
+		//m_dbAdapters.addElement(this);
 
 	    //copy client_info table
         if ( !bTemp && m_strClientInfoInsert != null && m_strClientInfoInsert.length() > 0 &&
@@ -606,7 +624,7 @@ public class DBAdapter extends RubyBasic
         	m_dbStorage.executeSQL(m_strClientInfoInsert, m_dataClientInfo, false );
         	
             IDBResult res = executeSQL( "SELECT client_id FROM client_info" );
-            if ( !res.isOneEnd() &&  res.getStringByIdx(0).length() > 0 )
+            if ( !res.isEnd() &&  res.getStringByIdx(0).length() > 0 )
             {
                 LOG.INFO("Set reset=1 in client_info");
                 executeSQL( "UPDATE client_info SET reset=1" );
@@ -815,7 +833,7 @@ public class DBAdapter extends RubyBasic
             IDBResult resSrc = executeSQL("SELECT name, schema FROM sources where source_id=?", arSrcID.elementAt(i) );
             boolean bSchemaSource = false;
             String strTableName = "object_values";
-            if ( !resSrc.isOneEnd() )
+            if ( !resSrc.isEnd() )
             {
                 bSchemaSource = resSrc.getStringByIdx(1).length() > 0;
                 if ( bSchemaSource )
@@ -872,11 +890,11 @@ public class DBAdapter extends RubyBasic
                 int nOldSrcID = ((Integer)arOldSrcs.elementAt(i)).intValue();
 
                 IDBResult res = executeSQL("SELECT name from sources WHERE source_id=?", nOldSrcID);
-                if ( !res.isOneEnd() )
+                if ( !res.isEnd() )
                 {
                     String strSrcName = res.getStringByIdx(0);
                     IDBResult res2 = db.executeSQL("SELECT source_id from sources WHERE name=?", strSrcName );
-                    if ( !res2.isOneEnd() )
+                    if ( !res2.isEnd() )
                     {
                         if ( nOldSrcID != res2.getIntByIdx(0) )
                         {
@@ -988,30 +1006,6 @@ public class DBAdapter extends RubyBasic
 		}
     	
     }
-/*    
-    public RubyValue rb_execute(RubyValue v) 
-    {
-    	RubyArray res = new RubyArray(); 
-    	try{
-    		IDBResult rows = executeSQL(v.toStr(), null);
-    		RubyString[] colNames = getColNames(rows);
-    		
-    		for( ; !rows.isEnd(); rows.next() )
-    		{
-    			RubyHash row = ObjectFactory.createHash();
-    			for ( int nCol = 0; nCol < rows.getColCount(); nCol ++ )
-    				row.add( colNames[nCol], rows.getRubyValueByIdx(nCol) );
-    			
-    			res.add( row );
-    		}
-		}catch(Exception e)
-		{
-    		LOG.ERROR("execute failed.", e);
-			throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
-		}
-    	
-        return res;
-    }*/
 
     public RubyValue rb_execute(RubyValue v, RubyValue batch, RubyValue arg) 
     {
@@ -1055,21 +1049,33 @@ public class DBAdapter extends RubyBasic
 		    		}
 	    		}
 	    		
-	    		IDBResult rows = executeSQL( strSql, values);
-	    		RubyString[] colNames = null;
+	    		IDBResult rows = null;
 	    		
-	    		for( ; !rows.isEnd(); rows.next() )
+	    		try
+	    		{
+	    			Lock();
+		    		rows = executeSQL( strSql, values, true);
+		    		RubyString[] colNames = null;
+		    		
+		    		for( ; !rows.isEnd(); rows.next() )
+		    		{
+		    			RubyHash row = ObjectFactory.createHash();
+		    			for ( int nCol = 0; nCol < rows.getColCount(); nCol ++ )
+		    			{
+		    				if ( colNames == null )
+		    					colNames = getOrigColNames(rows);
+		    				
+		    				row.add( colNames[nCol], rows.getRubyValueByIdx(nCol) );
+		    			}
+		    			
+		    			res.add( row );
+		    		}
+	    		}finally
 	    		{
-	    			RubyHash row = ObjectFactory.createHash();
-	    			for ( int nCol = 0; nCol < rows.getColCount(); nCol ++ )
-	    			{
-	    				if ( colNames == null )
-	    					colNames = getOrigColNames(rows);
-	    				
-	    				row.add( colNames[nCol], rows.getRubyValueByIdx(nCol) );
-	    			}
+	    			if ( rows != null )
+	    				rows.close();
 	    			
-	    			res.add( row );
+	    			Unlock();
 	    		}
     		}
 		}catch(Exception e)