Changeset 1499

Timestamp:

11/30/08 02:43:42 (5 weeks ago)

Author:

bderenzi

Message:

committing new formmmanager code that uses threads and the loading screening

Location:

branches/dev-bdr/j2merosa/org.javarosa.formmanager/org.javarosa.formmanager/src/org/javarosa/formmanager/activity

Files:

• FormEntryActivity.java (modified) (6 diffs)
• FormLoadActivity.java (added)

branches/dev-bdr/j2merosa/org.javarosa.formmanager/org.javarosa.formmanager/src/org/javarosa/formmanager/activity/FormEntryActivity.java

@@ -1 +1 @@
 package org.javarosa.formmanager.activity;
 
-import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -19 +18 @@
 import org.javarosa.core.api.IView;
 import org.javarosa.core.model.FormDef;
-import org.javarosa.core.model.IFormDataModel;
-import org.javarosa.core.model.condition.EvaluationContext;
-import org.javarosa.core.model.condition.IFunctionHandler;
-import org.javarosa.core.model.instance.DataModelTree;
-import org.javarosa.core.model.storage.DataModelTreeRMSUtility;
-import org.javarosa.core.model.utils.ContextPreloadHandler;
-import org.javarosa.core.model.utils.IPreloadHandler;
-import org.javarosa.core.util.externalizable.DeserializationException;
 import org.javarosa.formmanager.controller.FormEntryController;
 import org.javarosa.formmanager.controller.IControllerHost;
 import org.javarosa.formmanager.model.FormEntryModel;
 import org.javarosa.formmanager.properties.FormManagerProperties;
-import org.javarosa.formmanager.utility.FormDefFetcher;
 import org.javarosa.formmanager.utility.IFormDefRetrievalMethod;
-import org.javarosa.formmanager.utility.RMSRetreivalMethod;
 import org.javarosa.formmanager.view.IFormEntryView;
 import org.javarosa.formmanager.view.IFormEntryViewFactory;
+import org.javarosa.polish.activity.loadingscreen.LoadingScreenActivity;
 
-public class FormEntryActivity implements IActivity, IControllerHost, CommandListener {
+public class FormEntryActivity  implements IActivity, IControllerHost, CommandListener {
 
         /** Alert if the form cannot load **/
@@ -59 +49 @@
         private IFormEntryViewFactory viewFactory;
 
-        private ContextPreloadHandler contextHandler;
+        private FormLoadActivity formLoader = null;
         
-        FormDefFetcher fetcher;
-
+        private LoadingScreenActivity loadingScreen = null;
+        
+        private int instanceID = -1;
 
         /** Loading error string **/
@@ -70 +61 @@
                 this.parent = parent;
                 this.viewFactory = viewFactory;
-                this.fetcher = new FormDefFetcher();
-                this.fetcher.setFetcher(new RMSRetreivalMethod());
+                
+                this.formLoader = new FormLoadActivity(this);
+                this.loadingScreen = new LoadingScreenActivity(this.parent);
         }
 
@@ -86 +78 @@
         }
 
-        public void start (Context context) {
-                FormDef theForm = null;
-                int instanceID = -1;
-
-                if (context instanceof FormEntryContext) {
-                        this.context = (FormEntryContext) context;
-                        instanceID = this.context.getInstanceID();
-                }
+        public void returnFromLoading(FormEntryContext context) {
+                // Kill the thread for the loading screen
+                this.loadingScreen.halt();
+                this.loadingScreen = null;
                 
-                theForm = fetcher.getFormDef(context);
-                if (theForm != null) {
-
-                        try {
-                                if (instanceID != -1) {
-                                        DataModelTreeRMSUtility modelUtil = (DataModelTreeRMSUtility)JavaRosaServiceProvider.instance().getStorageManager().getRMSStorageProvider().getUtility(DataModelTreeRMSUtility.getUtilityName());
-                                        IFormDataModel theModel = new DataModelTree();
-                                        modelUtil.retrieveFromRMS(this.context.getInstanceID(), theModel);
-                                        theForm.setDataModel(theModel);
-                                }
-                        } catch (IOException e) {
-                                e.printStackTrace();
-                        } catch (DeserializationException uee) {
-                                uee.printStackTrace();
-                        }
-                        
-                        theForm.setEvaluationContext(initEvaluationContext());
-                        initPreloadHandlers(theForm); // must always load; even if we won't preload, we may still post-process!
-
-                        theForm.initialize(instanceID == -1);
-
-                        model = new FormEntryModel(theForm, instanceID);
+                // get the form
+                FormDef theForm = (FormDef)context.getElement("theForm");
+                context = null;
+        
+                if( theForm != null){
+                        model = new FormEntryModel(theForm, this.instanceID);
                         controller = new FormEntryController(model, this);
                         String viewString = JavaRosaServiceProvider.instance().getPropertyManager().getSingularProperty(FormManagerProperties.VIEW_TYPE_PROPERTY);
+                        System.out.println("making view! " + viewString + model + controller);
                         view = viewFactory.getFormEntryView(viewString, model, controller);
+                        System.out.println("setting context");
                         view.setContext(this.context);
                         controller.setView(view);
-
+        
+                        System.out.println("showing view!");
                         view.show();
-                        
                 } else {
                         displayError(LOAD_ERROR);
                 }
         }
-
-        private void initPreloadHandlers (FormDef f) {
-                Vector preloadHandlers = this.context.getPreloadHandlers();
-                if(preloadHandlers != null) {
-                        Enumeration en = preloadHandlers.elements();
-                        while(en.hasMoreElements()) {
-                                f.getPreloader().addPreloadHandler((IPreloadHandler)en.nextElement());
-                        }
-                }
-
-                //set handler for preload context
-                contextHandler = new ContextPreloadHandler(context);
-                f.getPreloader().addPreloadHandler(contextHandler);
-        }
         
-        private EvaluationContext initEvaluationContext () {
-                EvaluationContext ec = new EvaluationContext();
+        public void start (Context context) {
+                this.instanceID = -1;
                 
-                Vector functionHandlers = this.context.getFunctionHandlers();
-                if(functionHandlers != null) {
-                        Enumeration en = functionHandlers.elements();
-                        while(en.hasMoreElements()) {
-                                ec.addFunctionHandler((IFunctionHandler)en.nextElement());
-                        }
+                if (context instanceof FormEntryContext) {
+                        this.context = (FormEntryContext) context;
+                        this.instanceID = this.context.getInstanceID();
                 }
                 
-                return ec;
+                System.out.println("almost starting loading screen");
+                // Start the loading screen
+                System.out.println("starting loading screen");
+                this.loadingScreen.start(context);
+                
+                // Start loading the form
+                this.formLoader.start(context);
         }
 
@@ -206 +169 @@
         
         public void setRetrievalMethod(IFormDefRetrievalMethod method) {
-                fetcher.setFetcher(method);
+                this.formLoader.setRetrievalMethod(method);
         }