rhodes 2.1.0 → 2.2.0.beta.1

data/spec/phone_spec/app/{Spec → spec}/xml_spec.rb

@@ -31,6 +31,21 @@ describe "Xml" do
         ch_count.should == 10
     end
 
+    it "should parse CDATA" do
+        file_name = File.join(Rho::RhoApplication::get_model_path('app','Data'), 'testCDATA.xml')
+
+        file = File.new(file_name)
+        doc = REXML::Document.new(file)
+    
+		persons = REXML::XPath.each( doc, "//person/" )
+		firstname=""
+        persons.each do |ch|
+            firstname = ch.elements['firstname'].text
+        end
+
+        firstname.should == "Sample bold <b</b>Tag"    
+    end
+    
     class MyStreamListener
 
         def initialize(events)

data/spec/phone_spec/app/spec_runner.rb

@@ -16,9 +16,11 @@ class SpecRunner < MSpecScript
 
     config[:files] << [ "spec/rhom_object_spec",
         [ {:schema_model=>true, :sync_model=>true},  {:schema_model=>true, :sync_model=>false},
-          {:schema_model=>false, :sync_model=>true}, {:schema_model=>false, :sync_model=>true} ] ]
+          {:schema_model=>false, :sync_model=>true}, {:schema_model=>false, :sync_model=>false} ] ]
 
     config[:files] << "spec/contacts_spec" unless System.get_property('device_name') == 'Win32'
+    config[:files] << "spec/events_spec"  unless System.get_property('device_name') == 'Win32'
+    
     config[:files] << "spec/barcode_spec" unless System.get_property('device_name') == 'Win32'            
     config[:files] << "spec/mapview_spec"  unless System.get_property('platform') == 'WINDOWS'    
     config[:files] << "spec/nativebar_spec" if System.get_property('platform') == 'APPLE' || System.get_property('platform') == 'ANDROID'
@@ -27,6 +29,7 @@ class SpecRunner < MSpecScript
     config[:files] << "spec/xruby_spec" if defined? RHO_ME
 
     config[:files] << [ "spec/syncengine_spec", [ {:schema_model=>true }, {:schema_model=>false } ] ]
+
     config[:files] << "spec/blobsync_spec"
     config[:files] << "spec/bulksync_spec"
   end

data/spec/phone_spec/build.yml

@@ -18,7 +18,6 @@ android:
   mapping: enabled
   capabilities:
     - network_state
-    - pim
     
   extensions: ["barcode"]
   
@@ -29,7 +28,9 @@ bb:
   extensions: ["barcode"]
       
 capabilities:
+  - pim
   - push
+  - calendar
      
 extensions: ["json", "rhoxml", "rhospec", "crypt"]  
 

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 62196417
+  prerelease: true
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  - beta
+  - 1
+  version: 2.2.0.beta.1
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 -07:00
+date: 2010-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -658,6 +660,7 @@ files:
 - lib/extensions/rholang/rhomsg_ru.rb
 - lib/extensions/rhospec/rhospec.rb
 - lib/extensions/rhoxml/rexml/attribute.rb
+- lib/extensions/rhoxml/rexml/cdata.rb
 - lib/extensions/rhoxml/rexml/child.rb
 - lib/extensions/rhoxml/rexml/document.rb
 - lib/extensions/rhoxml/rexml/element.rb
@@ -675,6 +678,7 @@ files:
 - lib/extensions/rhoxml/rexml/parsers/xpathparser.rb
 - lib/extensions/rhoxml/rexml/set.rb
 - lib/extensions/rhoxml/rexml/source.rb
+- lib/extensions/rhoxml/rexml/text.rb
 - lib/extensions/rhoxml/rexml/xmltokens.rb
 - lib/extensions/rhoxml/rexml/xpath.rb
 - lib/extensions/rhoxml/rexml/xpath_parser.rb
@@ -703,9 +707,13 @@ files:
 - lib/framework/rho/render.rb
 - lib/framework/rho/rho.rb
 - lib/framework/rho/rhoapplication.rb
+- lib/framework/rho/rhobluetooth.rb
 - lib/framework/rho/rhocontact.rb
 - lib/framework/rho/rhocontroller.rb
 - lib/framework/rho/rhoerror.rb
