rhodes 2.3.2 → 2.4.0.beta.1

data/platform/bb/rhodes/BlackBerry_App_Descriptor.xml

@@ -0,0 +1,23 @@
+<!-- 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="BlackBerry Application" MainMIDletName="" MainArgs="" HomeScreenPosition="0" StartupTier="7" IsSystemModule="false" IsAutostartup="false"/>
+  <Resources hasTitleResource="false" TitleResourceBundleName="" TitleResourceBundleRelativePath="" TitleResourceBundleClassName="" TitleResourceBundleKey="" DescriptionId="">
+    <Icons>
+      <Icon CanonicalFileName="resources/icon.png" IsFocus="true"/>
+      <Icon CanonicalFileName="resources/mappin.png" IsFocus="false"/>
+    </Icons>
+  </Resources>
+  <Compile OutputCompilerMessages="false" ConvertImages="true" CreateWarningForNoExportedRoutine="true" CompressResources="false" AliasList="">
+    <PreprocessorDefines/>
+  </Compile>
+  <Packaging PreBuildStep="" PostBuildStep="" CleanStep="" OutputFileName="rhodes" OutputFolder="deliverables" GenerateALXFile="true">
+    <AlxFiles/>
+  </Packaging>
+  <HiddenProperties>
+    <ClassProtection/>
+    <PackageProtection/>
+  </HiddenProperties>
+  <AlternateEntryPoints/>
+</Properties>

data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java

@@ -125,7 +125,7 @@ public class RhodesApplicationPlatform extends UiApplication implements PushAppl
 		{
 			super(new RhoClassFactory());
 			
-	        ThreadQueue.setLogCategory(LOG.getLogCategory());
+	        super.setLogCategory(LOG.getLogCategory());
 
 	        setPollInterval(QUEUE_POLL_INTERVAL_INFINITE);
 	        

data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteCopyResult.java

@@ -34,10 +34,6 @@ public class SqliteCopyResult// implements IDBResult
 	{
 		return m_nCurPos >= m_arRows.size(); 
 	}
-	public boolean isOneEnd() throws DBException
-	{
-		return isEnd();
-	}
 	
 	public void next() throws DBException
 	{

data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteResult.java

@@ -32,7 +32,7 @@ public class SqliteResult implements IDBResult
 		return m_bNonUnique;
 	}
 	
-	SqliteResult( Statement st, boolean bCachedStatement )throws DatabaseException
+	SqliteResult( Statement st, boolean bCachedStatement, boolean bNoCopy )throws DatabaseException, DBException
 	{
 		m_st = st;
 		m_bCachedStatement = bCachedStatement;
@@ -42,7 +42,14 @@ public class SqliteResult implements IDBResult
 			if ( m_cursor == null )
 				close();
 			else
+			{
 				reset();
+				if (!bNoCopy)
+				{
+					m_resCopy = new SqliteCopyResult(this);
+					close();					
+				}
+			}
 		}
 	}
 	
@@ -86,33 +93,19 @@ public class SqliteResult implements IDBResult
 	
 	public boolean isEnd() 
 	{
-		if ( m_row == null )
-		{
-			close();
-			return true;
-		}
+		if ( m_resCopy != null )
+			return m_resCopy.isEnd();
 		
 		return m_row == null;
 	}
 
