rhodes 2.2.6 → 2.3.0.beta.1

data/platform/bb/build/bb.rake

@@ -81,11 +81,49 @@ def startsim(hidden=false)
     args << "/no-guibacklight"
   end
         
-  args << "/app-param=JvmDebugFile:"+Jake.get_absolute($app_config["applog"])
+  args << "/app-param=JvmDebugFile:"+Jake.get_absolute($app_config["applog"]) if $app_config["applog"] && $app_config["applog"].length() > 0
 
   Jake.run2 command, args, {:directory => jde + "/simulator", :nowait => true}
 end
 
+def load_to_sim(is_wait)
+  sim = $config["env"]["paths"][$bbver]["sim"]
+  jde = $config["env"]["paths"][$bbver]["jde"]
+
+  #cod_path = jde + "/simulator" + "/"+$outfilebase+".cod.pending"
+  cod_path = File.join( $targetdir, $outfilebase+".cod.pending")
+
+  puts "cod_path : #{cod_path}"
+  
+  command = jde + "/simulator/fledgecontroller.exe"
+  args = []
+  args << "/session="+sim
+  args << "/execute=LoadCod(\"#{cod_path}\")"
+
+  while(true)  
+    res_line = ""
+    Jake.run2( command, args, {:directory => jde + "/simulator"} ) do |line| 
+      puts "fledgecontroller return:" + line;
+      res_line = line
+    end  
+
+    if res_line && res_line.index("There is no Fledge instance running with session name")    
+      return false unless is_wait
+      puts "wait for simulator..."
+    else
+      break
+    end
+  end
+
+  
+  args = []
+  args << "/session="+sim
+  args << "/execute=LoadCod(\"updates.force\")"
+  Jake.run2 command, args, {:directory => jde + "/simulator", :nowait => true}  
+  
+  return true
+end
+
 def stopsim
   sim = $config["env"]["paths"][$bbver]["sim"]
   jde = $config["env"]["paths"][$bbver]["jde"]
@@ -151,7 +189,15 @@ namespace "config" do
     #$rubypath = "res/build-tools/RhoRuby.exe" #path to RhoRuby
 
     $bbver = $app_config["bbver"].to_s
-    $bb6 = true if $bbver == "6.0"
+    unless $app_config[$current_platform] && $app_config[$current_platform]["ignore_bb6_suffix"]  && $app_config[$current_platform]['ignore_bb6_suffix'].to_s == '1'
+        $bb6 = true if $bbver[0].to_i >= 6
+        
+        puts "use bb6 suffix" if $bb6
+    end    
+    
+    use_sqlite = $app_config[$current_platform] && $app_config[$current_platform]['use_sqlite']  && $app_config[$current_platform]['use_sqlite'].to_s == '1'
+    $use_sqlite = $bbver[0].to_i >= 5 && use_sqlite ? true : false
+    puts "$use_sqlite : #{$use_sqlite}"
     
     $builddir = $config["build"]["bbpath"] + "/build"
     $bindir = $app_path + "/bin"
@@ -249,6 +295,8 @@ namespace "build" do
 	
       ENV["RUBYVM_JAR"] = $preverified+"/RubyVM.jar"	
 
+      ENV["BB_SDK_VERSION"] = $bbver
+
       mkdir_p extensionsdir unless File.directory? extensionsdir
       mkdir_p extensionstmpdir unless File.directory? extensionstmpdir
 
@@ -340,6 +388,7 @@ namespace "build" do
     
     task :devrhobundle => [:set_dev_outname,:rhobundle] do
       cp $preverified + "/RhoBundle.jar", "platform/bb/RhoBundle/RhoBundle.jar"
+	  #cp $preverified + "/RhoBundle.jar", "platform/bb/Rhodes/RhoBundle.jar"
       
       sdcardpath = $config["env"]["paths"][$bbver]["jde"] +"/simulator/sdcard/Rho/rhodes"
       
@@ -404,19 +453,18 @@ namespace "build" do
       $service_enabled = has_push
       create_jarmanifest()
         