+- lib/framework/rho/rhoevent.rb
+- lib/framework/rho/rhoevent_bb.rb
+- lib/framework/rho/rhoevent_c.rb
 - lib/framework/rho/rhofsconnector.rb
 - lib/framework/rho/rhomsg.rb
 - lib/framework/rho/rhosupport.rb
@@ -761,6 +769,7 @@ files:
 - platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java
 - platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc
 - platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_alert_Alert.h
+- platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_bluetooth_RhoBluetoothManager.h
 - platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_camera_Camera.h
 - platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_datetime_DateTimePicker.h
 - platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_file_RhoFileApi.h
@@ -779,9 +788,11 @@ files:
 - platform/android/Rhodes/jni/include/rhodes/sslimpl.h
 - platform/android/Rhodes/jni/include/rhodes.h
 - platform/android/Rhodes/jni/src/alert.cpp
+- platform/android/Rhodes/jni/src/bluetooth.cpp
 - platform/android/Rhodes/jni/src/callbacks.cpp
 - platform/android/Rhodes/jni/src/camera.cpp
 - platform/android/Rhodes/jni/src/datetimepicker.cpp
+- platform/android/Rhodes/jni/src/event.cpp
 - platform/android/Rhodes/jni/src/fileapi.cpp
 - platform/android/Rhodes/jni/src/geolocation.cpp
 - platform/android/Rhodes/jni/src/logconf.cpp
@@ -818,6 +829,8 @@ files:
 - platform/android/Rhodes/res/drawable/signature_clear.png
 - platform/android/Rhodes/res/drawable/signature_ok.png
 - platform/android/Rhodes/res/drawable/sync.png
+- platform/android/Rhodes/res/layout/bt_device_list.xml
+- platform/android/Rhodes/res/layout/bt_device_name.xml
 - platform/android/Rhodes/res/layout/camera.xml
 - platform/android/Rhodes/res/layout/datetime.xml
 - platform/android/Rhodes/res/layout/dialog_activity.xml
@@ -831,6 +844,13 @@ files:
 - platform/android/Rhodes/rhobundle.xml
 - platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothDeviceListActivity.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerNew.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOld.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/UUIDHelper.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java
@@ -838,6 +858,8 @@ files:
 - platform/android/Rhodes/src/com/rhomobile/rhodes/Capabilities.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/event/Event.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java
@@ -861,6 +883,9 @@ files:
 - platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactField.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/Push.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/RhoActivity.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java
@@ -1063,11 +1088,10 @@ files:
 - platform/bb/rhodes/platform/4.2.2/com/rho/BBVersionSpecific.java
 - platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java
 - platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java
-- platform/bb/rhodes/platform/5.0/com/rho/RhoMainScreen.java
-- platform/bb/rhodes/platform/6.0/com/rho/BrowserAdapter5.java
-- platform/bb/rhodes/platform/6.0/com/rho/RhoMainScreen.java
+- platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java
 - platform/bb/rhodes/platform/common/com/rho/BBVersionSpecific.java
 - platform/bb/rhodes/platform/common/com/rho/BrowserAdapter5.java
+- platform/bb/rhodes/platform/common/com/rho/RhodesApplicationPlatform.java
 - platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java
 - platform/bb/rhodes/resources/icon.png
 - platform/bb/rhodes/rhodes.csl
@@ -1086,14 +1110,20 @@ files:
 - platform/bb/rhodes/src/com/rho/net/NetworkAccess.java
 - platform/bb/rhodes/src/com/rho/net/SSLSocket.java
 - platform/bb/rhodes/src/com/rho/net/TCPSocket.java
+- platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java
 - platform/bb/rhodes/src/com/rho/RhoMainScreen.java
 - platform/bb/rhodes/src/com/rho/RhoRubyHelper.java
 - platform/bb/rhodes/src/com/rho/rubyext/Alert.java
 - platform/bb/rhodes/src/com/rho/rubyext/GeoLocation.java
+- platform/bb/rhodes/src/com/rho/rubyext/RhoCalendar.java
+- platform/bb/rhodes/src/com/rho/rubyext/RhoPhonebook.java
 - platform/bb/rhodes/src/com/rho/rubyext/System.java
 - platform/bb/rhodes/src/com/rho/rubyext/WebView.java
 - platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java
 - platform/bb/rhodes/src/com/rho/Version.java
+- platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothManager.java
+- platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothPort.java
+- platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothScreen.java
 - platform/bb/rhodes/src/rhomobile/camera/Camera.java
 - platform/bb/rhodes/src/rhomobile/camera/CameraFilesListener.java
 - platform/bb/rhodes/src/rhomobile/camera/CameraScreen.java
@@ -1113,7 +1143,6 @@ files:
 - platform/bb/rhodes/src/rhomobile/NativeBar.java
 - platform/bb/rhodes/src/rhomobile/PushListeningThread.java
 - platform/bb/rhodes/src/rhomobile/RhodesApplication.java
-- platform/bb/rhodes/src/rhomobile/RhoPhonebook.java
 - platform/bb/rhodes/src/rhomobile/RingtoneManager.java
 - platform/bb/rhodes/src/rhomobile/SecondaryResourceFetchThread.java
 - platform/bb/rhodes/src/rhomobile/Utilities.java
@@ -1545,6 +1574,8 @@ files:
 - platform/iphone/Classes/AppManager/AppManager.h
 - platform/iphone/Classes/AppManager/AppManager.m
 - platform/iphone/Classes/AppManager/AppManagerI.h
+- platform/iphone/Classes/Bluetooth/Bluetooth.h
+- platform/iphone/Classes/Bluetooth/Bluetooth.m
 - platform/iphone/Classes/Camera/PickImageDelegate.h
 - platform/iphone/Classes/Camera/PickImageDelegate.m
 - platform/iphone/Classes/DateTime.h
@@ -1554,6 +1585,8 @@ files:
 - platform/iphone/Classes/DateTimePickerDelegate.m
 - platform/iphone/Classes/Dispatcher/Dispatcher.c
 - platform/iphone/Classes/Dispatcher/Dispatcher.h
+- platform/iphone/Classes/Event/Event.h
+- platform/iphone/Classes/Event/Event.m
 - platform/iphone/Classes/GeoLocation/LocationController.h
 - platform/iphone/Classes/GeoLocation/LocationController.m
 - platform/iphone/Classes/LogOptionsController.h
@@ -1584,6 +1617,8 @@ files:
 - platform/iphone/Classes/RhoMainView.h
 - platform/iphone/Classes/RhoNativeViewManager.mm
 - platform/iphone/Classes/RhoNativeViewManagerOC.h
+- platform/iphone/Classes/RhoViewController.h
+- platform/iphone/Classes/RhoViewController.m
 - platform/iphone/Classes/RingtoneManager.h
 - platform/iphone/Classes/RingtoneManager.m
 - platform/iphone/Classes/Signature/SignatureDelegate.h
@@ -2173,6 +2208,13 @@ files:
 - platform/shared/ruby/ext/alert/alert_wrap.c
 - platform/shared/ruby/ext/asynchttp/asynchttp.i
 - platform/shared/ruby/ext/asynchttp/asynchttp_wrap.c
+- platform/shared/ruby/ext/bluetooth/bluetooth.i
+- platform/shared/ruby/ext/bluetooth/bluetooth_wrap.c
+- platform/shared/ruby/ext/calendar/calendar.i
+- platform/shared/ruby/ext/calendar/calendar_wrap.c
+- platform/shared/ruby/ext/calendar/event.h
+- platform/shared/ruby/ext/calendar/event.i
+- platform/shared/ruby/ext/calendar/event_wrap.c
 - platform/shared/ruby/ext/camera/camera.i
 - platform/shared/ruby/ext/camera/camera_wrap.c
 - platform/shared/ruby/ext/datetimepicker/datetimepicker.i
@@ -3818,6 +3860,8 @@ files:
 - platform/wm/rhodes/AppManager.h
 - platform/wm/rhodes/atlutil-vc08.h
 - platform/wm/rhodes/atlutil.h
+- platform/wm/rhodes/bluetooth/Bluetooth.cpp
+- platform/wm/rhodes/bluetooth/Bluetooth.h
 - platform/wm/rhodes/camera/Camera.cpp
 - platform/wm/rhodes/camera/Camera.h
 - platform/wm/rhodes/DateTimePicker.cpp
