rhodes 2.3.0 → 2.3.1.beta.1

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java

@@ -91,9 +91,12 @@ public class RhodesService extends Service {
 	private static final Class[] mStartForegroundSignature = new Class[] {int.class, Notification.class};
 	@SuppressWarnings("rawtypes")
 	private static final Class[] mStopForegroundSignature = new Class[] {boolean.class};
+	@SuppressWarnings("rawtypes")
+	private static final Class[] mSetForegroundSignature = new Class[] {boolean.class};
 	
 	private Method mStartForeground;
 	private Method mStopForeground;
+	private Method mSetForeground;
 	
 	private NotificationManager mNM;
 	
@@ -278,8 +281,11 @@ public class RhodesService extends Service {
 		createRhodesApp();
 		
 		RhodesActivity ra = RhodesActivity.getInstance();
-		SplashScreen splashScreen = ra.getSplashScreen();
-		splashScreen.start();
+		if (ra != null) {
+			// Show splash screen only if we have active activity
+			SplashScreen splashScreen = ra.getSplashScreen();
+			splashScreen.start();
+		}
 		
 		initForegroundServiceApi();
 		
@@ -379,10 +385,12 @@ public class RhodesService extends Service {
 		try {
 			mStartForeground = getClass().getMethod("startForeground", mStartForegroundSignature);
 			mStopForeground = getClass().getMethod("stopForeground", mStopForegroundSignature);
+			mSetForeground = getClass().getMethod("setForeground", mSetForegroundSignature);
 		}
 		catch (NoSuchMethodException e) {
 			mStartForeground = null;
 			mStopForeground = null;
+			mSetForeground = null;
 		}
 	}
 	
@@ -399,7 +407,7 @@ public class RhodesService extends Service {
 		if (DEBUG)
 			Log.d(TAG, "+++ onStart");
 		try {
-			handleCommand(intent);
+			handleCommand(intent, startId);
 		}
 		catch (Exception e) {
 			Logger.E(TAG, "Can't handle service command: " + e.getMessage());
@@ -411,7 +419,7 @@ public class RhodesService extends Service {
 		if (DEBUG)
 			Log.d(TAG, "+++ onStartCommand");
 		try {
-			handleCommand(intent);
+			handleCommand(intent, startId);
 		}
 		catch (Exception e) {
 			Logger.E(TAG, "Can't handle service command: " + e.getMessage());
@@ -419,13 +427,16 @@ public class RhodesService extends Service {
 		return Service.START_STICKY;
 	}
 	
-	private void handleCommand(Intent intent) {
+	private void handleCommand(Intent intent, int startId) {
 		String source = intent.getStringExtra(INTENT_SOURCE);
+		Logger.D(TAG, "handleCommand: startId=" + startId + ", source=" + source);
 		if (source == null)
 			throw new IllegalArgumentException("Service command received from empty source");
 		
-		Logger.D(TAG, "Service command received from " + source);
-		if (source.equals(PushReceiver.INTENT_SOURCE)) {
+		if (source.equals(BaseActivity.INTENT_SOURCE)) {
+			Logger.D(TAG, "New activity was created");
+		}
+		else if (source.equals(PushReceiver.INTENT_SOURCE)) {
 			int type = intent.getIntExtra(PushReceiver.INTENT_TYPE, PushReceiver.INTENT_TYPE_UNKNOWN);
 			switch (type) {
 			case PushReceiver.INTENT_TYPE_REGISTRATION_ID:
@@ -458,7 +469,17 @@ public class RhodesService extends Service {
 			return;
 		}
 		
-		setForeground(true);
+		if (mSetForeground != null) {
+			try {
+				mSetForeground.invoke(this, new Object[] {Boolean.valueOf(true)});
+			}
+			catch (InvocationTargetException e) {
+				Log.e(TAG, "Unable to invoke setForeground", e);
+			}
+			catch (IllegalAccessException e) {
+				Log.e(TAG, "Unable to invoke setForeground", e);
+			}
+		}
 		mNM.notify(id, notification);
 	}
 	
@@ -477,7 +498,17 @@ public class RhodesService extends Service {
 		}
 		
 		mNM.cancel(id);
-		setForeground(false);
+		if (mSetForeground != null) {
+			try {
+				mSetForeground.invoke(this, new Object[] {Boolean.valueOf(false)});
+			}
+			catch (InvocationTargetException e) {
+				Log.e(TAG, "Unable to invoke setForeground", e);
+			}
+			catch (IllegalAccessException e) {
+				Log.e(TAG, "Unable to invoke setForeground", e);
+			}
+		}
 	}
 	
 	public void setMainView(MainView v) {
@@ -560,6 +591,46 @@ public class RhodesService extends Service {
 		}
 	}
 	
+	public static boolean pingHost(String host) {
+		HttpURLConnection conn = null;
+		boolean hostExists = false;
+		try {
+				URL url = new URL(host);
+				HttpURLConnection.setFollowRedirects(false);
+				conn = (HttpURLConnection) url.openConnection();
+
+				conn.setRequestMethod("HEAD");
+				conn.setAllowUserInteraction( false );
+				conn.setDoInput( true );
+				conn.setDoOutput( true );
+				conn.setUseCaches( false );
+
+				hostExists = (conn.getContentLength() > 0);
+				if(hostExists)
+					Logger.I(TAG, "PING network SUCCEEDED.");
+				else
+					Logger.E(TAG, "PING network FAILED.");
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e);
+		}
+		finally {            
+		    if (conn != null) 
+		    {
+		    	try
+		    	{
+		    		conn.disconnect(); 
+		    	}
+		    	catch(Exception e) 
+		    	{
+		    		Logger.E(TAG, e);
+		    	}
+		    }
+		}
+		
+		return hostExists;
+	}
+	
 	private static boolean hasNetwork() {
 		if (!Capabilities.NETWORK_STATE_ENABLED) {
 			Logger.E(TAG, "HAS_NETWORK: Capability NETWORK_STATE disabled");

data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java

@@ -12,6 +12,7 @@ import android.os.Build;
 
 import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
 
 public class EventStore {
@@ -106,7 +107,7 @@ public class EventStore {
 				
 				eventCursor = r.query(builder.build(),
 						new String[] {"event_id", EVENTS_TITLE, "begin", "end", EVENTS_LOCATION,
-							EVENTS_NOTES, EVENTS_PRIVACY},
+							EVENTS_NOTES, EVENTS_PRIVACY, "deleted"},
 						null, //"Calendars._id=" + id,
 						null, "startDay ASC, startMinute ASC");
 			}
@@ -117,7 +118,7 @@ public class EventStore {
 				String end = Long.toString(endDate.getTime());
 				eventCursor = r.query(EVENTS_URI,
 					new String[] {"_id", EVENTS_TITLE, EVENTS_START_DATE, EVENTS_END_DATE,
-						EVENTS_LOCATION, EVENTS_NOTES, EVENTS_PRIVACY},
+						EVENTS_LOCATION, EVENTS_NOTES, EVENTS_PRIVACY, "deleted"},
 					where, new String[] {start, end, start, end},
 					null);
 			}
@@ -125,6 +126,15 @@ public class EventStore {
 				throw new RuntimeException("Calendar provider not found");
 			try {
 				while (eventCursor.moveToNext()) {
+
+					int deleted_index = eventCursor.getColumnIndex("deleted");
+					if (deleted_index >= 0) {
+						long is_deleted = eventCursor.getLong(deleted_index);
+						if (is_deleted != 0) {
+							continue;
+						}
+					}
+					
 					String eid = eventCursor.getString(0);
 					Event event = new Event(eid);
 					
@@ -192,6 +202,7 @@ public class EventStore {
 					Logger.D(TAG, "fetch(id): result set is empty");
 					return null;
 				}
+				
 				Event event = new Event(id);
 				event.title = eventCursor.getString(0);
 				event.startDate = new Date(eventCursor.getLong(1));
@@ -223,6 +234,7 @@ public class EventStore {
 	}
 	
 	public static String save(Event event) {
+		String return_id = null;
 		try {
 			checkCapabilities();
 			
@@ -256,39 +268,48 @@ public class EventStore {
 			if (event.id == null || event.id.equalsIgnoreCase("")) {
 				Logger.D(TAG, "Insert new event...");
 				Uri euri = r.insert(EVENTS_URI, values);
+				r.notifyChange(EVENTS_URI, null);
 				event.id = Long.toString(ContentUris.parseId(euri));
 				Logger.D(TAG, "Event id of event is " + event.id);
+				return_id = event.id;
 			}
 			else {
+				return_id = event.id;
 				Logger.D(TAG, "Update event...");
 				Uri uri = ContentUris.withAppendedId(EVENTS_URI, Long.parseLong(event.id));
 				r.update(uri, values, null, null);
+				r.notifyChange(EVENTS_URI, null);
 				Logger.D(TAG, "Event updated");
 			}
-			
-			return null;
 		}
 		catch (Exception e) {
 			reportFail("save", e);
-			String error = e.getMessage();
-			return error == null ? "unknown" : error;
+			//String error = e.getMessage();
+			return null;//error == null ? "unknown" : error;
 		}
+		return return_id;
 	}
 	
 	public static String delete(String id) {
 		try {
 			checkCapabilities();
 			
-			Logger.D(TAG, "delete(id)");
+			Logger.D(TAG, "delete("+id+")");
 			
 			ContentResolver r = getContentResolver();
 			int rows;
 			if (Build.VERSION.SDK_INT < Build.VERSION_CODES.FROYO) {
+				Logger.D(TAG, " use old delete scheme");
 				Uri uri = ContentUris.withAppendedId(EVENTS_URI, Long.parseLong(id));
 				rows = getContentResolver().delete(uri, null, null);
 			}
 			else {
-				rows = r.delete(EVENTS_URI, "_id=?", new String[] {id});
+				Logger.D(TAG, " use new delete scheme");
+				int idn = Integer.decode(id).intValue();
+				Uri du = Uri.withAppendedPath(EVENTS_URI, id);
+				rows = r.delete(du, null, null);
+				//rows = r.delete(EVENTS_URI, "_id=?", new String[] {id});
+				r.notifyChange(EVENTS_URI, null);
 			}
 			Logger.D(TAG, String.format("%d rows deleted", rows));
 			

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java

@@ -572,7 +572,10 @@ public class SimpleMainView implements MainView {
 	public void navigate(String url, int index) {
 		String cleared_url = processForNativeView(url);
 		if (cleared_url.length() > 0) {
-			webView.loadUrl(url);
+			// check for handle because if we call loadUrl - WebView do not check this url for handle
+			if (!RhodesService.getInstance().handleUrlLoading(cleared_url)) {
+				webView.loadUrl(cleared_url);
+			}
 		}
 	}
 	

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java

@@ -488,9 +488,20 @@ public class TabbedMainView implements MainView {
 				throw new IllegalArgumentException("'label' should be String");
 			
 			Object actionObj = hash.get("action");
+			
+			boolean use_current_view_for_tab = false;
+			Object use_current_view_for_tab_Obj = hash.get("use_current_view_for_tab");
+			if (use_current_view_for_tab_Obj != null) {
+				use_current_view_for_tab = ((String)use_current_view_for_tab_Obj).equalsIgnoreCase("true");
+			}
+
+			if (use_current_view_for_tab) {
+				actionObj = new String("none");
+			}
 			if (actionObj == null || !(actionObj instanceof String))
 				throw new IllegalArgumentException("'action' should be String");
 			
+			
 			String label = (String)labelObj;
 			String action = (String)actionObj;
 			String icon = null;
@@ -557,11 +568,22 @@ public class TabbedMainView implements MainView {
 			else
 				spec.setIndicator(label, drawable);
 			
+			SimpleMainView view = null;
+			if (use_current_view_for_tab) {
+				RhodesService r = RhodesService.getInstance();
+				MainView mainView = r.getMainView();
+				action = mainView.currentLocation(-1);
+				view = new SimpleMainView(mainView);
+			}
+			else {
+				view = new SimpleMainView();
+			}
 			// Set view factory
-			SimpleMainView view = new SimpleMainView();
 			
 			if (web_bkg_color_Obj != null) {
-				view.setWebBackgroundColor(web_bkg_color);
+				if (!use_current_view_for_tab) {
+					view.setWebBackgroundColor(web_bkg_color);
+				}
 				host.setBackgroundColor(web_bkg_color);
 			}
 			
@@ -570,6 +592,11 @@ public class TabbedMainView implements MainView {
 			data.url = action;
 			data.reload = reload;
 			
+			if (use_current_view_for_tab) {
+				data.loaded = true;
+				tabIndex = i;
+			}
+			
 			data.selected_color = selected_color;
 			data.selected_color_enabled = selected_color_enable;
 			data.disabled = disabled;
@@ -596,23 +623,32 @@ public class TabbedMainView implements MainView {
 		int sel_col = 0;
 		boolean sel_col_enable = false;
 		
-		tabIndex = 0;
+		int cur_tabIndex = 0;
 		TabData data = null; 
 		boolean founded_not_disabled = false;
 		
-		while ((!founded_not_disabled) && (tabIndex < tabData.size())) {
-			data = tabData.elementAt(tabIndex); 
+		while ((!founded_not_disabled) && (cur_tabIndex < tabData.size())) {
+			data = tabData.elementAt(cur_tabIndex); 
 			if ((data != null) && (!data.disabled)) {
 				founded_not_disabled = true;
 			}
 			else {
-				tabIndex++;
+				cur_tabIndex++;
 			}
 		}
 		if (!founded_not_disabled) {
 			Logger.E(TAG, "ERROR : All tabs is disabled !!! ");
 		}
 		
+		if ((tabIndex != cur_tabIndex) && (tabIndex != 0)) {
+			data = tabData.elementAt(tabIndex); 
+		}
+		else {
+			tabIndex = cur_tabIndex;
+		}
+		
+		
+		
 		if (data != null) {
 			sel_col = data.selected_color;
 			sel_col_enable = data.selected_color_enabled;
@@ -658,8 +694,10 @@ public class TabbedMainView implements MainView {
 
 		if (data != null) {
 			try {
-				RhodesService.loadUrl(data.url);
-				data.loaded = true;
+				if (!data.loaded) {
+					RhodesService.loadUrl(data.url);
+					data.loaded = true;
+				}
 				sel_col = data.selected_color;
 				sel_col_enable = data.selected_color_enabled;
 			}
@@ -691,8 +729,10 @@ public class TabbedMainView implements MainView {
 					}
 				}
 				TabData selected_data = tabData.elementAt(tabIndex);
-				RhodesService.loadUrl(selected_data.url);
-				selected_data.loaded = true;
+				if (!selected_data.loaded) {
+					RhodesService.loadUrl(selected_data.url);
+					selected_data.loaded = true;
+				}
 				mIsReallyOnScreen = true;
 			}
 		});

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java

@@ -41,6 +41,7 @@ public class MapView extends BaseActivity implements MapTouch {
 	public native void setPinImage(long nativeDevice, Bitmap pin);
 	public native void setPinCalloutImage(long nativeDevice, Bitmap pin);
 	public native void setPinCalloutLinkImage(long nativeDevice, Bitmap pin);
+	public native void setESRILogoImage(long nativeDevice, Bitmap esriLogo);
 	
 	public native int minZoom(long nativeDevice);
 	public native int maxZoom(long nativeDevice);
@@ -122,6 +123,8 @@ public class MapView extends BaseActivity implements MapTouch {
 		setPinCalloutImage(mNativeDevice, pinCallout );
 		Bitmap pinCalloutLink = BitmapFactory.decodeResource(getResources(), AndroidR.drawable.callout_link);
 		setPinCalloutLinkImage(mNativeDevice, pinCalloutLink );
+		Bitmap esriLogo = BitmapFactory.decodeResource(getResources(), AndroidR.drawable.esri);
+		setESRILogoImage(mNativeDevice, esriLogo);
 
 		
 		mTouchHandler = createTouchHandler();

data/platform/android/build/android.rake

@@ -7,7 +7,7 @@ USE_TRACES = false
 
 ANDROID_API_LEVEL_TO_MARKET_VERSION = {}
 ANDROID_MARKET_VERSION_TO_API_LEVEL = {}
-{2 => "1.1", 3 => "1.5", 4 => "1.6", 5 => "2.0", 6 => "2.0.1", 7 => "2.1", 8 => "2.2", 9 => "2.3"}.each do |k,v|
+{2 => "1.1", 3 => "1.5", 4 => "1.6", 5 => "2.0", 6 => "2.0.1", 7 => "2.1", 8 => "2.2", 9 => "2.3", 10 => "2.3.3", 11 => "3.0" }.each do |k,v|
   ANDROID_API_LEVEL_TO_MARKET_VERSION[k] = v
   ANDROID_MARKET_VERSION_TO_API_LEVEL[v] = k
 end
@@ -277,6 +277,7 @@ namespace "config" do
     $vendor = $vendor.gsub(/^[^A-Za-z]/, '_').gsub(/[^A-Za-z0-9]/, '_').gsub(/_+/, '_').downcase
     $app_package_name = $app_config["android"] ? $app_config["android"]["package_name"] : nil
     $app_package_name = "com.#{$vendor}." + $appname.downcase.gsub(/[^A-Za-z_0-9]/, '') unless $app_package_name
+    $app_package_name.gsub!(/\.[\d]/, "._")
 
     $rhomanifest = File.join $androidpath, "Rhodes", "AndroidManifest.xml"
     $appmanifest = File.join $tmpdir, "AndroidManifest.xml"
@@ -367,6 +368,7 @@ namespace "config" do
     $adb = File.join( $androidsdkpath, "platform-tools", "adb" + $exe_ext ) unless File.exists? $adb
     $zipalign = File.join( $androidsdkpath, "tools", "zipalign" + $exe_ext )
     $androidjar = File.join($androidsdkpath, "platforms", $androidplatform, "android.jar")
+    $dxjar = File.join( $androidsdkpath, "platform-tools", "lib", "dx.jar")
 
     $keytool = File.join( $java, "keytool" + $exe_ext )
     $jarsigner = File.join( $java, "jarsigner" + $exe_ext )
@@ -1014,17 +1016,18 @@ namespace "build" do
           lines << line
         end
       end
-      lines << File.join($app_rjava_dir, "R.java")
-      lines << $app_android_r
-      lines << $app_native_libs_java
-      lines << $app_capabilities_java
-      lines << $app_push_java
+      lines << "\"" +File.join($app_rjava_dir, "R.java")+"\""
+      lines << "\"" +$app_android_r+"\""
+      lines << "\"" +$app_native_libs_java+"\""
+      lines << "\"" +$app_capabilities_java+"\""
+      lines << "\"" +$app_push_java+"\""
       if File.exists? File.join($extensionsdir, "ext_build.files")
         puts 'ext_build.files found ! Addditional files for compilation :'
         File.open(File.join($extensionsdir, "ext_build.files")) do |f|
           while line = f.gets
+            line=line.gsub("\n","\"")
             puts 'java file : ' + line
-            lines << line
+            lines << "\""+line
           end
         end
       else
@@ -1092,10 +1095,12 @@ namespace "package" do
   task :android => "build:android:all" do
     puts "Running dx utility"
     args = []
+    args << "-jar"
+    args << $dxjar
     args << "--dex"
     args << "--output=#{$bindir}/classes.dex"
     args << "#{$bindir}/Rhodes.jar"
-    puts Jake.run($dx, args)
+    puts Jake.run("java", args)
     unless $?.success?
       puts "Error running DX utility"
       exit 1
@@ -1371,10 +1376,14 @@ namespace "run" do
         start = Time.now
 
         puts "waiting for log"
-      
-        while !File.exist?(log_name)
-            get_app_log($appname, false, true)
-            sleep(1)
+        
+        for i in 0..60
+			if !File.exist?(log_name)
+				get_app_log($appname, false, true)
+				sleep(1)
+			else
+				break
+			end
         end
 
         puts "start read log"
@@ -1413,13 +1422,11 @@ namespace "run" do
     end
 
     task :phone_spec do
-      exit 1 if Jake.run_spec_app('android','phone_spec')
-      exit 0
+      exit Jake.run_spec_app('android','phone_spec')
     end
 
     task :framework_spec do
-      exit 1 if Jake.run_spec_app('android','framework_spec')
-      exit 0
+      exit Jake.run_spec_app('android','framework_spec')
     end
     
     task :emulator => "device:android:debug" do
@@ -1456,7 +1463,7 @@ namespace "run" do
 
       if !running
         # Start the emulator, check on it every 5 seconds until it's running
-        Thread.new { system("\"#{$emulator}\" -avd #{$avdname}") }
+        Thread.new { system("\"#{$emulator}\" -cpu-delay 0 -no-boot-anim -avd #{$avdname}") }
         puts "Waiting up to 180 seconds for emulator..."
         startedWaiting = Time.now
         adbRestarts = 1
@@ -1546,13 +1553,28 @@ namespace "uninstall" do
     args << flag
     args << "uninstall"
     args << $app_package_name
-    Jake.run($adb, args)
-    unless $?.success?
-      puts "Error uninstalling application"
-      exit 1
+    for i in 0..20
+		result = Jake.run($adb, args)
+		unless $?.success?
+			puts "Error uninstalling application"
+			exit 1
+		end
+
+		if result.include?("Success")
+			puts "Application uninstalled successfully"
+			break
+		else
+			if result.include?("Failure")					
+				puts "Application is not installed on the device"
+				break
+			else		
+				puts "Error uninstalling application"
+				exit 1 if i == 20
+			end
+		end
+		sleep(5)
     end
-
-    puts "Application uninstalled successfully"
+    
   end
 
   namespace "android" do

data/platform/android/build/librhocommon_build.files

@@ -18,6 +18,7 @@ platform/shared/net/CURLNetRequest.cpp
 platform/shared/net/HttpServer.cpp
 platform/shared/net/ssl.cpp
 platform/shared/net/URI.cpp
+platform/shared/net/INetRequest.cpp
 platform/shared/rubyext/GeoLocation.cpp
 platform/shared/rubyext/RhoAppAdapter.cpp
 platform/shared/rubyext/System.cpp

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

@@ -7,6 +7,7 @@ import com.rho.db.IDBResult;
 import com.rho.db.IDBStorage;
 import org.hsqldb.*;
 import org.hsqldb.persist.*;
+import com.rho.AppBuildConfig;
 
 public class HsqlDBStorage implements IDBStorage, Session.IDBCallback
 {
@@ -31,6 +32,7 @@ public class HsqlDBStorage implements IDBStorage, Session.IDBCallback
 		m_fs.delete(strDbName + ".script");
 		m_fs.delete(strDbName + ".script.new");
 		m_fs.delete(strDbName + ".journal");
+		m_fs.delete(strDbName + ".properties");
 	}
 	
 	private String getNameNoExt(String strPath){
@@ -50,7 +52,7 @@ public class HsqlDBStorage implements IDBStorage, Session.IDBCallback
 		return m_fs.exists(strDbName + ".data");
 	}
 	
-	public void open(String strPath, String strSqlScript) throws DBException 
+	public void open(String strPath, String strSqlScript, String strEncryptionInfo) throws DBException 
 	{
 		try{
 			m_strSqlScript = strSqlScript;
@@ -59,6 +61,9 @@ public class HsqlDBStorage implements IDBStorage, Session.IDBCallback
 			HsqlProperties props = new HsqlProperties();
 			props.setProperty(HsqlDatabaseProperties.hsqldb_default_table_type, "cached");
 
+			if ( strEncryptionInfo != null && strEncryptionInfo.length() > 0 )
+				props.setProperty(HsqlDatabaseProperties.hsqldb_encrypted, strEncryptionInfo);
+			
 			if ( !m_fs.exists(strDbName + ".script") && m_fs.exists(strDbName + ".script.new") )
 				m_fs.renameElement(strDbName + ".script.new", strDbName + ".script");
 				

data/platform/bb/Hsqldb/src/org/hsqldb/CachedDataRow.java

@@ -118,7 +118,7 @@ class CachedDataRow extends CachedRow {
      *  to true when changes are made to the Nodes. (Nodes are in-memory).
      *  The only time this is used is when a new Row is added to the Caches.
      */
-    public void write(RowOutputInterface out) {
+    public void write(RowOutputInterface out, boolean bFullSave) {
 
         out.writeSize(storageSize);
         out.writeData(oData, tTable);

data/platform/bb/Hsqldb/src/org/hsqldb/CachedRow.java

@@ -310,12 +310,13 @@ public class CachedRow extends Row {
      * @throws IOException
      * @throws HsqlException
      */
-    public void write(RowOutputInterface out) {
+    public void write(RowOutputInterface out, boolean bFullSave) {
 
         try {
             writeNodes(out);
 
-            if (hasDataChanged) {
+            if (bFullSave || hasDataChanged) 
+            {
                 out.writeData(oData, tTable);
                 out.writeEnd();
 

data/platform/bb/Hsqldb/src/org/hsqldb/Row.java

@@ -243,7 +243,7 @@ public class Row implements CachedObject {
 
     public void setInMemory(boolean in) {}
 
-    public void write(RowOutputInterface out) {}
+    public void write(RowOutputInterface out, boolean bFullSave) {}
 
     public void write(RowOutputInterface out, IntLookup lookup) {}
 

data/platform/bb/Hsqldb/src/org/hsqldb/persist/CachedObject.java

@@ -63,7 +63,7 @@ public interface CachedObject {
 
     void setInMemory(boolean in);
 
-    void write(RowOutputInterface out);
+    void write(RowOutputInterface out, boolean bFullSave);
 
     void write(RowOutputInterface out, IntLookup lookup);
 }