Changeset 32 for chess

Timestamp:

02/09/09 10:32:59 (13 years ago)

Author:

BegemoT

Message:

 

Location:

chess

Files:

• build.xml (modified) (3 diffs)
• chess.jad (modified) (1 diff)
• src/chess/control/BaseController.java (modified) (4 diffs)
• src/chess/remote/IRemoteNode.java (modified) (1 diff)
• src/chess/remote/impl/BTNode.java (modified) (7 diffs)
• src/chess/remote/impl/BTRemote.java (modified) (1 diff)
• src/chess/remote/impl/debug/DebugRemote.java (modified) (2 diffs)

chess/build.xml

@@ -68 +68 @@
             <include name = "lib/midpapi21.jar" />
             <include name = "lib/cldcapi11.jar" />
-            <include name = "../TEMP/j2me/libs/bluecove-2.1.0.jar" />
+        </fileset>
+        <fileset dir = "${basedir}">
+            <include name = "libs/bluecove-2.1.0.jar" />
         </fileset>
     </path>
@@ -155 +157 @@
            fork = "true"
            target = "1.3"
+           source = "1.3"
            executable = "${module.jdk.bin.chess}/javac">
       <compilerarg line = "${compiler.args.chess}" />
@@ -215 +218 @@
   <target name = "preverify"
           description = "Preverify module &apos;chess&apos;">
-    <exec executable = "${jdk.home.SJWTK_2.5.2_01}/bin/preverify">
+    <exec executable = "${jdk.home.SJWTK_2.5.2_01}/bin/preverify"
+          failonerror = "true">
       <arg line = "-d ${tmp.dir.chess}" />
       <arg line = "-classpath ${jdk.home.SJWTK_2.5.2_01}/lib/midpapi21.jar;${jdk.home.SJWTK_2.5.2_01}/lib/cldcapi11.jar;${basedir}/libs/bluecove-2.1.0.jar" />

chess/chess.jad

@@ -1 +1 @@
 MIDlet-1: Chess Game, , chess.ui.ChessMIDlet
-MIDlet-Jar-Size: 85700
+MIDlet-Jar-Size: 311740
 MIDlet-Jar-URL: chess.jar
 MIDlet-Name: Chess

chess/src/chess/control/BaseController.java

@@ -6 +6 @@
 import javax.microedition.lcdui.Command;
 import javax.microedition.lcdui.Displayable;
+import javax.microedition.lcdui.AlertType;
 
 import chess.game.*;
@@ -159 +160 @@
 
     public void closed() {
+        final Throwable e = node.getError();
+        if ( e != null ) {
+            final Alert alert = new Alert( "Error", e.getMessage(), null, AlertType.ERROR );
+            app.getMidlet().display.setCurrent( alert );
+        }
         setStatus( WAITING_CONNECT );
     }
@@ -316 +322 @@
                 if ( status == WAITING_CONNECT ) {
                     //fixme: òóò ïîäñòàâà -- ïîõîæå, deadlock
-                    node.close();
+                    node.close( true );
                     midlet.searchGame();
                 }
@@ -328 +334 @@
             } else if ( c == ui.surrenderCommand ) {
                 postSurrender();
-                node.close();
+                node.close( true );
                 midlet.showStartScreen();
             } else if ( c == ui.askForDrawCommand ) {

chess/src/chess/remote/IRemoteNode.java

@@ -17 +17 @@
         public void send( final IDatagram data );
 
-    public void close();
+    public void close( final boolean safe );
+
+    public Throwable getError();
 }

chess/src/chess/remote/impl/BTNode.java

@@ -33 +33 @@
     private StreamConnection connection = null;
 
+    private volatile boolean quitPump = false;
+
     private transient InputStream in;
     private transient OutputStream out;
     private transient Thread pump;
+
+    private Throwable lastError = null;
 
     /**
@@ -128 +132 @@
                     queueOverloadedLock.wait( 250 );
                 } catch ( InterruptedException e ) {
-                    e.printStackTrace();
+                    //e.printStackTrace();
                 }
             }
@@ -145 +149 @@
                 listener.connected();
             }
-//                      synchronized( connectLock ) {
-//                              connectLock.notifyAll();
-//                      }
             final GenericDatagram data = new GenericDatagram();
-            while ( !isClosed() ) {
+            while ( !isClosed() && !quitPump ) {
                 synchronized ( this ) {
                     final int timeout;
@@ -188 +189 @@
         } catch ( Throwable e ) {
             e.printStackTrace();
+            lastError = e;
         } finally {
             pump = null;
-            close();
-        }
-    }
-
-    public void close() {
+            closeImpl();
+        }
+    }
+
+    public void close( final boolean safe ) {
         if ( isClosed() ) {
             return;
         }
+        if ( safe ) {
+            askPumpToQuit();
+        } else {
+            closeImpl();
+        }
+    }
+
+    public Throwable getError() {
+        return null;
+    }
+
+    private void closeImpl() {
         try {
             if ( in != null ) {
@@ -259 +273 @@
             } catch ( IOException ex ) {
                 ex.printStackTrace();
-                throw new RuntimeException( "Can't open input stream:" + ex.getMessage() );
+                throw ex;
+                //throw new IOException( "Can't open input stream:" + ex.getMessage() );
             }
         }
@@ -267 +282 @@
             } catch ( IOException ex ) {
                 ex.printStackTrace();
-                throw new RuntimeException( "Can't open output stream:" + ex.getMessage() );
+                throw ex;
+                //throw new IOException( "Can't open output stream:" + ex.getMessage() );
             }
         }
@@ -301 +317 @@
     }
 
+    private void askPumpToQuit() {
+        synchronized ( this ) {
+            quitPump = true;
+            notifyAll();
+        }
+        //device = null;
+    }
+
     private boolean isStartCalled() {
         return pump != null;

chess/src/chess/remote/impl/BTRemote.java

@@ -132 +132 @@
                                                                 return;
                                                         }
-                                                        client.close();
+                                                        client.close( true );
                                                 }
                                         } catch( InterruptedIOException ex ) {

chess/src/chess/remote/impl/debug/DebugRemote.java

@@ -203 +203 @@
                 }
 
-                public void close() {
+                public void close( final boolean safe ) {
                         listener.closed();
                 }
-        }
+
+        public Throwable getError() {
+            return null;
+        }
+    }
 
         private class ServerRemoteNode implements IRemoteNode {
@@ -316 +320 @@
                 }
 
-                public void close() {
+                public void close( final boolean safe ) {
                         listener.closed();
                 }
-        }
+
+        public Throwable getError() {
+            return null;
+        }
+    }
 
         private static class QueryDeviceProcess extends TimerTask implements IAsyncProcess {