rhodes 2.2.6 → 2.3.0.beta.1

data/platform/bb/RubyVM/src/com/rho/RhoConf.java

@@ -3,23 +3,31 @@ package com.rho;
 import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Hashtable;
+import java.util.Vector;
 
 import com.rho.net.NetResponse;
 import com.xruby.runtime.builtin.*;
 import com.xruby.runtime.lang.*;
 import com.rho.net.NetRequest.MultipartItem;
 import com.rho.file.SimpleFile;
+import com.rho.file.RhoFile;
 
 public class RhoConf {
     String      m_strConfFilePath = "";
     String      m_strRhoRootPath = "";
     private Hashtable m_mapValues = new Hashtable();
+    Hashtable/*<String,String>*/ m_mapChangedValues = new Hashtable();
+    Hashtable/*Ptr<String,Vector<String>* >*/ m_mapConflictedValues = new Hashtable();
+    
 	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
 		new RhoLogger("RhoConf");
     
     private static RhoConf m_Instance;
-	private static String CONF_FILENAME = "apps/rhoconfig.txt";
-    
+	private static final String CONF_FILENAME = "apps/rhoconfig.txt";
+	private static final String CONF_CHANGES = ".changes";
+	private static final String CONF_TIMESTAMP = ".timestamp";
+	private static final String CONF_TIMESTAMP_PROP = "rho_conf_timestamp";
+	
     public static RhoConf getInstance(){return m_Instance;}
     
 	void setConfFilePath(String path){ m_strConfFilePath = path; }
@@ -28,15 +36,20 @@ public class RhoConf {
 	void setRhoRootPath(String szRootPath){ m_strRhoRootPath = szRootPath;}
 	public String getRhoRootPath(){ return m_strRhoRootPath;}
 	
-    public void saveToFile(){
-        String strData = saveToString();
+	Hashtable/*Ptr<String,Vector<String>* >&*/ getConflicts(){ return m_mapConflictedValues;}
+	
+    private void saveToFile(String szName)
+    {
+    	m_mapChangedValues.put(szName, getString(szName) );
+    	
+        String strData = saveChangesToString();
     	SimpleFile oFile = null;
 
     	try{
 	        oFile = RhoClassFactory.createFile();
-	        oFile.delete(getConfFilePath());
+	        oFile.delete(getConfFilePath()+CONF_CHANGES);
 	        
-        	oFile.open( getConfFilePath(), false, false);
+        	oFile.open( getConfFilePath()+CONF_CHANGES, false, false);
 	        oFile.write( 0, strData.getBytes() );
 	        oFile.close();
     	}catch(Exception exc){
@@ -45,46 +58,68 @@ public class RhoConf {
     	}
         
     }
+
+    void checkConflicts()
+    {
+        m_mapConflictedValues.clear();
+        
+    	Enumeration enValues = m_mapChangedValues.elements();
+    	Enumeration enKeys = m_mapChangedValues.keys();
+		while (enValues.hasMoreElements()) 
+		{
+			String key = (String)enKeys.nextElement();
+			String valueChanged = (String)enValues.nextElement();
+			
+			if ( !m_mapValues.containsKey(key) )
+				continue;
+			
+            String strValue = (String)m_mapValues.get(key);
+            if ( strValue.compareTo(valueChanged) != 0 )
+            {
+                Vector/*<String>* */ values = new Vector/*<String>*/();
+                values.addElement(valueChanged);
+                values.addElement(strValue);
+                m_mapConflictedValues.put(key, values);
+            }
+        }
+    }
+
+    public void conflictsResolved()
+    {
+        if (m_mapConflictedValues.size() == 0 )
+            return;
+
+        String strTimestamp = RhoFile.readStringFromJarFile(CONF_FILENAME+CONF_TIMESTAMP, this);
+        
+        setString(CONF_TIMESTAMP_PROP, strTimestamp, true);
+        m_mapConflictedValues.clear();
+    }
     
-    void loadFromFile(){
-    	SimpleFile oFile = null;
-    	try{
-	        oFile = RhoClassFactory.createFile();
-	        oFile.open( getConfFilePath(), true, false);
-	        
-	        if ( oFile.isOpened() ){
-	            String strSettings = oFile.readString();
-	            oFile.close();
-	            
-	            Hashtable saved_mapValues = m_mapValues;
-	            m_mapValues = new Hashtable();	            
-	            loadFromString( strSettings );
-	            
-	            Object oldVer = m_mapValues.get("app_version");
-	            Object newVer = saved_mapValues.get("app_version");
-	            if ( oldVer != null && newVer != null && oldVer.equals(newVer))
-	            {
-	            	Enumeration vals = m_mapValues.elements();
-	            	Enumeration keys = m_mapValues.keys();
-	        		while (vals.hasMoreElements()) 
-	        		{
-	        			saved_mapValues.put(keys.nextElement(), vals.nextElement());
-	        		}
-	            }else
-	            {
-	            	oFile.delete(getConfFilePath());
-	            }
-	            
-	            m_mapValues = saved_mapValues;
-	        }
-	        
-    	}catch(Exception exc){
-    		if ( oFile != null )
-    			try{ oFile.close(); }catch(IOException exc2){}
-    	}
+    void readChanges()
+    {
+        String strTimestamp = RhoFile.readStringFromJarFile(CONF_FILENAME+CONF_TIMESTAMP, this);
+
+        if ( RhoFile.isFileExist( getConfFilePath()+CONF_CHANGES) )
+        {
+            String strSettings = RhoFile.readStringFromFile(getConfFilePath()+CONF_CHANGES);
+            loadFromString( strSettings, m_mapChangedValues );
+
+            String strOldTimestamp = "";
+            if ( m_mapChangedValues.containsKey(CONF_TIMESTAMP_PROP) )
+                strOldTimestamp = (String)m_mapChangedValues.get(CONF_TIMESTAMP_PROP);
+            
+            if ( strTimestamp.compareTo(strOldTimestamp) != 0 )
+                checkConflicts();
+            
+            loadFromString( strSettings, m_mapValues );            
+        }else
+        {
+            m_mapChangedValues.put(CONF_TIMESTAMP_PROP,strTimestamp);
+        }
     }
     
-    void loadFromString(String szSettings){
+    void loadFromString(String szSettings, Hashtable/*<String,String>&*/ mapValues)
+    {
 		Tokenizer stringtokenizer = new Tokenizer(szSettings, "\n");
 		while (stringtokenizer.hasMoreTokens()) {
 			String tok = stringtokenizer.nextToken();
@@ -113,18 +148,20 @@ public class RhoConf {
 				value = value.substring(1,value.length()-1);
 			}
 				
-			setPropertyByName(name,value);
+			setPropertyByName(name,value,mapValues);
 		}
 	}
 
-    public void setPropertyByName(String name, String value ){
-    	m_mapValues.put(name,value);
+    public void setPropertyByName(String name, String value, Hashtable/*<String,String>&*/ mapValues )
+    {
+    	mapValues.put(name,value);
     }
 	
-    String saveToString(){
+    String saveChangesToString()
+    {
     	String strData = "";
-    	Enumeration enValues = m_mapValues.elements();
-    	Enumeration enKeys = m_mapValues.keys();
+    	Enumeration enValues = m_mapChangedValues.elements();
+    	Enumeration enKeys = m_mapChangedValues.keys();
 		while (enValues.hasMoreElements()) {
 			String key = (String)enKeys.nextElement();
 			String value = (String)enValues.nextElement();
@@ -167,40 +204,26 @@ public class RhoConf {
         return getInt(szName) == 0 ? false : true;
     }
 
-    public void   setString(String szName, String str, boolean bSaveToFile){
+    public void setString(String szName, String str, boolean bSaveToFile){
     	m_mapValues.put(szName,str);
     	
     	if ( bSaveToFile )
-    		saveToFile();    	
+    		saveToFile(szName);    	
     }
 
-    public void   setInt(String szName, int nVal, boolean bSaveToFile){
+    public void setInt(String szName, int nVal, boolean bSaveToFile){
     	m_mapValues.put(szName,Integer.toString(nVal));
     	
     	if ( bSaveToFile )
-    		saveToFile();    	
+    		saveToFile(szName);    	
     }
 
-    public void   setBool(String szName, boolean bVal, boolean bSaveToFile){
-        setInt(szName, bVal ? 1 : 0 );
-        
-    	if ( bSaveToFile )
-    		saveToFile();    	
+    public void setBool(String szName, boolean bVal, boolean bSaveToFile)
+    {
+        setInt(szName, bVal ? 1 : 0, bSaveToFile );
     }
     
-    public void   setString(String szName, String str){
-    	m_mapValues.put(szName,str);
-    }
-
-    public void   setInt(String szName, int nVal){
-    	m_mapValues.put(szName,Integer.toString(nVal));
-    }
-
-    public void   setBool(String szName, boolean bVal){
-        setInt(szName, bVal ? 1 : 0 );
-    }
-
-    public boolean  isExist(String szName){
+    public boolean isExist(String szName){
     	return m_mapValues.containsKey(szName);
     }
     
@@ -217,45 +240,22 @@ public class RhoConf {
     	m_Instance.setRhoRootPath(szRootPath);
     }
 
-    public void loadConf(){
+    public void loadConf()
+    {
+        m_mapValues.clear();
+        m_mapChangedValues.clear();
+
     	loadFromJar();
-    	loadFromFile();
+        
+    	readChanges();
+
     	loadFromJad();
     }
 
-    public String loadFileFromJar(String path)
-    {
-		java.io.InputStream fstream = null;
-		String strFile = "";		
-		try {
-			fstream = RhoClassFactory.createFile().getResourceAsStream(getClass(),
-				 "/" + path);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		
-		if ( fstream == null )
-			return strFile;
-		 
-		try{
-			byte[] data = new byte[fstream.available()];
-			int len = fstream.read(data);
-			if ( len == 0 )
-				return strFile;
-			
-			strFile = new String(data,0,len);
-		}catch(java.io.IOException exc){
-		}
-		
-		try{fstream.close();}catch(java.io.IOException exc){}
-		
-		return strFile;
-    }
-    
     private void loadFromJar()
     {
-    	String strSettings = loadFileFromJar(CONF_FILENAME);
-		loadFromString(strSettings);
+    	String strSettings = RhoFile.readStringFromJarFile(CONF_FILENAME, this);
+		loadFromString(strSettings, m_mapValues);
    }
     
    void loadFromJad()
@@ -293,6 +293,27 @@ public class RhoConf {
 	   return nTotal;
    }
    
+   public RubyHash getRubyConflicts()
+   {
+	   RubyHash hashConflicts = ObjectFactory.createHash();
+	   
+		Hashtable/*Ptr<String,Vector<String>* >&*/ mapConflicts = RhoConf.getInstance().getConflicts();
+    	Enumeration enValues = mapConflicts.elements();
+    	Enumeration enKeys = mapConflicts.keys();
+		while (enValues.hasMoreElements()) {
+			String key = (String)enKeys.nextElement();
+			Vector/*<String>&*/ values = (Vector)enValues.nextElement();
+			
+		    RubyArray arValues = new RubyArray(values.size());
+		    for( int i = 0; i < (int)values.size(); i++)
+		    	arValues.add(ObjectFactory.createString((String)values.elementAt(i)));
+		
+		    hashConflicts.add(ObjectFactory.createString(key), arValues);
+		}
+	   
+	   return hashConflicts;
+   }
+   
    static RubyString getLogText_ruby(long limit)throws Exception
 	{
 		StringBuffer res = new StringBuffer(); 
@@ -390,7 +411,7 @@ public class RhoConf {
 		
 		if ( resp == null || !resp.isOK() )
 		{
-	        LOG.ERROR("send_log failed : network error - " + resp.getRespCode() + "; Body - " + resp.getCharData());
+	        LOG.ERROR("send_log failed : network error - " +  ( resp == null ? "" : resp.getRespCode() + "; Body - " + resp.getCharData()));
 			
 			return false;
 		}
@@ -402,9 +423,8 @@ public class RhoConf {
 	   klass.getSingletonClass().defineMethod("set_property_by_name", new RubyTwoArgMethod() {
 			protected RubyValue run(RubyValue receiver, RubyValue arg0, RubyValue arg1, RubyBlock block) {
 				try {
-					RhoConf.getInstance().setPropertyByName(arg0.toString(), arg1.toString());
-					RhoConf.getInstance().saveToFile();
-					//RhoConf.getInstance().loadFromFile();
+					RhoConf.getInstance().setString(arg0.toString(), arg1.toString(), true);
+					
 					RhoLogger.getLogConf().loadFromConf(RhoConf.getInstance());
 				} catch (Exception e) {
 					LOG.ERROR("set_property_by_name failed", e);

data/platform/bb/RubyVM/src/com/rho/RhoLogConf.java

@@ -29,16 +29,15 @@ public class RhoLogConf {
 	
 	RhoConf RHOCONF(){ return RhoConf.getInstance(); }
 	
-    public void saveToFile(){
-        RHOCONF().setInt("MinSeverity", getMinSeverity() );
-        RHOCONF().setBool("LogToOutput", isLogToOutput() );
-        RHOCONF().setBool("LogToFile", isLogToFile() );
-        RHOCONF().setString("LogFilePath", getLogFilePath() );
-        RHOCONF().setInt("MaxLogFileSize", getMaxLogFileSize() );
-        RHOCONF().setString("LogCategories", getEnabledCategories() );
-        RHOCONF().setString("ExcludeLogCategories", getDisabledCategories() );
-
-        RHOCONF().saveToFile();
+    public void saveToFile()
+    {
+        RHOCONF().setInt("MinSeverity", getMinSeverity(), true );
+        RHOCONF().setBool("LogToOutput", isLogToOutput(), true );
+        RHOCONF().setBool("LogToFile", isLogToFile(), true  );
+        RHOCONF().setString("LogFilePath", getLogFilePath(), true  );
+        RHOCONF().setInt("MaxLogFileSize", getMaxLogFileSize(), true  );
+        RHOCONF().setString("LogCategories", getEnabledCategories(), true  );
+        RHOCONF().setString("ExcludeLogCategories", getDisabledCategories(), true  );
     }
     
     void loadFromConf(RhoConf oRhoConf){

data/platform/bb/RubyVM/src/com/rho/RhoLogger.java

@@ -94,6 +94,21 @@ public class RhoLogger {
 			return res;
 		}
 	}
+
+	private String makeStringSizeEnd(String str, int nSize)
+	{
+		if ( str.length() >= nSize )
+			return str.substring(str.length()-nSize, str.length());
+		else {
+			String res = "";
+			for( int i = 0; i < nSize - str.length(); i++ )
+				res += ' ';
+			
+			res += str;
+			
+			return res;
+		}
+	}
 	
 	private String getThreadField(){
 		String strThread = Thread.currentThread().getName();
@@ -118,7 +133,7 @@ public class RhoLogger {
 	    else
 	    	m_strMessage += LogSeverityNames[m_severity].charAt(0);
 
-	    m_strMessage += " " + getLocalTimeString() + ' ' + makeStringSize(getThreadField(),8) + ' ' +
+	    m_strMessage += " " + getLocalTimeString() + ' ' + makeStringSizeEnd(getThreadField(),8) + ' ' +
 	    	makeStringSize(m_category,15) + "| ";
 	}
 

data/platform/bb/RubyVM/src/com/rho/RhoProfiler.java

@@ -4,7 +4,7 @@ import java.util.Calendar;
 
 public class RhoProfiler {
 
-	public static boolean RHO_STRIP_PROFILER = false;
+	public static boolean RHO_STRIP_PROFILER = true;
 	
 	public static final String FILE_READ = "FileRead";
 	public static final String FILE_WRITE = "FileWrite";

data/platform/bb/RubyVM/src/com/rho/RhoRuby.java

@@ -29,6 +29,9 @@ public class RhoRuby {
 	public static final RubyID serveIndexID = RubyID.intern("serve_index_hash");
 	public static final RubyID raiseRhoError = RubyID.intern("raise_rhoerror");
 	public static final RubyID initApp = RubyID.intern("init_app");
+	public static final RubyID onConfigConflicts_mid = RubyID.intern("on_config_conflicts");
+	public static final RubyID uiCreated = RubyID.intern("ui_created");
+	public static final RubyID uiDestroyed = RubyID.intern("ui_destroyed");
 	public static final RubyID activateApp = RubyID.intern("activate_app");
 	public static final RubyID deactivateApp = RubyID.intern("deactivate_app");
 	
@@ -79,6 +82,23 @@ public class RhoRuby {
 		RubyAPI.callPublicNoArgMethod(receiver, null, initApp);
 	}
 
+	public static void call_config_conflicts()
+	{
+		RubyHash hashConflicts = RhoConf.getInstance().getRubyConflicts();
+		if (hashConflicts.size().toInt() == 0 )
+			return;
+		
+		RubyAPI.callPublicOneArgMethod(receiver, hashConflicts, null, onConfigConflicts_mid);
+	}
+	
+	public static void rho_ruby_uiCreated() {
+		RubyAPI.callPublicNoArgMethod(receiver, null, uiCreated);
+	}
+	
+	public static void rho_ruby_uiDestroyed() {
+		RubyAPI.callPublicNoArgMethod(receiver, null, uiDestroyed);
+	}
+	
 	public static void rho_ruby_activateApp(){
 		RubyAPI.callPublicNoArgMethod(receiver, null, activateApp);
 	}

data/platform/bb/RubyVM/src/com/rho/RhodesApp.java

@@ -24,6 +24,7 @@ public class RhodesApp
 
 	Mutex m_mxScreenRotationCallback = new Mutex();
     String m_strScreenRotationCallback = "", m_strScreenRotationCallbackParams = "";
+    static String m_strStartParameters = "";
     
     int m_currentTabIndex = 0;
     String[] m_currentUrls = new String[5];
@@ -54,6 +55,9 @@ public class RhodesApp
     NetRequest getNet() { return RhoClassFactory.createNetRequest();}
     public String getHomeUrl(){ return m_strHomeUrl; }
     
+    public static void setStartParameters(String szParams ){ m_strStartParameters = (szParams != null? szParams : ""); }
+    public static String getStartParameters(){ return m_strStartParameters; }
+    
     RhodesApp(String strRootPath)
     {
         m_strRhoRootPath = strRootPath;
@@ -231,8 +235,7 @@ public class RhodesApp
 	            if ( nFragment >= 0 )
 	                strUrl = strUrl.substring(0, nFragment);
 	
-	            RHOCONF().setString("LastVisitedPage",strUrl);		
-	            RHOCONF().saveToFile();
+	            RHOCONF().setString("LastVisitedPage",strUrl, true);		
 	        }
     	}catch(Exception exc)
     	{

data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java

@@ -20,26 +20,27 @@ public abstract class ThreadQueue extends RhoThread
     {
         public abstract boolean equals(IQueueCommand cmd);
         public abstract String toString();
-        public abstract void execute();
     };
 
-    RhoClassFactory m_ptrFactory;
-	int           m_nPollInterval;
-   	Mutex m_mxStackCommands = new Mutex();
-   	LinkedList	  m_stackCommands = new LinkedList();
+    private RhoClassFactory m_ptrFactory;
+	private int           m_nPollInterval;
+	private Object m_mxStackCommands;// = new Mutex();
+   	private LinkedList	  m_stackCommands = new LinkedList();
 
     boolean m_bNoThreaded;
 
-    int  getPollInterval(){ return m_nPollInterval;}
+    public abstract void processCommand(IQueueCommand pCmd);
+    public void onTimeout(){}
+    
+    public int  getPollInterval(){ return m_nPollInterval;}
 
-    boolean isNoThreadedMode(){ return m_bNoThreaded; }
-    void setNonThreadedMode(boolean b){m_bNoThreaded = b;}
+    public boolean isNoThreadedMode(){ return m_bNoThreaded; }
+    public void setNonThreadedMode(boolean b){m_bNoThreaded = b;}
 
     public RhoClassFactory getFactory(){ return m_ptrFactory; }
 
-    int getLastPollInterval(){ return 0;}
-    //public abstract void processCommand(IQueueCommand pCmd);
-    boolean isSkipDuplicateCmd() { return false; }
+    public int getLastPollInterval(){ return 0;}
+    public boolean isSkipDuplicateCmd() { return false; }
 
     public ThreadQueue(RhoClassFactory factory)
     {
@@ -49,36 +50,45 @@ public abstract class ThreadQueue extends RhoThread
         m_bNoThreaded = false;
 
         m_ptrFactory = factory;
+        
+        m_mxStackCommands = getSyncObject();
+    }
+
+    protected void addQueueCommandInt(IQueueCommand pCmd)
+    {
+        LOG.INFO("addCommand: " + pCmd.toString());
+
+        synchronized(m_mxStackCommands)
+        {
+	    	boolean bExist = false;
+	        if ( isSkipDuplicateCmd() )
+	        {
+	    	    for ( int i = 0; i < (int)m_stackCommands.size(); i++ )
+	    	    {
+	    	    	if ( m_stackCommands.get(i).equals(pCmd) )
+	    		    {
+	                    LOG.INFO("Command already exists in queue. Skip it.");
+	    			    bExist = true;
+	    			    break;
+	    		    }
+	    	    }
+	        }
+	
+	    	if ( !bExist )
+	    		m_stackCommands.add(pCmd);
+        }
     }
 
     public void addQueueCommand(IQueueCommand pCmd)
     { 
-        LOG.INFO("addCommand: " + pCmd.toString() );
-    	synchronized(m_mxStackCommands)
-    	{
-		    boolean bExist = false;
-            if ( isSkipDuplicateCmd() )
-            {
-		        for ( int i = 0; i < (int)m_stackCommands.size(); i++ )
-		        {
-		        	if ( m_stackCommands.get(i).equals(pCmd) )
-		        	{
-				        bExist = true;
-				        break;
-			        }
-		        }
-            }
-
-		    if ( !bExist )
-    		    m_stackCommands.add(pCmd);
-	    }
+        addQueueCommandInt(pCmd);
 
         if ( isNoThreadedMode()  )
             processCommands();
-        else
-	        stopWait(); 
+        else if ( isAlive() )
+    	    stopWait(); 
     }
-
+    
     public void run()
     {
 	    LOG.INFO("Starting main routine...");
@@ -97,21 +107,34 @@ public abstract class ThreadQueue extends RhoThread
                     nWait = nWait2;
             }
 
-            if ( nWait >= 0 && !isStopping() && isNoCommands() )
-		    {
-                LOG.INFO("ThreadQueue blocked for " + nWait + " seconds...");
-                wait(nWait);
+            synchronized(m_mxStackCommands)
+            {
+	            if ( nWait >= 0 && !isStopping() && isNoCommands() )
+			    {
+	                LOG.INFO("ThreadQueue blocked for " + nWait + " seconds...");
+	                wait(nWait);
+	                
+	                if ( isNoCommands() )
+	                	onTimeout();
+	            }
             }
             nLastPollInterval = 0;
 
             if ( !isStopping() )
-    		    processCommands();
+            {
+	        	try{
+	        		processCommands();
+	        	}catch(Exception e)
+	        	{
+	        		LOG.ERROR("processCommand failed", e);
+	        	}
+            }
 	    }
 	    
 	    LOG.INFO("Thread shutdown");	    
     }
 
-    boolean isNoCommands()
+    public boolean isNoCommands()
     {
 	    boolean bEmpty = false;
 	    synchronized(m_mxStackCommands)
@@ -136,14 +159,10 @@ public abstract class ThreadQueue extends RhoThread
 	    }
     }
 
-    public void processCommand(IQueueCommand pCmd)
-    {
-    	pCmd.execute();
-    }
-    
     public void setPollInterval(int nInterval)
     { 
-        m_nPollInterval = nInterval; 
-        stopWait();
+        m_nPollInterval = nInterval;
+        if ( isAlive() )        
+        	stopWait();
     }
 }