-      puts "Modify Capabilities.java"
       $stdout.flush
-      capabilities = File.join($builddir, "..", "..", "..", "platform", "bb", "RubyVM", "src", "com", "rho", "Capabilities.java")
-      File.open(capabilities, 'w') do |f|
-        f.puts "package com.rho;"
-        f.puts ""
-        f.puts "public class Capabilities {"
-        f.puts "  public static final boolean ENABLE_PUSH = #{has_push.to_s};"
-        f.puts "  public static final boolean RUNAS_SERVICE = #{has_push.to_s};"
-        f.puts "}"
-      end
 
+      f = StringIO.new("", "w+")      
+      f.puts "package com.rho;"
+      f.puts ""
+      f.puts "public class Capabilities {"
+      f.puts "  public static final boolean ENABLE_PUSH = #{has_push.to_s};"
+      f.puts "  public static final boolean RUNAS_SERVICE = #{has_push.to_s};"
+      f.puts "  public static final boolean USE_SQLITE = #{$use_sqlite.to_s};"
+      f.puts "}"
 
+      Jake.modify_file_if_content_changed( File.join($builddir, "..", "..", "..", "platform", "bb", "RubyVM", "src", "com", "rho", "Capabilities.java"), f )      
       extentries = []
 
       if $app_config["extensions"]
@@ -441,28 +489,26 @@ namespace "build" do
             end
           end
       end
-        
-      exts = $startdir + "/platform/bb/RubyVM/src/com/rho/Extensions.java"
-
-      File.open(exts, "w") do |f|
-        f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
-        f.puts "// Generated #{Time.now.to_s}"
-        f.puts "package com.rho; "
-        f.puts " "
-        f.puts "public class Extensions {"
-        f.puts " "
-        f.puts "public static String[] extensions = {"
-
-        extentries.each do |entry|
-          f.puts '          "' + entry + '",'
-        end
 
-        f.puts '""'
-        f.puts "};"
-        f.puts " "
-        f.puts "}"
+      f = StringIO.new("", "w+")      
+      f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
+      #f.puts "// Generated #{Time.now.to_s}"
+      f.puts "package com.rho; "
+      f.puts " "
+      f.puts "public class Extensions {"
+      f.puts " "
+      f.puts "public static String[] extensions = {"
+
+      extentries.each do |entry|
+        f.puts '          "' + entry + '",'
       end
 
+      f.puts '""'
+      f.puts "};"
+      f.puts " "
+      f.puts "}"
+      
+      Jake.modify_file_if_content_changed(File.join($startdir,"/platform/bb/RubyVM/src/com/rho/Extensions.java"), f)
 
     end
     
@@ -480,7 +526,7 @@ namespace "build" do
 
 	  
       if not uptodate?($preverified + '/RubyVM.jar',rubyvmfiles)
-
+        puts "**********************Ruby VM is NOT Up to date!"
         mkdir_p $tmpdir + "/RubyVM" if not FileTest.exists? $tmpdir + "/RubyVM"
         mkdir_p  $targetdir if not FileTest.exists?  $targetdir
         mkdir_p  $preverified if not FileTest.exists?  $preverified
@@ -533,7 +579,7 @@ namespace "build" do
       jdehome = $config["env"]["paths"][$bbver]["jde"]
 
       sources = Dir.glob($builddir + "/../rhodes/resources/**/*") |
-      File.readlines($builddir + '/hsqldb_build.files').map { |l| l.strip! } |
+      ($use_sqlite ? [] : File.readlines($builddir + '/hsqldb_build.files').map { |l| l.strip! }) |
       File.readlines($builddir +'/rhodes_build.files').map { |l| l.strip! }
 
       sources.delete(nil)
@@ -592,7 +638,7 @@ namespace "build" do
         args << "-nowarn"
         args << "@#{vsrclist}"
         #args << "@RubyVM_build.files"
-        args << "@#{$builddir}/hsqldb_build.files"
+        args << "@#{$builddir}/hsqldb_build.files" if !$use_sqlite
         args << "@#{$builddir}/rhodes_build.files"
         puts "\texecuting javac"
         puts Jake.run(javac,args)
