rhodes 1.5.5 → 2.0.0.beta1

data/platform/bb/Hsqldb/src/org/hsqldb/scriptio/ScriptReaderText.java

@@ -32,7 +32,7 @@
 package org.hsqldb.scriptio;
 
 import java.io.IOException;
-import com.rho.db.RandomAccessFile;
+import com.rho.file.RandomAccessFile;
 
 import org.hsqldb.Database;
 import org.hsqldb.HsqlException;

data/platform/bb/Hsqldb/src/org/hsqldb/scriptio/ScriptWriterBase.java

@@ -32,7 +32,7 @@
 package org.hsqldb.scriptio;
 
 //import java.io.BufferedOutputStream;
-import com.rho.db.RandomAccessFile;
+import com.rho.file.RandomAccessFile;
 
 import java.io.IOException;
 //import java.io.OutputStream;

data/platform/bb/RubyVM/RubyVM.jdp

@@ -22,16 +22,18 @@ AutoRestart=0
 ExcludeFromBuildAll=0
 [Files
 ..\..\shared\rubyJVM\src\com\rho\DateTimeTokenizer.java
+..\..\shared\rubyJVM\src\com\rho\FilePath.java
 ..\..\shared\rubyJVM\src\com\rho\db\DBAdapter.java
 ..\..\shared\rubyJVM\src\com\rho\db\DBAttrManager.java
 ..\..\shared\rubyJVM\src\com\rho\db\DBException.java
 ..\..\shared\rubyJVM\src\com\rho\db\IDBCallback.java
 ..\..\shared\rubyJVM\src\com\rho\db\IDBResult.java
 ..\..\shared\rubyJVM\src\com\rho\db\IDBStorage.java
-..\..\shared\rubyJVM\src\com\rho\FilePath.java
-..\..\shared\rubyJVM\src\com\rho\IFile.java
-..\..\shared\rubyJVM\src\com\rho\IFileAccess.java
-..\..\shared\rubyJVM\src\com\rho\IRAFile.java
+..\..\shared\rubyJVM\src\com\rho\file\IFile.java
+..\..\shared\rubyJVM\src\com\rho\file\IFileAccess.java
+..\..\shared\rubyJVM\src\com\rho\file\IRAFile.java
+..\..\shared\rubyJVM\src\com\rho\file\SimpleFile.java
+..\..\shared\rubyJVM\src\com\rho\file\RandomAccessFile.java
 ..\..\shared\rubyJVM\src\com\rho\IRhoLogSink.java
 ..\..\shared\rubyJVM\src\com\rho\IRhoRubyHelper.java
 ..\..\shared\rubyJVM\src\com\rho\Mutex.java
@@ -57,19 +59,19 @@ ExcludeFromBuildAll=0
 ..\..\shared\rubyJVM\src\com\rho\RhoProfiler.java
 ..\..\shared\rubyJVM\src\com\rho\RhoRuby.java
 ..\..\shared\rubyJVM\src\com\rho\RhoThread.java
-..\..\shared\rubyJVM\src\com\rho\SimpleFile.java
 ..\..\shared\rubyJVM\src\com\rho\Sprintf.java
 ..\..\shared\rubyJVM\src\com\rho\StringScanner.java
 ..\..\shared\rubyJVM\src\com\rho\sync\ClientRegister.java
 ..\..\shared\rubyJVM\src\com\rho\sync\ISyncStatusListener.java
 ..\..\shared\rubyJVM\src\com\rho\sync\JSONArrayIterator.java
+..\..\shared\rubyJVM\src\com\rho\sync\JSONStructIterator.java
 ..\..\shared\rubyJVM\src\com\rho\sync\JSONEntry.java
 ..\..\shared\rubyJVM\src\com\rho\sync\SyncEngine.java
 ..\..\shared\rubyJVM\src\com\rho\sync\SyncNotify.java
 ..\..\shared\rubyJVM\src\com\rho\sync\SyncSource.java
 ..\..\shared\rubyJVM\src\com\rho\sync\SyncThread.java
-..\..\shared\rubyJVM\src\com\rho\TestProfiler.java
-..\..\shared\rubyJVM\src\com\rho\TestRhoLog.java
+..\..\shared\rubyJVM\src\com\rho\sync\SyncProtocol_3.java
+..\..\shared\rubyJVM\src\com\rho\sync\ISyncProtocol.java
 ..\..\shared\rubyJVM\src\com\rho\TimeInterval.java
 ..\..\shared\rubyJVM\src\com\rho\Tokenizer.java
 ..\..\shared\rubyJVM\src\com\xruby\GeneratedMethods\ObjectSpace_Methods.java
@@ -434,9 +436,6 @@ ExcludeFromBuildAll=0
 ..\..\shared\rubyJVM\src\org\json\me\JSONObject.java
 ..\..\shared\rubyJVM\src\org\json\me\JSONString.java
 ..\..\shared\rubyJVM\src\org\json\me\JSONTokener.java
-.settings\net.rim.eide.keys.Project.prefs
-.settings\org.eclipse.jdt.core.prefs
-bin\package.html
 ]
 HaveAlxImports=0
 HaveDefs=0