@@ -3833,6 +3877,8 @@ files:
 - platform/wm/rhodes/menubar.cpp
 - platform/wm/rhodes/menubar.h
 - platform/wm/rhodes/OkCancelModalDialog.h
+- platform/wm/rhodes/OutlookApp.cpp
+- platform/wm/rhodes/OutlookApp.h
 - platform/wm/rhodes/phonebook/NativeAddressBook.cpp
 - platform/wm/rhodes/phonebook/NativeAddressBook.h
 - platform/wm/rhodes/phonebook/phonebook.cpp
@@ -3847,6 +3893,7 @@ files:
 - platform/wm/rhodes/rho/net/NetRequest.h
 - platform/wm/rhodes/rho/net/NetRequestImpl.cpp
 - platform/wm/rhodes/rho/net/NetRequestImpl.h
+- platform/wm/rhodes/rho/rubyext/calendar.cpp
 - platform/wm/rhodes/rho/rubyext/GeoLocationImpl.cpp
 - platform/wm/rhodes/rho/rubyext/GeoLocationImpl.h
 - platform/wm/rhodes/rho/rubyext/SystemImpl.cpp
@@ -3980,6 +4027,7 @@ files:
 - res/generators/templates/application/public/images/toolButton.png
 - res/generators/templates/application/public/images/toolButton_new.png
 - res/generators/templates/application/public/images/whiteButton.png
+- res/generators/templates/application/public/jqtouch/jqtouch-iphone.css
 - res/generators/templates/application/public/jqtouch/jqtouch.css
 - res/generators/templates/application/public/jqtouch/jqtouch.js
 - res/generators/templates/application/public/jqtouch/jqtouch.transitions.js
@@ -5622,11 +5670,24 @@ files:
 - spec/generator_spec/spec.opts
 - spec/generator_spec/spec_helper.rb
 - spec/perfomance_spec/app/application.rb
+- spec/perfomance_spec/app/Benchmark/benchmark.rb
+- spec/perfomance_spec/app/Benchmark/bulk_results.erb
+- spec/perfomance_spec/app/Benchmark/controller.rb
+- spec/perfomance_spec/app/Benchmark/create_results.erb
+- spec/perfomance_spec/app/Benchmark/customers.erb
+- spec/perfomance_spec/app/Benchmark/index.erb
+- spec/perfomance_spec/app/Benchmark/products.erb
+- spec/perfomance_spec/app/Benchmark/search_results.erb
+- spec/perfomance_spec/app/Customer/customer.rb
+- spec/perfomance_spec/app/helpers/application_helper.rb
+- spec/perfomance_spec/app/helpers/browser_helper.rb
 - spec/perfomance_spec/app/index.erb
 - spec/perfomance_spec/app/layout.erb
 - spec/perfomance_spec/app/Perftest/controller.rb
 - spec/perfomance_spec/app/Perftest/index.erb
 - spec/perfomance_spec/app/Perftest/perftest.rb
+- spec/perfomance_spec/app/Product/index.erb
+- spec/perfomance_spec/app/Product/product.rb
 - spec/perfomance_spec/build.yml
 - spec/perfomance_spec/icon/icon.ico
 - spec/perfomance_spec/icon/icon.png
@@ -5652,6 +5713,7 @@ files:
 - spec/phone_spec/app/Customer_s/customer_s.rb
 - spec/phone_spec/app/Data/big_test.json
 - spec/phone_spec/app/Data/circtest.json
+- spec/phone_spec/app/Data/perftest.json
 - spec/phone_spec/app/Data/reqTest.rb
 - spec/phone_spec/app/Data/septest.json
 - spec/phone_spec/app/Data/test.json
@@ -5659,32 +5721,34 @@ files:
 - spec/phone_spec/app/Data/test.xml
 - spec/phone_spec/app/Data/test1.xml
 - spec/phone_spec/app/Data/test_log.txt
+- spec/phone_spec/app/Data/testCDATA.xml
 - spec/phone_spec/app/index.erb
 - spec/phone_spec/app/loading.html
 - spec/phone_spec/app/Product/product.rb
 - spec/phone_spec/app/Product_s/product_s.rb