-	public boolean isOneEnd() throws DBException 
-	{
-		if ( m_row == null )
-		{
-			close();
-			return true;
-		}
-		
-		if (m_resCopy == null )
-			m_resCopy = new SqliteCopyResult(this);
-		
-		return false;
-	}
-	
 	public void next() throws DBException
 	{
 		if ( m_resCopy != null )
+		{
 			m_resCopy.next();
+			return;
+		}
 		
 		try
 		{

data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteStorage.java

@@ -2,8 +2,8 @@ package com.rho.db;
 
 import j2me.lang.CharacterMe;
 
-import com.rho.AppBuildConfig;
-import com.rho.RhoConf;
+//import com.rho.AppBuildConfig;
+//import com.rho.RhoConf;
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;
 import com.rho.file.*;
@@ -11,8 +11,8 @@ import com.rho.file.*;
 import net.rim.device.api.io.URI;
 import net.rim.device.api.database.*;
 import java.util.Vector;
-import java.util.Hashtable;
-import java.util.Enumeration;
+//import java.util.Hashtable;
+//import java.util.Enumeration;
 
 public class SqliteStorage implements IDBStorage 
 {
@@ -70,131 +70,143 @@ public class SqliteStorage implements IDBStorage
 		
 	}
 
+	IDBResult executeSQL(String strStatement, Object[] values) throws DBException 
+	{
+		return executeSQL(strStatement, values, false, false); 
+	}
+	
+	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) throws DBException 
+			boolean bReportNonUnique, boolean bNoCopy) throws DBException 
 	{
 		//LOG.INFO(strStatement);// + "; Values: " + values);
-		
-		if ( m_db == null )
-			throw new RuntimeException("executeSQL: m_db == null");
-
-		IDBResult res = null;
-		
-		String strStatementOrig = strStatement;
-		
-		try
+		synchronized(m_db)
 		{
-			while( strStatement != null && strStatement.length()> 0)
+			if ( m_db == null )
+				throw new RuntimeException("executeSQL: m_db == null");
+	
+			IDBResult res = null;
+			
+			String strStatementOrig = strStatement;
+			
+			try
 			{
-	            int start = 0;
-	            while ( start < strStatement.length() && (strStatement.charAt(start) == '\n' ||
-	            		strStatement.charAt(start) == '\r' ||
-	            		strStatement.charAt(start) == ';' ||
-	            		CharacterMe.isWhitespace(strStatement.charAt(start) ) ) )
-	            		start++;
-	            if (start > 0 )
-	            	strStatement = strStatement.substring(start);
-	            	
-				if ( strStatement == null || start >= strStatement.length() )
-					break;
-				
-				String strCommand = strStatement.length() > 6 ? strStatement.substring(0, 6) : ""; 
-				boolean bSelect = strCommand.equalsIgnoreCase("SELECT") || strCommand.equalsIgnoreCase("PRAGMA");
-				
-				Statement st = null;//(Statement)m_mapStatements.get(strStatement);
-				boolean bCachedStatement = st != null;
-				if ( st == null )
-					st = m_db.createStatement(strStatement);
-				
-				boolean bDontCloseStatement = false;
-				try
+				while( strStatement != null && strStatement.length()> 0)
 				{
-					if ( !bCachedStatement )
-					{
-						st.prepare();
-	                	strStatement = st.getTail();
-	                	
-	                	/*if ( strStatement == null || strStatement.length() == 0 )
-	                	{
-	                		m_mapStatements.put(strStatementOrig, st);
-	                		bCachedStatement = true;
-	                	}*/
-	                	
-					}else
-						strStatement = "";
+		            int start = 0;
+		            while ( start < strStatement.length() && (strStatement.charAt(start) == '\n' ||
+		            		strStatement.charAt(start) == '\r' ||
+		            		strStatement.charAt(start) == ';' ||
+		            		CharacterMe.isWhitespace(strStatement.charAt(start) ) ) )
+		            		start++;
+		            if (start > 0 )
+		            	strStatement = strStatement.substring(start);
+		            	
+					if ( strStatement == null || start >= strStatement.length() )
+						break;
 					
-					for ( int i = 0; values != null && i < values.length; i++ )
-					{
-						bindObject(st, i+1, values[i]);
-					}
+					String strCommand = strStatement.length() > 6 ? strStatement.substring(0, 6) : ""; 
+					boolean bSelect = strCommand.equalsIgnoreCase("SELECT") || strCommand.equalsIgnoreCase("PRAGMA");
 					
-					if ( bSelect )
-					{
-		                if ( res == null )
-		                {
-		                	res = new SqliteResult(st, bCachedStatement);
-		                	bDontCloseStatement = true;
-		                }
-					}else
+					Statement st = null;//(Statement)m_mapStatements.get(strStatement);
+					boolean bCachedStatement = st != null;
+					if ( st == null )
+						st = m_db.createStatement(strStatement);
+					
+					boolean bDontCloseStatement = false;
+					try
 					{
-						try
+						if ( !bCachedStatement )
 						{
-							//LOG.INFO("START execute");
-							st.execute();
-							//LOG.INFO("END execute");
-							
-							if ( /*strCommand.equalsIgnoreCase("INSERT")||*/ strCommand.equalsIgnoreCase("DELETE") ||
-								 strCommand.equalsIgnoreCase("UPDATE")  )
+							st.prepare();
+		                	strStatement = st.getTail();
+		                	
+		                	/*if ( strStatement == null || strStatement.length() == 0 )
+		                	{
+		                		m_mapStatements.put(strStatementOrig, st);
+		                		bCachedStatement = true;
+		                	}*/
+		                	
+						}else
+							strStatement = "";
+						
+						for ( int i = 0; values != null && i < values.length; i++ )
+						{
+							bindObject(st, i+1, values[i]);
+						}
+						
+						if ( bSelect )
+						{
+			                if ( res == null )
+			                {
+			                	res = new SqliteResult(st, bCachedStatement, bNoCopy);
+			                	bDontCloseStatement = true;
+			                }
+						}else
+						{
+							try
 							{
-								if ( m_nInsideTransaction == 0 )
-									processCallbackData();
+								//LOG.INFO("START execute");
+								st.execute();
+								//LOG.INFO("END execute");
+								
+								if ( /*strCommand.equalsIgnoreCase("INSERT")||*/ strCommand.equalsIgnoreCase("DELETE") ||
+									 strCommand.equalsIgnoreCase("UPDATE")  )
+								{
+									if ( m_nInsideTransaction == 0 )
+										processCallbackData();
+									else
+										m_bNeedProcessCallback = true;
+								}
+								
+							}catch(DatabaseException exc)
+							{
+								if ( res == null && bReportNonUnique && exc.getMessage().indexOf("constraint failed") >= 0)
+									res = new SqliteResult(true);
 								else
-									m_bNeedProcessCallback = true;
+									throw exc;
 							}
 							
-						}catch(DatabaseException exc)
-						{
-							if ( res == null && bReportNonUnique && exc.getMessage().indexOf("constraint failed") >= 0)
-								res = new SqliteResult(true);
-							else
-								throw exc;
+		                	if ( res == null )
+		                		res = new SqliteResult(null, false, false);
 						}
 						
-	                	if ( res == null )
-	                		res = new SqliteResult(null, false);
-					}
-					
-				}finally
-				{
-					if ( !bDontCloseStatement )
+					}finally
 					{
-						if ( bCachedStatement )
+						if ( !bDontCloseStatement )
 						{
-							//LOG.INFO("START reset");							
-							st.reset();
-							//LOG.INFO("END reset");
+							if ( bCachedStatement )
+							{
+								//LOG.INFO("START reset");							
+								st.reset();
+								//LOG.INFO("END reset");
+							}
+							else
+								st.close();
 						}
-						else
-							st.close();
+						
+						st = null;
 					}
-					
-					st = null;
 				}
+			}catch(DatabaseException exc )
+			{
+				LOG.ERROR("executeSQL failed. Statement: " + strStatementOrig, exc);
+				throw new DBException(exc);
 			}
-		}catch(DatabaseException exc )
-		{
-			LOG.ERROR("executeSQL failed. Statement: " + strStatementOrig, exc);
-			throw new DBException(exc);
+			
+			//LOG.INFO("executeSQL END");
+			return res;
 		}