data/platform/bb/build/RubyVM_build.files

@@ -1,14 +1,16 @@
 platform\shared\rubyJVM\src\com\rho\DateTimeTokenizer.java
+platform\shared\rubyJVM\src\com\rho\FilePath.java
 platform\shared\rubyJVM\src\com\rho\db\DBAttrManager.java
 platform\shared\rubyJVM\src\com\rho\db\DBAdapter.java
 platform\shared\rubyJVM\src\com\rho\db\DBException.java
 platform\shared\rubyJVM\src\com\rho\db\IDBCallback.java
 platform\shared\rubyJVM\src\com\rho\db\IDBResult.java
 platform\shared\rubyJVM\src\com\rho\db\IDBStorage.java
-platform\shared\rubyJVM\src\com\rho\IFileAccess.java
-platform\shared\rubyJVM\src\com\rho\IRAFile.java
-platform\shared\rubyJVM\src\com\rho\FilePath.java
-platform\shared\rubyJVM\src\com\rho\IFile.java
+platform\shared\rubyJVM\src\com\rho\file\IFile.java
+platform\shared\rubyJVM\src\com\rho\file\IFileAccess.java
+platform\shared\rubyJVM\src\com\rho\file\IRAFile.java
+platform\shared\rubyJVM\src\com\rho\file\SimpleFile.java
+platform\shared\rubyJVM\src\com\rho\file\RandomAccessFile.java
 platform\shared\rubyJVM\src\com\rho\IRhoLogSink.java
 platform\shared\rubyJVM\src\com\rho\IRhoRubyHelper.java
 platform\shared\rubyJVM\src\com\rho\Mutex.java
@@ -34,18 +36,18 @@ platform\shared\rubyJVM\src\com\rho\RhoLogOutputSink.java
 platform\shared\rubyJVM\src\com\rho\RhoProfiler.java
 platform\shared\rubyJVM\src\com\rho\RhoRuby.java
 platform\shared\rubyJVM\src\com\rho\RhoThread.java
-platform\shared\rubyJVM\src\com\rho\SimpleFile.java
 platform\shared\rubyJVM\src\com\rho\StringScanner.java
 platform\shared\rubyJVM\src\com\rho\sync\JSONArrayIterator.java
+platform\shared\rubyJVM\src\com\rho\sync\JSONStructIterator.java
 platform\shared\rubyJVM\src\com\rho\sync\JSONEntry.java
 platform\shared\rubyJVM\src\com\rho\sync\SyncEngine.java
 platform\shared\rubyJVM\src\com\rho\sync\ClientRegister.java
 platform\shared\rubyJVM\src\com\rho\sync\ISyncStatusListener.java
 platform\shared\rubyJVM\src\com\rho\sync\SyncSource.java
 platform\shared\rubyJVM\src\com\rho\sync\SyncThread.java
+platform\shared\rubyJVM\src\com\rho\sync\SyncProtocol_3.java
 platform\shared\rubyJVM\src\com\rho\sync\SyncNotify.java
-platform\shared\rubyJVM\src\com\rho\TestProfiler.java
-platform\shared\rubyJVM\src\com\rho\TestRhoLog.java
+platform\shared\rubyJVM\src\com\rho\sync\ISyncProtocol.java
 platform\shared\rubyJVM\src\com\rho\TimeInterval.java
 platform\shared\rubyJVM\src\com\rho\Tokenizer.java
 platform\shared\rubyJVM\src\com\xruby\GeneratedMethods\ObjectSpace_Methods.java

data/platform/bb/build/bb.rake

@@ -69,7 +69,6 @@ def stopsim
   args = []
   args << "/session="+sim
   args << "/execute=Exit(true)"
-  
   Jake.run2 command, args, {:directory => jde + "/simulator", :nowait => true}
 end
 
