Changeset 19

Timestamp:

07/03/07 19:26:57 (5 years ago)

Author:

ciro

Message:

invoked internal opcode constants in all java client code.
added a counter to the CommunicationController?, so after a certain amount of send messages without any received respond, the client assumes a connection error occured and forces to disconnect.
fixed a bug in the FormParser? (the "type='options' was actually ignored, whoops)

Location:

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

Files:

• control/Controller.java (modified) (8 diffs)
• events/Content.java (modified) (5 diffs)
• events/Opcode.java (modified) (1 diff)
• net/CommunicationController.java (modified) (3 diffs)
• parser/FormParser.java (modified) (3 diffs)
• screen/FormScreen.java (modified) (2 diffs)

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

@@ -179 +179 @@
      */
     public void processInternalEvent(int opcode, String data) {
-        AlertScreen alert = null;
+        AlertScreen alert = new AlertScreen(null, opcode, display.getCurrent());
+        
         switch (opcode) {
-            case 900:
+            case Opcode.IOP_START:
                 if (!communicator.isAlive()) {
                     this.handle(Opcode.IOP_PARSEFORM, Content.CONT_START);
@@ -189 +190 @@
                 break;
                 
-            case 990:
+            case Opcode.IOP_CONNECT:
                 // connect
                 /*
-                 * FIXME: without using a Thread here, the connection opening
-                 *        blocks and nothing happens - with a Thread it somehow
-                 *        magically works..
-                 */
-                /*
-                try {
-                    System.out.println("trying to connect to " + config.getServerString());
-                    communicator.open("socket://" + config.getServerString());
-                } catch (IOException ioe) {
-                    ioe.printStackTrace();
-                }
+                 * We have to use a separate thread to start the
+                 * CommunicationController.
                  */
                 if (!communicator.isAlive()) {
@@ -213 +205 @@
                 break;
                 
-            case Opcode.IOP_DISCONNECT: /* 991 */
+            case Opcode.IOP_DISCONNECT_CONF:
+                // disconnect confirmation
+                //alert.setTitle("Disconnect?");
+                alert.setString("Do you really want to disconnect?");
+                display.setCurrent(alert);
+                break;
+                
+            case Opcode.IOP_DISCONNECT_FORCED:
+                alert.setString("Network communication error: " + data);
+                display.setCurrent(alert);
+                break;
+                
+            case Opcode.IOP_DISCONNECT:
                 // disconnect
                 System.out.println("handling IOP_DISCONNECT");
@@ -220 +224 @@
                 break;
                 
-            case 901:
+            case Opcode.IOP_ABOUT_DIALOG:
                 // about
                 System.out.println("processing internal event \"About\"");
@@ -226 +230 @@
                 break;
                 
-            case 920:
+            case Opcode.IOP_SETTINGS:
                 // settings
                 this.handle(Opcode.IOP_PARSEFORM, Content.CONT_SETTINGS);
                 break;
                 
-            case 921:
+            case Opcode.IOP_SETTINGS_SAVE:
                 // save settings
                 config.writeSettings(form);
@@ -238 +242 @@
                 } catch (IOException ioe) {
                     ioe.printStackTrace();
-                    alert = new AlertScreen("Saving settings failed!", 921, null);
+                    //alert.setTitle("Saving settings failed!");
                     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
-                            */
+                    break;
                 }
-                alert = new AlertScreen("Settings saved", 921, null);
+                //alert.setTitle("Settings saved");
                 alert.setString("Your settings have been saved successfully");
                 display.setCurrent(alert);
@@ -254 +254 @@
                 break;
                 
-            case 998: // exit confirmation
-                alert = new AlertScreen("Exit?", 998, display.getCurrent());
+            case Opcode.IOP_INT_EXIT_CONF: // exit confirmation
+                //alert.setTitle("Exit?");
                 alert.setString("Do you really want to quit?");
                 display.setCurrent(alert);
                 break;
                 
-            case 999:
+            case Opcode.IOP_INT_EXIT:
                 // exit (the real one)
                 if (communicator.isAlive()) {
@@ -294 +294 @@
             alert.setString("Unable to connect to remote server:\n" + e.getMessage());
             display.setCurrent(alert);
-            return; /* hum.. */
+            return;
         }
         CommunicationController.getInstance().send(Opcode.OP_HELLO, null);

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

@@ -26 +26 @@
             "   <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=\"0998\"/>" +
-            "   <command type=\"back\" label=\"Exit\" opcode=\"0998\"/>" +
+            "   <command label=\"Connect\" opcode=\"0" + Opcode.IOP_CONNECT + "\"/>" +
+            "   <command label=\"Settings\" opcode=\"0" + Opcode.IOP_SETTINGS + "\"/>" +
+            "   <command label=\"About\" opcode=\"0" + Opcode.IOP_ABOUT_DIALOG + "\"/>" +
+            "   <command label=\"Exit\" opcode=\"0" + Opcode.IOP_INT_EXIT_CONF + "\"/>" +
+            "   <command type=\"back\" label=\"Exit\" opcode=\"0" + Opcode.IOP_INT_EXIT_CONF + "\"/>" +
             "</form>";
     
@@ -38 +38 @@
             "   <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\"/>" +
+            "   <command label=\"Connect\" opcode=\"0" + Opcode.IOP_CONNECT + "\"/>" +
+            "   <command label=\"Settings\" opcode=\"0" + Opcode.IOP_SETTINGS + "\"/>" +
+            "   <command label=\"About\" opcode=\"0" + Opcode.IOP_ABOUT_DIALOG + "\"/>" +
+            "   <command label=\"Exit\" opcode=\"0" + Opcode.IOP_INT_EXIT_CONF + "\"/>" +
+            "   <command type=\"back\" label=\"Exit\" opcode=\"0" + Opcode.IOP_INT_EXIT_CONF + "\"/>" +
             "</form>";
             
@@ -49 +49 @@
             //"   <image file=\"mymrc.png\"/>" +
             "   <string label=\"hallo :)\"/>" +
+            "   <string label=\"OH OH! this is deprecated, it shouldn't be displayed\"/>" +
             "   <command label=\"Continue\" opcode=\"0000\"/>" +
             "   <command label=\"Disconnect\" opcode=\"0991\"/>" +
@@ -61 +62 @@
             "   <textfield setting=\"serverHost\" label=\"Server Host\" size=\"20\"/>" +
             "   <textfield setting=\"serverPort\" label=\"Server Port\" type=\"number\" size=\"5\"/>" +
-            "   <command type=\"back\" label=\"Cancel\" opcode=\"0900\"/>" +
-            "   <command label=\"Save\" opcode=\"0921\"/>" +
+            "   <command type=\"back\" label=\"Cancel\" opcode=\"0" + Opcode.IOP_START + "\"/>" +
+            "   <command label=\"Save\" opcode=\"0" + Opcode.IOP_SETTINGS_SAVE + "\"/>" +
             "</form>";
     
@@ -69 +70 @@
             "   <string label=\"myMRC 0.1\"/>" +
             "   <string label=\"(c) 2007 Sven Gregori and Damien Lefevre\"/>" +
-            "   <command type=\"back\" label=\"OK\" opcode=\"0900\"/>" +
+            "   <command type=\"back\" label=\"Ok\" opcode=\"0" + Opcode.IOP_START + "\"/>" +
             "</form>";
 }

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

@@ -33 +33 @@
      * 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;
+    public static final int   IOP_START             =   900;
+    public static final int   IOP_ABOUT_DIALOG      =   901;
+    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_SETTINGS          =   920;
+    public static final int   IOP_SETTINGS_SAVE     =   921;
+    public static final int   IOP_CONNECT           =   990;
+    public static final int   IOP_DISCONNECT_CONF   =   991;
+    public static final int   IOP_DISCONNECT_FORCED =   992;
+    public static final int   IOP_DISCONNECT        =   993;
+    public static final int   IOP_INT_EXIT_CONF     =   998;
+    public static final int   IOP_INT_EXIT          =   999;
 }

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

@@ -105 +105 @@
             
         } catch (ConnectionNotFoundException cnfe) {
-            /* 
-             * 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
@@ -198 +191 @@
             requestTable.put(replyId, requester);
         }
+        
         
         /*
@@ -249 +243 @@
         
         try {
+            if (counter > MAX_UNRESPONDED_SENDS) {
+                throw new IOException("Maximum unresponded sends exceeded");
+            }
+            
             /* finally! we can send it ;) */
             System.out.println("send: '" + sendBuf + "'");
             ostream.write(sendBuf.toString().getBytes());
             ostream.flush();
+            counter++;
             
         } catch (IOException ioe) {
             //ioe.printStackTrace();
-            Controller.getInstance().processInternalEvent(Opcode.IOP_DISCONNECT, null);
+            Controller.getInstance().processInternalEvent(
+                    Opcode.IOP_DISCONNECT_FORCED, ioe.getMessage());
         }
     }