@@ -814,7 +860,7 @@ namespace "package" do
         $target_sim = true
     end
     
-#   desc "Package all production (all parts in one package) for simulator"
+    desc "Package all production (all parts in one package) for simulator"
     task :production_sim => [:set_simulator, :production] do
     end
 
@@ -898,25 +944,14 @@ namespace "clean" do
   desc "Clean bb"
   task :bb => "clean:bb:all"
   namespace "bb" do
-#    desc "Clean preverified jars"
-    task :preverified => "config:bb" do
-      rm_rf $preverified if File.exists? $preverified
-    end
+    task :all => ["config:bb"] do
 
-#    desc "Clean packaged files"
-    task :packaged => "config:bb" do
-      rm_rf $targetdir +"/../"
-    end
-
-#    desc "Clean temp dir"
-    task :tempdir => "config:bb" do
-      rm_rf $tmpdir
-    end
-
-#    desc "Clean all"
-    task :all => [:preverified,:packaged,:tempdir] do
-      rm_rf $bindir
-      #rm_rf $rhobundledir
+      rm_rf $bindir +"/preverified" if File.exists? $bindir +"/preverified"
+      rm_rf $bindir +"/RhoBundle" if File.exists? $bindir +"/RhoBundle"
+      rm_rf $bindir +"/tmp" if File.exists? $bindir +"/tmp"
+      rm_rf $targetdir if File.exists? $targetdir
+      
+      rm_rf Dir.glob($bindir + "/*.jar")
     end
 
   end
@@ -924,35 +959,42 @@ end
 
 namespace "run" do
   namespace "bb" do
+
       task :stopmdsandsim => ["config:bb"] do
         stopsim  
         stopmds
       end
 
+      task :stopmds => ["config:bb"] do
+        stopmds
+      end
+
 #      desc "Starts mds and sim"
       task :startmdsandsim => ["config:bb"] do
         startmds
         startsim
       end
-      
+
       task :spec => ["run:bb:stopmdsandsim", "clean:bb", "package:bb:production_sim"] do
         jde = $config["env"]["paths"][$bbver]["jde"]
         cp_r File.join($targetdir,"/."), jde + "/simulator"
         rm_rf jde + "/simulator/sdcard/Rho"
-        
-        log_name  = Jake.get_absolute($app_config["applog"] )
-        File.delete(log_name) if File.exist?(log_name)
+
+        log_name = jde + "/simulator/sdcard/Rho/" + $outfilebase + "/RhoLog.txt"
+        puts log_name
+        #log_name  = Jake.get_absolute($app_config["applog"] )
+        #File.delete(log_name) if File.exist?(log_name)
         
         startmds
         startsim(true)
 
         Jake.before_run_spec
         start = Time.now
-      
+
         while !File.exist?(log_name)
             sleep(1)
         end
-        
+
         io = File.new(log_name, "r")
         end_spec = false
         while !end_spec do
@@ -981,16 +1023,52 @@ namespace "run" do
         exit 0
       end
 
+    task :testsim => ["config:bb"] do
+      load_to_sim(false)
+    end
+
+	desc "Start Blackberry simulator"
+    task :startsim => ["config:bb"] do
+      startsim
+    end  
+
+    task :stopmdsandsim_ex => ["config:bb"] do
+        
+        stopsim if $bbver[0].to_i < 5
+
+        stopmds
+    end  
+
   end
-  
+
   desc "Builds everything, loads and starts bb sim and mds"
   task :bb => ["run:bb:stopmdsandsim", "package:bb:production_sim"] do
     jde = $config["env"]["paths"][$bbver]["jde"]
-    
+
     cp_r File.join($targetdir,"/."), jde + "/simulator"
     
     startmds