-- spec/phone_spec/app/Spec/asynchttp_spec.rb
-- spec/phone_spec/app/Spec/barcode_spec.rb
-- spec/phone_spec/app/Spec/blobsync_spec.rb
-- spec/phone_spec/app/Spec/bsearch_spec.rb
-- spec/phone_spec/app/Spec/bulksync_spec.rb
-- spec/phone_spec/app/Spec/contacts_spec.rb
-- spec/phone_spec/app/Spec/crypt_spec.rb
-- spec/phone_spec/app/Spec/date_spec.rb
-- spec/phone_spec/app/Spec/fixtures/client_info.txt
-- spec/phone_spec/app/Spec/fixtures/object_values.txt
-- spec/phone_spec/app/Spec/json_spec.rb
-- spec/phone_spec/app/Spec/mapview_spec.rb
-- spec/phone_spec/app/Spec/nativebar_spec.rb
-- spec/phone_spec/app/Spec/navbar_spec.rb
-- spec/phone_spec/app/Spec/pagination/fixtures/object_values.txt
-- spec/phone_spec/app/Spec/rho_controller_spec.rb
-- spec/phone_spec/app/Spec/rho_spec.rb
-- spec/phone_spec/app/Spec/rhofile_spec.rb
-- spec/phone_spec/app/Spec/rhom_object_spec.rb
-- spec/phone_spec/app/Spec/syncengine_spec.rb
-- spec/phone_spec/app/Spec/xml_spec.rb
-- spec/phone_spec/app/Spec/xruby_spec.rb
+- spec/phone_spec/app/spec/asynchttp_spec.rb
+- spec/phone_spec/app/spec/barcode_spec.rb
+- spec/phone_spec/app/spec/blobsync_spec.rb
+- spec/phone_spec/app/spec/bsearch_spec.rb
+- spec/phone_spec/app/spec/bulksync_spec.rb
+- spec/phone_spec/app/spec/contacts_spec.rb
+- spec/phone_spec/app/spec/crypt_spec.rb
+- spec/phone_spec/app/spec/date_spec.rb
+- spec/phone_spec/app/spec/events_spec.rb
+- spec/phone_spec/app/spec/fixtures/client_info.txt
+- spec/phone_spec/app/spec/fixtures/object_values.txt
+- spec/phone_spec/app/spec/json_spec.rb
+- spec/phone_spec/app/spec/mapview_spec.rb
+- spec/phone_spec/app/spec/nativebar_spec.rb
+- spec/phone_spec/app/spec/navbar_spec.rb
+- spec/phone_spec/app/spec/pagination/fixtures/object_values.txt
+- spec/phone_spec/app/spec/rho_controller_spec.rb
+- spec/phone_spec/app/spec/rho_spec.rb
+- spec/phone_spec/app/spec/rhofile_spec.rb
+- spec/phone_spec/app/spec/rhom_object_spec.rb
+- spec/phone_spec/app/spec/syncengine_spec.rb
+- spec/phone_spec/app/spec/xml_spec.rb
+- spec/phone_spec/app/spec/xruby_spec.rb
 - spec/phone_spec/app/spec_runner.rb
 - spec/phone_spec/app/SpecRunner/controller.rb
 - spec/phone_spec/app/SpecRunner/index.erb

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

@@ -1,36 +0,0 @@
-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;
-
-public abstract class RhoMainScreen extends MainScreen {
-	
-	protected abstract void onTouchUnclick();
-	
-	protected boolean touchEvent(TouchEvent message) {
-		int nEvent = message.getEvent();
-		
-		if ( nEvent == TouchEvent.UNCLICK )
-		{
-			onTouchUnclick();
-			return true;
-		}
-		
-		return super.touchEvent(message);
-	}
-	
-	public boolean isTouchScreen()
-	{
-	    //DeviceInfo.getDevicename()
-	    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/6.0/com/rho/BrowserAdapter5.java

@@ -1,155 +0,0 @@
-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.RhodesApp;
-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 ( RhodesApp.getInstance().isRhodesAppUrl(url) || URI.isLocalData(url))
-    		{
-                HttpConnection connection = Utilities.makeConnection(url, request.getHeaders(), null, 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;
-    }
-}