Changeset 15 for mymrc

Timestamp:

07/03/07 05:18:10 (5 years ago)

Author:

ciro

Message:

Small improvements, improved exception handling, added Alert dialogs

Location:

mymrc/trunk/Java-client/src/org/myMRC

Files:

• control/Controller.java (modified) (8 diffs)
• events/Content.java (modified) (1 diff)
• events/Opcode.java (modified) (2 diffs)
• net/CommunicationController.java (modified) (8 diffs)
• net/Receiver.java (modified) (1 diff)
• settings/Configuration.java (modified) (1 diff)

mymrc/trunk/Java-client/src/org/myMRC/control/Controller.java

@@ -107 +107 @@
     }
         
+    public void setScreen(Displayable screen) {
+        display.setCurrent(screen);
+    }
     
     /**
@@ -152 +155 @@
      */
     public void processOutput(String opcode, String data) {
-        if (opcode.charAt(0) == '0' && opcode.charAt(1) == '9') {
-            processInternalEvent(Util.atoi(opcode), data);
+        int iopcode = Util.atoi(opcode);
+        if (iopcode >= 900 && iopcode <= 999) {
+            processInternalEvent(iopcode, data);
+        
+        } else if (!communicator.isAlive()) {
+            /* 
+             * connection to server lost, we should display that and
+             * go back to the default screen instead of trying to send data.
+             */
+            this.handle(Opcode.IOP_PARSEFORM, Content.CONT_START_DISCONNECTED);
+            
         } else {
             communicator.send(opcode, data);
@@ -166 +178 @@
      * @param data   event's data
      */
-    private void processInternalEvent(int opcode, String data) {
+    public void processInternalEvent(int opcode, String data) {
+        AlertScreen alert = null;
         switch (opcode) {
             case 900:
@@ -192 +205 @@
                  */
                 if (!communicator.isAlive()) {
-                    ConnectionStarter comstarter = new ConnectionStarter();
+                    ConnectionStarter comstarter = new ConnectionStarter(this.display);
                     comstarter.start();
                 } else {
@@ -200 +213 @@
                 break;
                 
-            case 991:
+            case Opcode.IOP_DISCONNECT: /* 991 */
                 // disconnect
+                System.out.println("handling IOP_DISCONNECT");
                 communicator.destroy();
-                this.handle(Opcode.IOP_PARSEFORM, Content.CONT_START);
+                this.handle(Opcode.IOP_PARSEFORM, Content.CONT_START_DISCONNECTED);
                 break;
                 
@@ -221 +235 @@
                 config.writeSettings(form);
                 try {
-                confcon.getInstance().save();
+                    confcon.getInstance().save();
                 } catch (IOException ioe) {
                     ioe.printStackTrace();
-                }
-                this.processInternalEvent(900, null);
+                    alert = new AlertScreen("Saving settings failed!", 921, null);
+                    alert.setTimeout(alert.FOREVER);
+                    alert.setString("Error while saving settings:\n" + ioe.getMessage());
+                    display.setCurrent(alert);
+                    break; /* uhm.. I don't get it, I really NEED a break here..
+                            * well, at least in a test case where I manually
+                            * threw an IOException .. should be checked when
+                            * we have some real exception case
+                            */
+                }
+                alert = new AlertScreen("Settings saved", 921, null);
+                alert.setString("Your settings have been saved successfully");
+                display.setCurrent(alert);
+                //this.processInternalEvent(900, null);
+                break;
+                
+            case 998: // exit confirmation
+                alert = new AlertScreen("Exit?", 998, display.getCurrent());
+                alert.setString("Do you really want to quit?");
+                display.setCurrent(alert);
                 break;
                 
             case 999:
-                // exit
+                // exit (the real one)
                 if (communicator.isAlive()) {
-                    //this.processOutput(Opcode.OP_EXIT, null);
                     communicator.destroy(); // FIXME does it work?
                 }
@@ -239 +270 @@
     }
 }
+
+
 
 
@@ -246 +279 @@
  */
 class ConnectionStarter extends Thread {
+    private Display display;
+    
+    public ConnectionStarter(Display mainDisplay) {
+        this.display = mainDisplay;
+    }
+    
     public void run() {
+        /* hum, emulator doesn't react here sometimes anymore */
         try {
             CommunicationController.getInstance().open(
                     "socket://" + Configuration.getInstance().getServerString());
         } catch (Exception e) {
-            e.printStackTrace();
+            AlertScreen alert = new AlertScreen("Connection failed!", 990, display.getCurrent());
+            alert.setString("Unable to connect to remote server:\n" + e.getMessage());
+            display.setCurrent(alert);
+            return; /* hum.. */
         }
         CommunicationController.getInstance().send(Opcode.OP_HELLO, null);

mymrc/trunk/Java-client/src/org/myMRC/events/Content.java

@@ -23 +23 @@
     public static final String CONT_START = 
             "<form label=\"myMRC 0.1\">" + 
-            "   <image file=\"mymrc.png\"/>" +
+            //"   <image file=\"mymrc.png\"/>" +
+            "   <string label=\"hallo :)\"/>" +
+            "   <string label=\"Not Connected\"/>" +
             "   <command label=\"Connect\" opcode=\"0990\"/>" +
             "   <command label=\"Settings\" opcode=\"0920\"/>" +
             "   <command label=\"About\" opcode=\"0901\"/>" +
-            "   <command label=\"Exit\" opcode=\"0999\"/>" +
-            "   <command type=\"back\" label=\"Exit\" opcode=\"0999\"/>" +
+            "   <command label=\"Exit\" opcode=\"0998\"/>" +
+            "   <command type=\"back\" label=\"Exit\" opcode=\"0998\"/>" +
             "</form>";
     
+    public static final String CONT_START_DISCONNECTED =
+            "<form label=\"myMRC 0.1\">" + 
+            //"   <image file=\"mymrc.png\"/>" +
+            "   <string label=\"hallo :)\"/>" +
+            "   <string label=\"Connection lost!\"/>" +
+            "   <command label=\"Connect\" opcode=\"0990\"/>" +
+            "   <command label=\"Settings\" opcode=\"0920\"/>" +
+            "   <command label=\"About\" opcode=\"0901\"/>" +
+            "   <command label=\"Exit\" opcode=\"0998\"/>" +
+            "   <command type=\"back\" label=\"Exit\" opcode=\"0998\"/>" +
+            "</form>";
+            
     public static final String CONT_START_CONNECTED = 
             "<form label=\"myMRC 0.1\">" + 
-            "   <image file=\"mymrc.png\"/>" +
+            //"   <image file=\"mymrc.png\"/>" +
+            "   <string label=\"hallo :)\"/>" +
             "   <command label=\"Continue\" opcode=\"0000\"/>" +
             "   <command label=\"Disconnect\" opcode=\"0991\"/>" +
             "   <command label=\"Settings\" opcode=\"0920\"/>" +
             "   <command label=\"About\" opcode=\"0901\"/>" +
-            "   <command label=\"Exit\" opcode=\"0999\"/>" +
-            "   <command type=\"back\" label=\"Exit\" opcode=\"0999\"/>" +
+            "   <command label=\"Exit\" opcode=\"0998\"/>" +
+            "   <command type=\"back\" label=\"Exit\" opcode=\"0998\"/>" +
             "</form>";
     

mymrc/trunk/Java-client/src/org/myMRC/events/Opcode.java

@@ -20 +20 @@
     public static final String OP_HELLO     = "0000";
     public static final String OP_BACK      = "0001";
+    public static final int   IOP_BACK      =     1;
     public static final String OP_NEXT      = "0002";
     
@@ -28 +29 @@
     public static final String OP_FORMKEY   = "0401";
     public static final String OP_FORMVAL   = "0402";
-    
-    public static final String OP_PARSELIST = "0910";
-    public static final int   IOP_PARSELIST =   910;
-    public static final String OP_PARSRFORM = "0911";
-    public static final int   IOP_PARSEFORM =   911;
+  
+    /*
+     * client internal opcode group 09xx
+     */
+    public static final String OP_PARSELIST     = "0910";
+    public static final int   IOP_PARSELIST     =   910;
+    public static final String OP_PARSRFORM     = "0911";
+    public static final int   IOP_PARSEFORM     =   911;
+    public static final int   IOP_DISCONNECT    =   991;
 }

mymrc/trunk/Java-client/src/org/myMRC/net/CommunicationController.java

@@ -12 +12 @@
 import org.myMRC.Util;
 import org.myMRC.control.Controller;
+import org.myMRC.events.Opcode;
 
 
@@ -51 +52 @@
     private boolean isAlive = false;
     private RequestTable requestTable;
-    //private EventHandler eventHandler;
+    private int counter;
     
     final int EVENTID_SIZE =  4;
     final int DATABUF_SIZE = 16;
-    
+    final int MAX_UNRESPONDED_SENDS = 5;
     /**
      * Returns the singleton instance of this class.
@@ -68 +69 @@
     
     public static void destroy() {
+        System.out.println("seek and destroy \\o/");
         try {
             instance.close();
@@ -81 +83 @@
     private CommunicationController() {
         requestTable = new RequestTable();
-//        eventHandler = new EventHandler();
+        counter      = 0;
     }
     
@@ -96 +98 @@
         try {
             socket   = (SocketConnection) Connector.open(url);
+            socket.setSocketOption(SocketConnection.DELAY, 0); // disable Nagle
             ostream  = socket.openOutputStream();
             receiver = new Receiver(this, socket.openInputStream());
@@ -105 +108 @@
              * Event.execute() for EV_(RE)CONNECT will display an error in that
              * case, so no special handling necessary here.
+             *
+             *          FUCK THAT!
+             *          FIXME!
              */
             isAlive = false;
+            throw new IOException(cnfe.getMessage()); // FIXME: this is just a temporary hack
         } catch (IOException ioe) {
             ioe.printStackTrace();
@@ -245 +252 @@
             System.out.println("send: '" + sendBuf + "'");
             ostream.write(sendBuf.toString().getBytes());
+            ostream.flush();
+            
         } catch (IOException ioe) {
-            ioe.printStackTrace();
+            //ioe.printStackTrace();
+            Controller.getInstance().processInternalEvent(Opcode.IOP_DISCONNECT, null);
         }
     }
@@ -287 +297 @@
 //            eventHandler.handle(Event.getEvent(eventId), data);
         }
+        
+        counter = 0;
     }
     

mymrc/trunk/Java-client/src/org/myMRC/net/Receiver.java

@@ -80 +80 @@
             return null;
         }
+        /*
+         *java.io.IOException: error 104 during TCP read 
+        at com.sun.midp.io.j2me.socket.Protocol.nonBufferedRead(Protocol.java:299)
+        at com.sun.midp.io.BufferedConnectionAdapter.readBytes(BufferedConnectionAdapter.java:99)
+        at com.sun.midp.io.BaseInputStream.read(ConnectionBaseAdapter.java:582)
+        at org.myMRC.net.Receiver.read(Receiver.java:78)
+        at org.myMRC.net.Receiver.run(Receiver.java:47)
+
+         */
         
         

mymrc/trunk/Java-client/src/org/myMRC/settings/Configuration.java

@@ -32 +32 @@
      * default values
      */
-    final String DEFAULT_PATH   = "/myMRC/";
+    //final String DEFAULT_PATH   = "/myMRC/";
+    final String DEFAULT_PATH   = "/E:/Others/";
     final String CONFIG_FILE    = "myMRC.conf";