-    startsim
+    startsim 
+    
+    $stdout.flush
+  end
+
+  desc "Builds everything and loads application on simulator"
+  task :bbapp => ["run:bb:stopmdsandsim_ex", "package:bb:production_sim"] do
+    jde = $config["env"]["paths"][$bbver]["jde"]
+    
+    startmds
+
+    if $bbver[0].to_i < 5
+      cp_r File.join($targetdir,"/."), jde + "/simulator"
+      startsim 
+    elsif !load_to_sim(false)
+      cp_r File.join($targetdir,"/."), jde + "/simulator"
+      
+      startsim 
+      
+    end
+
     $stdout.flush
   end
 

data/platform/bb/build/hsqldb_build.files

@@ -3,12 +3,10 @@ platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java
 platform/bb/Hsqldb/src/com/rho/db/HsqlDBRowResult.java
 platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java
 platform/bb/Hsqldb/src/com/rho/db/Journal.java
-platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java
 platform/bb/Hsqldb/src/j2me/io/BufferedOutputStream.java
 platform/bb/Hsqldb/src/j2me/io/FilterOutputStream.java
 platform/bb/Hsqldb/src/j2me/math/BigDecimal.java
 platform/bb/Hsqldb/src/j2me/math/BigInteger.java
-platform/bb/Hsqldb/src/j2me/math/Number.java
 platform/bb/Hsqldb/src/j2me/sql/Date.java
 platform/bb/Hsqldb/src/j2me/sql/Time.java
 platform/bb/Hsqldb/src/j2me/sql/Timestamp.java

data/platform/bb/build/rhodes_build.files

@@ -35,9 +35,14 @@ platform/bb/rhodes/src/rhomobile/datetime/DateTimeScreen.java
 platform/bb/rhodes/src/rhomobile/RingtoneManager.java
 platform/bb/rhodes/src/rhomobile/NativeBar.java
 platform/bb/rhodes/src/rhomobile/mapview/Annotation.java
+platform/bb/rhodes/src/rhomobile/mapview/ESRIMapField.java
+platform/bb/rhodes/src/rhomobile/mapview/ESRIMapProvider.java
+platform/bb/rhodes/src/rhomobile/mapview/GeoCoding.java
+platform/bb/rhodes/src/rhomobile/mapview/GoogleGeoCoding.java
 platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java
 platform/bb/rhodes/src/rhomobile/mapview/GoogleMapProvider.java
 platform/bb/rhodes/src/rhomobile/mapview/MapProvider.java
+platform/bb/rhodes/src/rhomobile/mapview/MapTools.java
 platform/bb/rhodes/src/rhomobile/mapview/MapView.java
 platform/bb/rhodes/src/rhomobile/mapview/MapViewParent.java
 platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.java

data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java

@@ -1,20 +1,56 @@
 package com.rho;
 
+import rhomobile.RhodesApplication;
 import net.rim.device.api.system.Display;
 import net.rim.device.api.ui.TouchEvent;
 import net.rim.device.api.ui.container.MainScreen;
 