mymrc/trunk/Java-client/src/org/myMRC/parser/FormParser.java

@@ -41 +41 @@
         if (parser.getEventType() == XmlPullParser.START_TAG) {
             if (parser.getName().equalsIgnoreCase("form")) {
-                String label = parser.getAttributeValue(null, "label");
-                form.setTitle(label);
+                String title = parser.getAttributeValue(null, "title");
+                form.setTitle(title);
 
                 while (!(parser.next() == XmlPullParser.END_TAG &&
@@ -50 +50 @@
                     createFormItem();
                 }
-                
-            } else if (parser.getName().equalsIgnoreCase("command")) {
-                String label = parser.getAttributeValue(null, "label");
-                String eventId = parser.getAttributeValue(null, "event");
-                form.addEventCommand(eventId, label);
-                
+                                
             } else {
                 /*
@@ -163 +158 @@
                 if (cmdType != null) {
                     if (cmdType.equalsIgnoreCase("options")) {
-                        
+                        form.addEventCommand(opcode, cmdLabel);
                     }
                     else if (cmdType.equalsIgnoreCase("back")) {

mymrc/trunk/Java-client/src/org/myMRC/screen/FormScreen.java

@@ -121 +121 @@
         if (command == backCommand) {
             controller.processOutput(backOpcode, null);
-            
+
         } else {
             for (int i = 0; i < commands.size(); i++) {
@@ -146 +146 @@
                             controller.processOutput(Opcode.OP_FORMVAL, value);
                         }
-                    } 
+                    }
+                    
                 } else if (command == cmd.getCommand()) {
                     String opcodeIdx = cmd.getOpcode();