@@ -143,11 +142,22 @@ namespace "config" do
       $preverified+"/RubyVM.jar"
     $rhodesimplib = $rhobundleimplib + ";"+ $preverified+"/RhoBundle.jar"
     
+
+    needsclean = true
+    if File.exists? "#{$bindir}/lastver"
+      lastver = IO.read("#{$bindir}/lastver").strip
+      needsclean = false if $bbver == lastver
+    end
+
+    Rake::Task["clean:bb:all"].invoke if needsclean
+    
     mkdir_p $bindir unless File.exists? $bindir
     rm_rf $tmpdir
     mkdir_p $tmpdir unless File.exists? $tmpdir
+    mkdir_p  $targetdir if not FileTest.exists?  $targetdir
+
+    File.open("#{$bindir}/lastver", "w") {|f| f.write($bbver)}
 
-    mkdir_p  $targetdir if not FileTest.exists?  $targetdir    
   end
 end
 
@@ -297,7 +307,7 @@ namespace "build" do
         # class names which implements Persistable interface. See details here -
         # http://supportforums.blackberry.com/rim/board/message?board.id=java_dev&thread.id=11152
         mkdir_p vsrcdir + "/com/rho/file"
-        cp_r $builddir + "/../hsqldb/src/com/rho/file/PersistRAFileImpl.java", vsrcdir + "/com/rho/file"
+        cp_r $builddir + "/../rhodes/src/com/rho/file/PersistRAFileImpl.java", vsrcdir + "/com/rho/file"
         freplace( vsrcdir + "/com/rho/file/PersistRAFileImpl.java", /FileInfoWrapper/, $outfilebase + "_FileInfoWrapper" )
         freplace( vsrcdir + "/com/rho/file/PersistRAFileImpl.java", /PageWrapper/, $outfilebase + "_PageWrapper" )
 

data/platform/bb/build/hsqldb_build.files

@@ -3,9 +3,7 @@ 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\db\RandomAccessFile.java
 platform\bb\Hsqldb\src\com\rho\file\FileAccessBB.java
-platform\bb\Hsqldb\src\com\rho\file\Jsr75RAFileImpl.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

data/platform/bb/build/rhodes_build.files

@@ -1,4 +1,5 @@
-platform\bb\rhodes\src\com\rho\Jsr75File.java
+platform\bb\rhodes\src\com\rho\file\Jsr75File.java
+platform\bb\rhodes\src\com\rho\file\Jsr75RAFileImpl.java
 platform\bb\rhodes\src\com\rho\rubyext\GeoLocation.java
 platform\bb\rhodes\src\com\rho\rubyext\System.java
 platform\bb\rhodes\src\com\rho\rubyext\XMLParser.java
@@ -11,6 +12,8 @@ platform\bb\rhodes\src\com\rho\net\SSLSocket.java
 platform\bb\rhodes\src\com\rho\net\TCPSocket.java
 platform\bb\rhodes\src\com\rho\RhoRubyHelper.java
 platform\bb\rhodes\src\com\rho\Version.java
+platform\bb\rhodes\src\com\rho\BrowserAdapter.java
+platform\bb\rhodes\src\com\rho\IBrowserAdapter.java
 platform\bb\rhodes\src\rhomobile\camera\Camera.java
 platform\bb\rhodes\src\rhomobile\camera\CameraScreen.java
 platform\bb\rhodes\src\rhomobile\camera\CameraFilesListener.java
@@ -22,7 +25,7 @@ platform\bb\rhodes\src\rhomobile\RhodesApplication.java
 platform\bb\rhodes\src\rhomobile\RhoPhonebook.java
 platform\bb\rhodes\src\rhomobile\SecondaryResourceFetchThread.java
 platform\bb\rhodes\src\rhomobile\Utilities.java
-platform\bb\rhodes\src\rhomobile\WebView.java
+platform\bb\rhodes\src\com\rho\rubyext\WebView.java
 platform\bb\rhodes\src\rhomobile\datetime\DateTimePicker.java
 platform\bb\rhodes\src\rhomobile\datetime\DateTimeScreen.java
 platform\bb\rhodes\src\rhomobile\RingtoneManager.java

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

@@ -1,5 +1,6 @@
 package com.rho;
 
+import net.rim.device.api.system.Display;
 import net.rim.device.api.ui.TouchEvent;
 import net.rim.device.api.ui.container.MainScreen;
 
