OSDN Git Service

(root) / sudokuki / sudokuki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: da9ad9a)
Avoid (result=-1) when the "Resolution in progress" dialog is disposed of.
authorsvedrenne <sylvain@jankenpoi.net>
Fri, 26 Apr 2013 21:46:41 +0000 (23:46 +0200)
committersvedrenne <sylvain@jankenpoi.net>
Fri, 26 Apr 2013 21:46:41 +0000 (23:46 +0200)
README patch | blob | history
debian/changelog patch | blob | history
make_jar_zip_release.sh patch | blob | history
src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveAction.java patch | blob | history
src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java patch | blob | history
sudokuki.sh patch | blob | history

diff --git a/README b/README
index 88cd574..a1a66b5 100644 (file)
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ Sudokuki - essential sudoku game
 * 2013-04-26 - released Sudokuki 1.2 (Stable)
 - Added capability to resize the grid
 - Improved the paint process (more efficient)
-- dispose() [Resolution in progress] before showing [Resolution successful]
+- dispose() "Resolution in progress" dialog before showing "Resolution successful"
 - In the selection dialog, memos are no more in bold font when selected
 
 * 2013-02-07 - released Sudokuki 1.1.8 (Stable)
diff --git a/debian/changelog b/debian/changelog
index a0eeb3e..ab833ec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+sudokuki (1.2) unstable; urgency=low
+
+  * 2013-04-26 - released Sudokuki 1.2 (Stable)
+    - Added capability to resize the grid
+    - Improved the paint process (more efficient)
+    - dispose() "Resolution in progress" dialog before showing "Resolution successful"
+    - In the selection dialog, memos are no more in bold font when selected
+
+ -- Sylvain Vedrenne <sylvain@jankenpoi.net>  Fri, 26 Apr 2013 00:15:00 +0100
+
+
 sudokuki (1.1.8) unstable; urgency=low
 
   * 2013-02-07 - released Sudokuki 1.1.8 (Stable)
diff --git a/make_jar_zip_release.sh b/make_jar_zip_release.sh
index 0448c05..89bd271 100755 (executable)
--- a/make_jar_zip_release.sh
+++ b/make_jar_zip_release.sh
@@ -1,4 +1,4 @@
-RELEASEVERSION=1.1.8
+RELEASEVERSION=1.2
 ZIPRELEASEDIR="sudokuki-"$RELEASEVERSION"-binary"
 
 make && make dist-zip
diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveAction.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveAction.java
index 4384454..4ba015b 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveAction.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveAction.java
@@ -50,6 +50,7 @@ public class ResolveAction extends AbstractAction {
                int result = dlg.getResult();
                if (result == 0) {
                        setEnabled(false);
+                       view.getController().notifyGridResolutionSuccess();
                } else if (result == 2) {
                        JOptionPane.showMessageDialog(frame, "<html>"
                                        + "<table border=\"0\">" + "<tr>"
diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java
index 9ed6192..dc5267f 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java
@@ -43,7 +43,7 @@ import net.jankenpoi.sudokuki.view.GridView;
 @SuppressWarnings("serial")\r
 public class ResolveGridDialog extends JDialog {\r
 \r
-       private JFrame parent;\r
+       private final JFrame parent;\r
 \r
        private int status = -1;\r
 \r
@@ -55,7 +55,6 @@ public class ResolveGridDialog extends JDialog {
        private final GridModel gridToSolve;\r
 \r
        public ResolveGridDialog(JFrame parent, final GridView view) {\r
-\r
                super(parent, true);\r
                this.parent = parent;\r
                this.view = view;\r
@@ -91,8 +90,9 @@ public class ResolveGridDialog extends JDialog {
                                } catch (ExecutionException e) {\r
                                        e.printStackTrace();\r
                                        return;\r
+                               } finally {\r
+                                       dispose();\r
                                }\r
-                               dispose();\r
                        }\r
                };\r
                initComponents();\r
@@ -170,8 +170,6 @@ public class ResolveGridDialog extends JDialog {
                                        view.getController().notifyGridValueChanged(li, co, value, true);\r
                                }\r
                        }\r
-                       dispose();\r
-                       view.getController().notifyGridResolutionSuccess();\r
                        /**\r
                         * RESOLUTION SUCCESSFULL\r
                         */\r
@@ -183,5 +181,4 @@ public class ResolveGridDialog extends JDialog {
                        return Integer.valueOf(2);\r
                }\r
        }\r
-\r
 }\r
diff --git a/sudokuki.sh b/sudokuki.sh
index 5e0fe64..fbafd5d 100755 (executable)
--- a/sudokuki.sh
+++ b/sudokuki.sh
@@ -1,3 +1,3 @@
-RELEASEVERSION=1.1.8
+RELEASEVERSION=1.2
 
 java -Djava.library.path=. -jar sudokuki-"$RELEASEVERSION".jar -ui Swing
Git repository for Sudokuki on Sourceforge.jp
About OSDN
Find Software
Develop Software
Help