[izpack-changes] r1689 - izpack-src/trunk/src/lib/com/izforge/izpack/installer

[noreply at berlios.de]

Author: jponge
Date: 2007-01-07 18:24:01 +0100 (Sun, 07 Jan 2007)
New Revision: 1689

Modified:
   izpack-src/trunk/src/lib/com/izforge/izpack/installer/IzPanel.java
Log:
patch fuzz can be silly at times...

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/installer/IzPanel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/installer/IzPanel.java	2007-01-07 17:16:08 UTC (rev 1688)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/IzPanel.java	2007-01-07 17:24:01 UTC (rev 1689)
@@ -390,8 +390,6 @@
      * @see AbstractUIHandler#askQuestion(String, String, int, int)
      */
     public int askQuestion(String title, String question, int choices, int default_choice)
-
-        if (user_choice == JOptionPane.CLOSED_OPTION) return AbstractUIHandler.ANSWER_NO;
     {
         int jo_choices = 0;
 
@@ -407,16 +405,19 @@
 
         if (user_choice == JOptionPane.YES_OPTION) return AbstractUIHandler.ANSWER_YES;
 
-    public boolean emitNotificationFeedback(String message)
+		if (user_choice == JOptionPane.CLOSED_OPTION) return AbstractUIHandler.ANSWER_NO;
+
+        if (user_choice == JOptionPane.NO_OPTION) return AbstractUIHandler.ANSWER_NO;
+
+        return default_choice;
+    }
+
+	public boolean emitNotificationFeedback(String message)
     {
        return (JOptionPane.showConfirmDialog(this, message, "Message", JOptionPane.WARNING_MESSAGE,
              JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION);
     }
-        if (user_choice == JOptionPane.NO_OPTION) return AbstractUIHandler.ANSWER_NO;
 
-        return default_choice;
-    }
-
     /**
      * Notify the user about something.
      *