@@ -25,4 +26,11 @@ 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 sublayout(int arg0, int arg1) 
+	{
+		onChangeOrientation(arg0, arg1, Display.getOrientation()== Display.ORIENTATION_LANDSCAPE ? 1 : 2);
+		super.sublayout(arg0, arg1);
+	}
+	
 };

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

@@ -0,0 +1,154 @@
+package com.rho;
+
+import net.rim.device.api.browser.field.RenderingOptions;
+import net.rim.device.api.browser.field2.*;
+import net.rim.device.api.system.Application;
+
+import javax.microedition.io.HttpConnection;
+import javax.microedition.io.InputConnection;
+
+import com.rho.net.URI;
+
+import rhomobile.Utilities;
+import rhomobile.RhodesApplication.PrimaryResourceFetchThread;
+import rhomobile.RhodesApplication;
+
+//http://rim.lithium.com/t5/Java-Development/Browser-events-on-JDK-5-field2-package/m-p/430991
+//http://208.74.204.192/t5/Web-Development/Embedded-Browser-Ajax-support/m-p/410260;jsessionid=CDE85D9F4D88217EA118DE3F5DF9FEFD
+//http://supportforums.blackberry.com/t5/Web-Development/JavaScript-not-working-on-Black-Berry-Simulator-8330/m-p/412687#M3397
+
+public class BrowserAdapter5 implements IBrowserAdapter 
+{
+	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
+		new RhoLogger("BrowserAdapter");
+    private RhoMainScreen m_oMainScreen;
+    private BrowserField m_oBrowserField;
+    private BrowserFieldConfig m_oConfig;
+    
+    private RhodesApplication m_app;
+ 
+    private class RhoProtocolController extends ProtocolController
+    {
+		public RhoProtocolController(BrowserField browserField) {
+			super(browserField);
+		}
+
+		public void handleNavigationRequest(BrowserFieldRequest request)
+				throws Exception 
+		{
+			String url = request.getURL();
+
+            if ( request.getPostData() == null ||
+            		request.getPostData().length == 0 )
+            {
+            	//String referrer = request.getHeaders().getPropertyValue("referer");
+               	m_app.addToHistory(url, null );
+            }
+            
+			PrimaryResourceFetchThread thread = new PrimaryResourceFetchThread(
+				url, request.getHeaders(),request.getPostData(),url);
+			thread.start();
+		}
+
+		public InputConnection handleResourceRequest(BrowserFieldRequest request)
+				throws Exception 
+		{
+			String url = request.getURL();
+    		if ( URI.isLocalHost(url) || URI.isLocalData(url))
+    		{
+                HttpConnection connection = Utilities.makeConnection(url, request.getHeaders(), null);
+                
+                return connection;
+    		}else
+    			return super.handleResourceRequest(request);
+		}
+
+		public void setNavigationRequestHandler(String protocol,
+				BrowserFieldNavigationRequestHandler handler) {
+			super.setNavigationRequestHandler(protocol, handler);
+		}
+
+		public void setResourceRequestHandler(String protocol,
+				BrowserFieldResourceRequestHandler handler) {
+			super.setResourceRequestHandler(protocol, handler);
+		}
+    	
+    };
+    private RhoProtocolController m_oController;
+    
+	public BrowserAdapter5(RhoMainScreen oMainScreen, RhodesApplication app) 
+	{
+		m_oMainScreen = oMainScreen;
+		m_app = app;
+		
+		m_oConfig = new BrowserFieldConfig();
+		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 );
+	}
+
+	public void setFullBrowser()
+	{
+	}
+	
+	private void createBrowserField()
+	{
+		m_oBrowserField = new BrowserField(m_oConfig);
+		m_oBrowserField.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.ALLOW_POPUPS, true);
+		m_oController = new RhoProtocolController(m_oBrowserField);
+		m_oConfig.setProperty(BrowserFieldConfig.CONTROLLER, m_oController);
+		
+		BrowserFieldListener _listener = new BrowserFieldListener() 
+		{ 
+		     public void documentLoaded(BrowserField browserField, 
+		    		 org.w3c.dom.Document document) throws Exception 
+		     {
+		    	synchronized (Application.getEventLock())
+		    	{
+		    		m_oMainScreen.deleteAll();
+					m_oMainScreen.add(m_oBrowserField);
+		     	}
+		     }
+		     /*
+		     public void downloadProgress(BrowserField browserField, 
+		    		 net.rim.device.api.browser.field.ContentReadEvent event)throws Exception
+		     {
+		        //Add your code here.
+		     }*/
+		};
+		m_oBrowserField.addListener( _listener );
+	}
+	
+    public void processConnection(HttpConnection connection, Object e) 
+    {
+        synchronized (Application.getEventLock()) 
+        {
+        	createBrowserField();        	
+        	m_oBrowserField.displayContent(connection,  (e != null ? (String)e : "") );
+        }
+    }
+
+    public void executeJavascript(String strJavascript)
+    {
+        //synchronized (Application.getEventLock()) 
+        {
+        	BrowserField field = (BrowserField)m_oMainScreen.getField(0);
+        	field.executeScript(strJavascript);
+        }
+    }
+    
+    //http://supportforums.blackberry.com/t5/Java-Development/Tab-Navigation/td-p/381156
+    public boolean navigationMovement(int dx, int dy, int status, int time)
+    {
+    	//TODO: try to change navigation
+    	/*
+    	Field focField = m_oBrowserField.getLeafFieldWithFocus();
+    	Manager focManager = focField != null ? focField.getManager() : null;
+    	boolean bHorizontal = false;
+    	if ( focManager != null && focManager instanceof HorizontalFieldManager)
+    		bHorizontal = true;
+    	*/	
+    	return false;
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.rho;
 
+import net.rim.device.api.system.Display;
 import net.rim.device.api.ui.TouchEvent;
 import net.rim.device.api.ui.container.MainScreen;
 
@@ -25,4 +26,11 @@ 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 sublayout(int arg0, int arg1) 
+	{
+		onChangeOrientation(arg0, arg1, Display.getOrientation()== Display.ORIENTATION_LANDSCAPE ? 1 : 2);
+		super.sublayout(arg0, arg1);
+	}
+	
 };

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