-		
-		//LOG.INFO("executeSQL END");
-		return res;
 	}
 
 	public boolean isTableExists(String strName)throws DBException
 	{
 		Object vals[] = {strName};
-		IDBResult res = executeSQL("SELECT name FROM sqlite_master WHERE type='table' AND name=?", vals, false );
+		IDBResult res = executeSQL("SELECT name FROM sqlite_master WHERE type='table' AND name=?", vals );
 		boolean bRes = !res.isEnd();
 		res.close();
 		
@@ -203,7 +215,7 @@ public class SqliteStorage implements IDBStorage
 	
 	public String[] getAllTableNames() throws DBException 
 	{
-		IDBResult res = executeSQL("SELECT name FROM sqlite_master WHERE type='table'", null ,false );
+		IDBResult res = executeSQL("SELECT name FROM sqlite_master WHERE type='table'", null );
 		
 		Vector arTables = new Vector();
 	    for ( ; !res.isEnd(); res.next() )
@@ -237,7 +249,7 @@ public class SqliteStorage implements IDBStorage
 	
 	public void executeBatchSQL(String strSqlScript)throws DBException
 	{
-		executeSQL(strSqlScript, null, false);
+		executeSQL(strSqlScript, null);
 	}
 	
 	public static void OnInsertObjectRecord(Object NEW_source_id, Object NEW_attrib )
@@ -295,20 +307,24 @@ public class SqliteStorage implements IDBStorage
 		}
 	}
 
