rhodes 2.2.6 → 2.3.0.beta.1

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

@@ -2,9 +2,19 @@ package com.rho;
 
 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(){ return false; }
 	
 	public boolean isTouchScreen()
 	{

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

@@ -0,0 +1,2 @@
+package com.rho.db;
+

data/platform/bb/rhodes/platform/common/com/rho/db/SqliteResult.java

@@ -0,0 +1,2 @@
+package com.rho.db;
+

data/platform/bb/rhodes/platform/common/com/rho/db/SqliteStorage.java

@@ -0,0 +1,2 @@
+package com.rho.db;
+

data/platform/bb/rhodes/rhodes.jdp

@@ -25,6 +25,9 @@ RubyVM
 ExcludeFromBuildAll=0
 [Files
 resources\icon.png
+src\com\rho\db\SqliteStorage.java
+src\com\rho\db\SqliteResult.java
+src\com\rho\db\SqliteCopyResult.java
 src\com\rho\BBVersionSpecific.java
 src\com\rho\BrowserAdapter.java
 src\com\rho\BrowserAdapter5.java

data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java

@@ -7,15 +7,7 @@ import com.rho.net.URI;
 import rhomobile.*;
 import rhomobile.RhodesApplication.PrimaryResourceFetchThread;
 
-import net.rim.device.api.browser.field.BrowserContent;
-import net.rim.device.api.browser.field.Event;
-import net.rim.device.api.browser.field.RedirectEvent;
-import net.rim.device.api.browser.field.RenderingApplication;
-import net.rim.device.api.browser.field.RenderingException;
-import net.rim.device.api.browser.field.RenderingOptions;
-import net.rim.device.api.browser.field.RenderingSession;
-import net.rim.device.api.browser.field.RequestedResource;
-import net.rim.device.api.browser.field.UrlRequestedEvent;
+import net.rim.device.api.browser.field.*;
 import net.rim.device.api.io.http.HttpHeaders;
 import net.rim.device.api.system.Application;
 import net.rim.device.api.system.Display;
@@ -157,8 +149,12 @@ public class BrowserAdapter implements RenderingApplication, IBrowserAdapter
                 break;
 
             case Event.EVENT_SET_HEADER :
-            case Event.EVENT_SET_HTTP_COOKIE : {
-            	/*String cookie = ((SetHttpCookieEvent)event).getCookie();
+            case Event.EVENT_SET_HTTP_COOKIE : 
+            {
+            	String cookie = ((SetHttpCookieEvent)event).getCookie();
+            	String strUrl = ((SetHttpCookieEvent)event).getURL();
+            	m_app.setCookie(strUrl, cookie);
+            	/*
         		String response = processAjaxCall(cookie);
         		if (response != null)
         			synchronized (pendingResponses) {
@@ -183,7 +179,8 @@ public class BrowserAdapter implements RenderingApplication, IBrowserAdapter
         BrowserContent browserContent = null;
 
         try {
-            browserContent = _renderingSession.getBrowserContent(connection, this, (Event)e);
+        	if ( connection.getResponseCode() != HttpConnection.HTTP_NOT_MODIFIED )
+        		browserContent = _renderingSession.getBrowserContent(connection, this, (Event)e);
 
             if (browserContent != null) {
        			browserContent.finishLoading();
@@ -217,8 +214,8 @@ public class BrowserAdapter implements RenderingApplication, IBrowserAdapter
                 }
                 
             }
-        } catch (RenderingException re) {
-        	LOG.ERROR("RenderingException", re);
+        } catch (Exception re) {
+        	LOG.ERROR("processConnection failed.", re);
 	    } finally {
 	        SecondaryResourceFetchThread.doneAddingImages();
 	    }
@@ -232,8 +229,9 @@ public class BrowserAdapter implements RenderingApplication, IBrowserAdapter
 		return Display.getWidth();
 	}
 
-	public String getHTTPCookie(String url) {
-		return null;
+	public String getHTTPCookie(String url) 
+	{
+		return m_app.getCookie(url);		
 	}
 
 	public int getHistoryPosition(BrowserContent browserContent) {
@@ -264,8 +262,8 @@ public class BrowserAdapter implements RenderingApplication, IBrowserAdapter
 	        	}else
 	        	{
 		            HttpConnection connection = Utilities.makeConnection(url, resource.getRequestHeaders(), null, null);
-		            if (bLocalHost)
-		            	m_connResource = connection;
+		            //if (bLocalHost)
+		            //	m_connResource = connection;
 		            return connection;
 	        	}
         	}else
@@ -329,6 +327,11 @@ public class BrowserAdapter implements RenderingApplication, IBrowserAdapter
     
     public void executeJavascript(String strJavascript)
     {
+//    	m_app.navigateUrlWithEvent("javascript:" + URI.urlEncode(strJavascript), new ExecutingScriptEvent(null, ExecutingScriptEvent.TYPE_JAVASCRIPT) );
+    }
+    
+    public void setCookie(String url, String cookie)
+    {
     	
     }
 }

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

@@ -1,28 +1,178 @@
 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.RhoLogger;
+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 );
+		
+		m_oConfig.setProperty(BrowserFieldConfig.ALLOW_CS_XHR, Boolean.TRUE);        		
 	}
 
 	public void setFullBrowser()
 	{
 	}
 	
+	private void createBrowserField()
+	{
+		LOG.INFO("Use BrowserField5");
+		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) 
     {
+    	try
+    	{
+    		if ( connection.getResponseCode() == HttpConnection.HTTP_NOT_MODIFIED )
+    			return;
+    	}catch( java.io.IOException exc)
+    	{
+    		LOG.ERROR("processConnection - getResponseCode failed.", exc);
+    	}
+    	
+        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("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);
+        }
     }
     
+    //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/src/com/rho/IBrowserAdapter.java

@@ -7,4 +7,5 @@ public interface IBrowserAdapter {
 	public boolean navigationMovement(int dx, int dy, int status, int time);
 	public void executeJavascript(String strJavascript);
 	public void setFullBrowser();
+	public void setCookie(String url, String cookie);
 }

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

@@ -1,13 +1,72 @@
 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 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 abstract void onTouchUnclick();
+	protected boolean touchEvent(TouchEvent message) {
+		if ( RhodesApplication.getInstance().isInputDisabled() )
+			return true;
+		
+		int nEvent = message.getEvent();
+		switch( nEvent )
+		{
+		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);
+	}
 	
 	public boolean isTouchScreen()
 	{
-		return false;
-	}	
+	    //DeviceInfo.getDevicename()
+	    return net.rim.device.api.ui.Touchscreen.isSupported();
+	}
+	
+	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);
+		super.sublayout(arg0, arg1);
+	}
+	
 };

data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java

@@ -22,7 +22,7 @@ import rhomobile.datetime.DateTimePicker;
 import rhomobile.mapview.MapView;
 import com.rho.rubyext.GeoLocation;
 
-import com.rho.db.HsqlDBStorage;
+//import com.rho.db.HsqlDBStorage;
 import com.rho.db.IDBStorage;
 import com.rho.file.*;
 import com.rho.net.SSLSocket;
@@ -206,10 +206,6 @@ public class RhoRubyHelper implements IRhoRubyHelper {
 		return strRes;
 	}
 
-	public IDBStorage createDBStorage() {
-		return new HsqlDBStorage();
-	}
-
 	public IFileAccess createFileAccess() {
 		return new FileAccessBB();
 	}
@@ -235,4 +231,9 @@ public class RhoRubyHelper implements IRhoRubyHelper {
 	{
 		GeoLocation.wakeUp();
 	}
+	
+	public void unzip_file(String strPath)throws Exception
+	{
+		com.rho.rubyext.System.unzip_file(strPath);
+	}
 }

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

@@ -1,14 +1,254 @@
 package com.rho;
 
-import net.rim.device.api.ui.UiApplication;
+import java.io.InputStream;
+
+import javax.microedition.io.StreamConnection;
+
+import com.rho.RhoClassFactory;
+import com.rho.RhoEmptyLogger;
+import com.rho.RhoLogger;
+import com.rho.RhoThread;
+import com.rho.RhodesApp;
+import com.rho.ThreadQueue;
+import com.rho.ThreadQueue.IQueueCommand;
+import com.rho.net.URI;
 
-public class RhodesApplicationPlatform extends UiApplication
+import net.rim.blackberry.api.push.*;
+import net.rim.device.api.io.http.PushInputStream;
+import net.rim.device.api.system.ApplicationDescriptor;
+import net.rim.device.api.ui.UiApplication;
+import net.rim.device.api.util.DataBuffer;
+/**
+ *
+ */
+public class RhodesApplicationPlatform extends UiApplication implements PushApplication
 {
+	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
+		new RhoLogger("RhodesPUSH");
+	
+	private static final int CHUNK_SIZE = 256;
+	PushMessageThread m_PushMessageThread;
+
+    private static class PushStatusCommand implements IQueueCommand
+    {
+		String m_strStatus; 
+    	
+		public PushStatusCommand(String strStatus) 
+		{
+			m_strStatus = strStatus;
+		}
+		public boolean equals(IQueueCommand cmd){return false;}
+		
+		public void execute()
+		{
+	        try
+	        {
+	        	RhodesApp.getInstance().callPushCallback(m_strStatus);
+	        }catch(Exception exc)
+	        {
+	        	LOG.ERROR("callPushCallback failed.", exc);
+	        }
+		}
+    }
+    
+    private static class PushMessageCommand implements IQueueCommand
+    {
+		PushInputStream m_inputStream; 
+		StreamConnection m_conn;
+    	
+		public PushMessageCommand(PushInputStream inputStream, StreamConnection conn) 
+		{
+			m_inputStream = inputStream;
+			m_conn = conn;
+		}
+		public boolean equals(IQueueCommand cmd){return false;}
+		
+		public void execute()
+		{
+			InputStream input = null;
+
+			try
+			{
+				input = m_conn.openInputStream();
+                DataBuffer db = new DataBuffer();
+                byte[] data = new byte[CHUNK_SIZE];
+                int chunk = 0;
+                
+                while ( -1 != (chunk = input.read(data)) )
+                {
+                    db.write(data, 0, chunk);
+                }
+			
+                data = db.getArray();
+                
+	            try
+	            {
+	            	rhomobile.PushListeningThread.processPushMessage(data, db.getLength());
+	            }catch(Exception exc)
+	            {
+	            	LOG.ERROR("processPushMessage failed.Data: " + new String(data), exc);
+	            }catch(Throwable th)
+	            {
+	            	LOG.ERROR("processPushMessage crashed.Data: " + new String(data), th);
+	            }
+            }catch(Exception exc)
+            {
+            	LOG.ERROR("Read PUSH message failed.", exc);
+            }catch(Throwable th)
+            {
+            	LOG.ERROR("Read PUSH message crashed.", th);
+            }finally
+            {
+            	try
+            	{
+	                m_inputStream.accept();
+	
+	                if ( input != null)
+	                	input.close();
+	                
+	                m_inputStream.close();
+	                m_conn.close();
+            	}catch(Exception exc)
+            	{
+            		
+            	}
+            }
+		}		
+		
+    }
+	
+	private static class PushMessageThread extends ThreadQueue
+	{
+		public PushMessageThread() 
+		{
+			super(new RhoClassFactory());
+			
+	        ThreadQueue.setLogCategory(LOG.getLogCategory());
+
+	        setPollInterval(QUEUE_POLL_INTERVAL_INFINITE);
+	        
+	        start(epLow);
+		}
+		
+		public void processCommand(IQueueCommand pCmd)
+		{
+			((PushMessageCommand)pCmd).execute();
+		}
+	}
+	
+	public void onMessage(PushInputStream inputStream, StreamConnection conn) 
+	{
+		LOG.INFO("onMessage");
+		m_PushMessageThread.addQueueCommand( new PushMessageCommand(inputStream, conn) );
+	}
+
+	public void onStatusChange(PushApplicationStatus status) 
+	{
+        String strError = status.getError();
+
+        String strStatus = "", strRegReason = "";
+
+        switch( status.getStatus() ) 
+        {
+            case PushApplicationStatus.STATUS_ACTIVE:
+            	strStatus = "Active";
+                break;
+            case PushApplicationStatus.STATUS_FAILED:
+            	strStatus = "Failed";
+                break;
+            case PushApplicationStatus.STATUS_NOT_REGISTERED:
+            	strStatus = "Not Registered";
+                break;
+            case PushApplicationStatus.STATUS_PENDING:
+                strStatus = "Pending";
+                break;
+        }
+        
+        switch( status.getReason() ) {
+	        case PushApplicationStatus.REASON_SIM_CHANGE:
+	        	strRegReason = "Status change was initiated by SIM card change";
+	            break;
+	        case PushApplicationStatus.REASON_API_CALL:
+	        	strRegReason = "Status change was initiated by API call";
+	            break;
+	        case PushApplicationStatus.REASON_REJECTED_BY_SERVER:
+	        	strRegReason = "Registration was rejected by server ";
+	        	break;
+	        case PushApplicationStatus.REASON_NETWORK_ERROR:
+	        	strRegReason = "Communication failed due to network error ";
+	        	break;
+	        case PushApplicationStatus.REASON_INVALID_PARAMETERS:
+	        	strRegReason = "Invalid parameters were provided that caused registration failure ";
+	            break;
+        }
+        
+        String strMsg = "status="+URI.urlEncode(strStatus)+"&reason="+URI.urlEncode(strRegReason);
+        
+        if ( strError != null && strError.length() > 0 )
+        	strMsg += "&error="+URI.urlEncode(strError);
+
+		LOG.INFO("onStatusChange : " + strMsg);
+		
+		if ( m_PushMessageThread != null )
+			m_PushMessageThread.addQueueCommand( new PushStatusCommand(strMsg) );
+	}
+	
 	public void onPlatformActivate()
 	{
+		if ( com.rho.Capabilities.ENABLE_PUSH )
+		{
+			if ( !rhomobile.PushListeningThread.isPushServiceEnabled() )
+				return;
+			
+			getUiApplication().invokeLater( new Runnable()
+	        {
+	            public void run()
+	            {
+	                try
+	                {
+					    m_PushMessageThread = new PushMessageThread();
+					    String strAppName = RhoConf.getInstance().getString("push_service_appname");
+    			        String strUrl = RhoConf.getInstance().getString("push_service_url");
+					    if ( strAppName != null && strAppName.length() > 0 && strUrl != null && strUrl.length() > 0 )
+					    {
+					        int nPort = RhoConf.getInstance().getInt("push_service_port");
+					        byte btServiceType = RhoConf.getInstance().getString("push_service_type").equalsIgnoreCase("BPAS") ?
+							        PushApplicationDescriptor.SERVER_TYPE_BPAS : PushApplicationDescriptor.SERVER_TYPE_NONE;
+        					
+					        PushApplicationDescriptor pad = new PushApplicationDescriptor(
+							        strAppName, nPort, strUrl, btServiceType, 
+							        ApplicationDescriptor.currentApplicationDescriptor());
+        					
+					        PushApplicationStatus status = PushApplicationRegistry.getStatus(pad);
+        			
+					        LOG.INFO("registerPushService status : " + status.toString());
+        			
+					        if (status.getStatus() != PushApplicationStatus.STATUS_ACTIVE && status.getStatus() != PushApplicationStatus.STATUS_PENDING)
+					        {
+        						
+						        LOG.INFO("registerPushService registering push");
+        						
+						        PushApplicationRegistry.registerApplication(pad);
+					        }
+					    }
+					}catch(Exception exc)
+					{
+	                    LOG.ERROR("registerPushService failed.", exc);					
+					}catch(Throwable t)
+					{
+					    LOG.ERROR("registerPushService crashed.", t);
+					}
+	            }
+	        });
+		}
 	}
 	
 	public void onPlatformClose()
 	{
+		if ( m_PushMessageThread != null )
+			m_PushMessageThread.stop(3);
+		
+		m_PushMessageThread = null;
 	}
+	
 }