@@ -0,0 +1,28 @@
+package com.rho;
+
+import javax.microedition.io.HttpConnection;
+import rhomobile.RhodesApplication;
+
+public class BrowserAdapter5 implements IBrowserAdapter 
+{
+	public BrowserAdapter5(RhoMainScreen oMainScreen, RhodesApplication app) 
+	{
+	}
+
+	public void setFullBrowser()
+	{
+	}
+	
+    public void processConnection(HttpConnection connection, Object e) 
+    {
+    }
+
+    public void executeJavascript(String strJavascript)
+    {
+    }
+    
+    public boolean navigationMovement(int dx, int dy, int status, int time)
+    {
+    	return false;
+    }
+}

data/platform/bb/rhodes/rhodes.jdp

@@ -26,11 +26,13 @@ ExcludeFromBuildAll=0
 [Files
 resources\icon.png
 src\com\rho\BBVersionSpecific.java
-src\com\rho\Jsr75File.java
-src\com\rho\rubyext\GeoLocation.java
-src\com\rho\rubyext\System.java
-src\com\rho\rubyext\XMLParser.java
-src\com\rho\rubyext\Alert.java
+src\com\rho\BrowserAdapter.java
+src\com\rho\BrowserAdapter5.java
+src\com\rho\IBrowserAdapter.java
+src\com\rho\Version.java
+src\com\rho\file\Jsr75File.java
+src\com\rho\file\Jsr75RAFileImpl.java
+src\com\rho\file\PersistRAFileImpl.java
 src\com\rho\net\BaseSocket.java
 src\com\rho\net\bb\BBHttpConnection.java
 src\com\rho\net\bb\NativeBBHttpConnection.java
@@ -39,7 +41,11 @@ src\com\rho\net\SSLSocket.java
 src\com\rho\net\TCPSocket.java
 src\com\rho\RhoMainScreen.java
 src\com\rho\RhoRubyHelper.java
-src\com\rho\Version.java
+src\com\rho\rubyext\Alert.java
+src\com\rho\rubyext\GeoLocation.java
+src\com\rho\rubyext\System.java
+src\com\rho\rubyext\XMLParser.java
+src\com\rho\rubyext\WebView.java
 src\rhomobile\camera\Camera.java
 src\rhomobile\camera\CameraFilesListener.java
 src\rhomobile\camera\CameraScreen.java
@@ -62,7 +68,6 @@ src\rhomobile\RhoPhonebook.java
 src\rhomobile\RingtoneManager.java
 src\rhomobile\SecondaryResourceFetchThread.java
 src\rhomobile\Utilities.java
-src\rhomobile\WebView.java
 ]
 HaveAlxImports=0
 HaveDefs=0