-	public void startTransaction() throws DBException {
-		try{
-			//LOG.INFO("startTransaction START");
-			if ( m_db == null )
-				m_bPendingTransaction = true;
-			else
-				m_db.beginTransaction();
-			
-			m_nInsideTransaction++;
-			m_bNeedProcessCallback = false;
-			
-			//LOG.INFO("startTransaction END");
-		}catch(DatabaseException exc ){
-			throw new DBException(exc);
+	public void startTransaction() throws DBException 
+	{
+		synchronized(m_db)
+		{
+			try{
+				//LOG.INFO("startTransaction START");
+				if ( m_db == null )
+					m_bPendingTransaction = true;
+				else
+					m_db.beginTransaction();
+				
+				m_nInsideTransaction++;
+				m_bNeedProcessCallback = false;
+				
+				//LOG.INFO("startTransaction END");
+			}catch(DatabaseException exc ){
+				throw new DBException(exc);
+			}
 		}
 	}
 	
@@ -322,57 +338,67 @@ public class SqliteStorage implements IDBStorage
 		//LOG.INFO("onBeforeCommit END");
 	}
 	
-	public void commit() throws DBException {
-		try{
-			//LOG.INFO("commit START");
-			if ( m_db!= null )
-				m_db.commitTransaction();
-			//LOG.INFO("commit END");
-		}catch(DatabaseException exc ){
-			throw new DBException(exc);
-		}finally
+	public void commit() throws DBException 
+	{
+		synchronized(m_db)
 		{
-			if ( m_nInsideTransaction > 0 )
-				m_nInsideTransaction--;
+			try{
+				//LOG.INFO("commit START");
+				if ( m_db!= null )
+					m_db.commitTransaction();
+				//LOG.INFO("commit END");
+			}catch(DatabaseException exc ){
+				throw new DBException(exc);
+			}finally
+			{
+				if ( m_nInsideTransaction > 0 )
+					m_nInsideTransaction--;
+			}
 		}
 	}
 	
 	public void rollback() throws DBException 
 	{
-		try{
-			if ( m_db!= null )
-				m_db.rollbackTransaction();
-		}catch(DatabaseException exc ){
-			throw new DBException(exc);
-		}finally
+		synchronized(m_db)
 		{
-			if ( m_nInsideTransaction > 0 )
-				m_nInsideTransaction--;
+			try{
+				if ( m_db!= null )
+					m_db.rollbackTransaction();
+			}catch(DatabaseException exc ){
+				throw new DBException(exc);
+			}finally
+			{
+				if ( m_nInsideTransaction > 0 )
+					m_nInsideTransaction--;
+			}
 		}
 	}
 
 	public void close() throws DBException 
 	{
-		try
+		synchronized(m_db)
 		{
-			/*Enumeration values = m_mapStatements.elements();
-			while( values.hasMoreElements() )
+			try
 			{
-				Statement st = (Statement)values.nextElement();
-				try{
-					if ( st != null )
-						st.close();
-				}catch( DatabaseException exc  )
+				/*Enumeration values = m_mapStatements.elements();
+				while( values.hasMoreElements() )
 				{
-					LOG.ERROR("close statement failed.", exc);
-				}
-			}*/
-			if ( m_db!= null )
-				m_db.close();
-			
-			m_db = null;
-		}catch(DatabaseException exc ){
-			throw new DBException(exc);
+					Statement st = (Statement)values.nextElement();
+					try{
+						if ( st != null )
+							st.close();
+					}catch( DatabaseException exc  )
+					{
+						LOG.ERROR("close statement failed.", exc);
+					}
+				}*/
+				if ( m_db!= null )
+					m_db.close();
+				
+				m_db = null;
+			}catch(DatabaseException exc ){
+				throw new DBException(exc);
+			}
 		}
 	}
 	
@@ -401,7 +427,7 @@ public class SqliteStorage implements IDBStorage
 		}*/
 		
 		{
-			IDBResult rows2Delete = executeSQL("SELECT * FROM object_attribs_to_delete", null, false);
+			IDBResult rows2Delete = executeSQL("SELECT * FROM object_attribs_to_delete", null);
 			if ( rows2Delete == null || rows2Delete.isEnd() )
 			{
 				if (rows2Delete != null)
@@ -412,7 +438,7 @@ public class SqliteStorage implements IDBStorage
 				
 				m_nInsideTransaction++;
 				try{
-					executeSQL("DELETE FROM object_attribs_to_delete", null, false);
+					executeSQL("DELETE FROM object_attribs_to_delete", null);
 				}finally
 				{
 					m_nInsideTransaction--;
@@ -421,7 +447,7 @@ public class SqliteStorage implements IDBStorage
 		}
 		
 		{
-			IDBResult rows2Update = executeSQL("SELECT * FROM object_attribs_to_update", null, false);
+			IDBResult rows2Update = executeSQL("SELECT * FROM object_attribs_to_update", null);
 			if ( rows2Update == null || rows2Update.isEnd() )
 			{
 				if (rows2Update != null)
@@ -433,7 +459,7 @@ public class SqliteStorage implements IDBStorage
 				
 				m_nInsideTransaction++;
 				try{
-					executeSQL("DELETE FROM object_attribs_to_update", null, false);
+					executeSQL("DELETE FROM object_attribs_to_update", null);
 				}finally
 				{
 					m_nInsideTransaction--;