-public abstract class RhoMainScreen extends MainScreen {
+public abstract class RhoMainScreen extends MainScreen 
+{
+	public RhoMainScreen()
+	{
+		super();
+	}
+
+	public RhoMainScreen(long style)
+	{
+		super(style);
+	}
 	
-	protected abstract boolean onTouchUnclick();
+	protected boolean onTouchUnclick(int x, int y){ return false; }
+	protected boolean onTouchClick(int x, int y){ return false; }
+	protected boolean onTouchDown(int x, int y){ return false; }
+	protected boolean onTouchUp(int x, int y){ return false; }
+	protected boolean onTouchMove(int x, int y){ return false; }
 	
 	protected boolean touchEvent(TouchEvent message) {
-		int nEvent = message.getEvent();
+		if ( RhodesApplication.getInstance().isInputDisabled() )
+			return true;
 		
-		if ( nEvent == TouchEvent.UNCLICK )
+		int nEvent = message.getEvent();
+		switch( nEvent )
 		{
-			if ( onTouchUnclick() )
-			    return true;
+		case TouchEvent.CLICK:
+			if ( onTouchClick(message.getX(1), message.getY(1)) )
+				return true;
+			break;
+		case TouchEvent.UNCLICK:
+			if ( onTouchUnclick(message.getX(1), message.getY(1)) )
+				return true;
+			break;
+			
+		case TouchEvent.DOWN:
+			if ( onTouchDown(message.getX(1), message.getY(1)) )
+				return true;
+			break;
+		case TouchEvent.UP:
+			if ( onTouchUp(message.getX(1), message.getY(1)) )
+				return true;
+			break;
+		case TouchEvent.MOVE:
+			if ( onTouchMove(message.getX(1), message.getY(1)) )
+				return true;
+			break;
 		}
 		
 		return super.touchEvent(message);
@@ -26,7 +62,7 @@ public abstract class RhoMainScreen extends MainScreen {
 	    return net.rim.device.api.ui.Touchscreen.isSupported();
 	}
 	
-	protected abstract void onChangeOrientation(int x, int y, int nOrientation);
+	protected void onChangeOrientation(int x, int y, int nOrientation){}
 	protected void sublayout(int arg0, int arg1) 
 	{
 		onChangeOrientation(arg0, arg1, Display.getOrientation()== Display.ORIENTATION_LANDSCAPE ? 1 : 2);

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

@@ -84,10 +84,12 @@ public class BrowserAdapter5 implements IBrowserAdapter
 		m_app = app;
 		
 		m_oConfig = new BrowserFieldConfig();
-		m_oConfig.setProperty( BrowserFieldConfig.NAVIGATION_MODE, BrowserFieldConfig.NAVIGATION_MODE_POINTER );
+//		m_oConfig.setProperty( BrowserFieldConfig.NAVIGATION_MODE, BrowserFieldConfig.NAVIGATION_MODE_POINTER );
 		m_oConfig.setProperty( BrowserFieldConfig.JAVASCRIPT_ENABLED, Boolean.TRUE );
 //		m_oConfig.setProperty( BrowserFieldConfig.NAVIGATION_MODE, BrowserFieldConfig.NAVIGATION_MODE_CARET );
 		m_oConfig.setProperty( BrowserFieldConfig.ENABLE_COOKIES, Boolean.TRUE );
+		
+		m_oConfig.setProperty(BrowserFieldConfig.ALLOW_CS_XHR, Boolean.TRUE);        		
 	}
 
 	public void setFullBrowser()
@@ -125,6 +127,15 @@ public class BrowserAdapter5 implements IBrowserAdapter
 	
     public void processConnection(HttpConnection connection, Object e) 
     {
+    	try
+    	{
+    		if ( connection.getResponseCode() == HttpConnection.HTTP_NOT_MODIFIED )
+    			return;
+    	}catch( java.io.IOException exc)
+    	{
+    		LOG.ERROR("processConnection - getResponseCode failed.", exc);
+    	}
+    	
         synchronized (Application.getEventLock()) 
         {
         	createBrowserField();        	
@@ -137,7 +148,17 @@ public class BrowserAdapter5 implements IBrowserAdapter
         //synchronized (Application.getEventLock()) 
         {
         	BrowserField field = (BrowserField)m_oMainScreen.getField(0);
-        	field.executeScript(strJavascript);
+        	field.executeScript("javascript:" + strJavascript);
+        }
+    }
+    
+    public void setCookie(String url, String cookie)
+    {
+        //synchronized (Application.getEventLock()) 
+        {
+        	BrowserFieldCookieManager man = (BrowserFieldCookieManager)m_oConfig.getProperty(BrowserFieldConfig.COOKIE_MANAGER);
+        	if ( man != null )
+        		man.setCookie(url, cookie);
         }
     }
     

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

@@ -129,6 +129,11 @@ public class RhodesApplicationPlatform extends UiApplication implements PushAppl
 	        
 	        start(epLow);
 		}
+		
+		public void processCommand(IQueueCommand pCmd)
+		{
+			((PushMessageCommand)pCmd).execute();
+		}
 	}
 	
 	public void onMessage(PushInputStream inputStream, StreamConnection conn) 

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

@@ -0,0 +1,143 @@
+package com.rho.db;
+
+//import com.rho.RhoEmptyLogger;
+//import com.rho.RhoLogger;
+import java.util.Vector;
+
+public class SqliteCopyResult// implements IDBResult 
+{
+//	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
+//		new RhoLogger("SqliteCopyResult");
+	
+	Vector m_arRows = new Vector();
+	int m_nCurPos = 0;
+	Vector m_arColumns = new Vector();
+	
+	public SqliteCopyResult( IDBResult res)throws DBException
+	{
+		for( int i = 0; i < res.getColCount(); i++)
+			m_arColumns.addElement(res.getColName(i));
+			
+		for( ; !res.isEnd(); res.next() )
+		{
+			m_arRows.addElement(res.getCurData());
+		}
+	}
+	
+	public void close()
+	{
+		m_arRows = new Vector();
+		m_nCurPos = 0;
+	}
+	
+	public boolean isEnd() 
+	{
+		return m_nCurPos >= m_arRows.size(); 
+	}
+	public boolean isOneEnd() throws DBException
+	{
+		return isEnd();
+	}
+	
+	public void next() throws DBException
+	{
+		m_nCurPos++;
+	}
+	
+	public int getColCount() 
+	{
+		return m_arColumns.size();
+	}
+
+	public String getColName(int nCol) 
+	{
+		return (String)m_arColumns.elementAt(nCol);
+	}
+
+	public String getOrigColName(int nCol) 
+	{
+		return (String)m_arColumns.elementAt(nCol);
+	}
+	
+	public Object[] getCurData() throws DBException 
+	{
+		return (Object[])m_arRows.elementAt(m_nCurPos);
+	}
+
+	public boolean isNonUnique() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+	
+    protected Object getCurValue(int nCol)
+    {
+    	return ((Object[])m_arRows.elementAt(m_nCurPos))[nCol];
+    }
+/*	
+	public boolean isNullByIdx(int nCol)
+	{
+		Object val = getCurValue(nCol);
+		return val == null; 
+	}
+    
+	public String getStringByIdx(int nCol)
+	{
+		Object val = getCurValue(nCol);
+		return val != null ? val.toString() : ""; 
+	}
+	
+	public int getIntByIdx(int nCol)
+	{
+		Object val = getCurValue(nCol);
+		return val != null ? Number.intValue(val) : 0; 
+	}
+	
+	public long getLongByIdx(int nCol)
+	{
+		Object val = getCurValue(nCol);
+		return val != null ? Number.longValue(val) : 0; 
+	}
+	
+	public String getUInt64ByIdx(int nCol)
+	{
+		return getStringByIdx(nCol);
+	}
+    
+	public RubyValue getRubyValueByIdx(int nCol)
+	{ 
+		Object val = getCurValue(nCol);
+		if (val == null)
+			return RubyConstant.QNIL;
+		else if ( val instanceof String)
+			return ObjectFactory.createString((String)val);
+		else if ( val instanceof Integer)
+			return ObjectFactory.createInteger(Number.intValue(val));
+		else if ( val instanceof Short)
+			return ObjectFactory.createInteger(Number.intValue(val));
+		else if ( val instanceof Long)
+			return ObjectFactory.createInteger(Number.longValue(val));
+		else if ( val instanceof Float)
+			return ObjectFactory.createFloat(Number.doubleValue(val));
+		else if ( val instanceof Double)
+			return ObjectFactory.createFloat(Number.doubleValue(val));
+		
+		
+		return ObjectFactory.createString(val.toString());
+	}
+
+	public RubyValue getRubyValue(String colname){ return getRubyValueByIdx( findColIndex(colname) ); }
+	public int getInt(String colname){ return getIntByIdx( findColIndex(colname) ); }
+	public String getString(String colname){return getStringByIdx(findColIndex(colname) );}
+*/
+	int findColIndex(String colname )
+	{
+		for( int i = 0; i < m_arColumns.size(); i++ )
+		{
+			if ( ((String)m_arColumns.elementAt(i)).equalsIgnoreCase(colname) )
+				return i;
+		}
+		
+		return -1;
+	}
+	
+}