Commits

Clayton Sims  committed 04a71db

Fixed S40 bugs and removed incorrectly added test form

  • Participants
  • Parent commits 3d1fc61

Comments (0)

Files changed (5)

File j2me/form-entry/src/org/javarosa/formmanager/api/GetFormHttpState.java

 
 public abstract class GetFormHttpState implements State,TrivialTransitions,HandledCommandListener,TransportListener {
 
-	protected ProgressScreen progressScreen;
-
+	protected ProgressScreen progressScreen;
+
 	private ByteArrayInputStream bin;
 
 	private SenderThread sendThread;
 		} else {
 			fail("Failure while fetching XForm: " + message.getFailureReason());
 		}
-	}
+	}
+	
+	public abstract void done();
 }

File j2me/javarosa-app/src/org/javarosa/demo/activity/formlist/JRDemoFormListController.java

 		formInfo = JRDemoUtil.getFormList();
 		
 		Vector formNames = new Vector();
-		for (Enumeration e = formInfo.elements(); e.hasMoreElements(); )
+		for (Enumeration e = formInfo.elements(); e.hasMoreElements(); ) {
 			formNames.addElement(e.nextElement());
+		}
 
 		
 		view = new JRDemoFormListView(Localization.get("jrdemo.formlist.title"), formNames, JRDemoContext._().getUser().isAdminUser());

File j2me/javarosa-app/src/org/javarosa/demo/activity/formlist/JRDemoFormListView.java

 
 public class JRDemoFormListView extends List {
 
-	public final Command CMD_VIEW_SAVED = new Command(Localization.get("jrdemo.formlist.command.viewsaved"), Command.OK, 3);
+	public final Command CMD_VIEW_SAVED = new Command(Localization.get("jrdemo.formlist.command.viewsaved"), Command.OK, 5);
 	public final Command CMD_EXIT = new Command(Localization.get("polish.command.exit"), Command.EXIT, 8);
 	public final Command CMD_DOWNLOAD_FORMS = new Command(Localization.get("jrdemo.formlist.command.downloadforms"),Command.EXIT,2);
 	public final Command CMD_SETTINGS = new Command(Localization.get("menu.Settings"),Command.SCREEN,5);

File j2me/javarosa-app/src/org/javarosa/demo/applogic/JRDemoContext.java

 			
 		UserUtility.populateAdminUser(m);
 		loadRootTranslator();
-		
-		try {
-			StorageManager.getStorage(FormDef.STORAGE_KEY).write(XFormUtils.getFormFromResource("/smstest.xhtml"));
-		} catch (StorageFullException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
 	}	
 
 	private void loadModules() {

File j2me/javarosa-app/src/org/javarosa/demo/applogic/JRDemoFormTransportState.java

 	public JRDemoFormTransportState(FormInstance tree, SubmissionProfile profile, int formId) throws IOException {
 		this(JRDemoContext._().buildMessage(tree, profile), formId);
 	}
-	
+
 	public JRDemoFormTransportState(TransportMessage message, int formId) {
 		super(message);
 		themessage = message; 
 			}
 		}
 	}
+	
+	
+	//DO NOT REMOVE. S40 BUG WORKAROUNDS
+	public abstract void done();
+	public abstract void sendToBackground(); 
 
 	//Forward along to children