package main.woj.ui;

import javax.swing.JFrame;
import javax.swing.JOptionPane;

import main.woj.gameplay.Question;

public class QuestionDialog {
	public static String showQuestion(JFrame gameFrame, Question question){
		String result = (String)JOptionPane.showInputDialog(
				gameFrame,
				question.ask(),
                question.getQuestion(),
                JOptionPane.PLAIN_MESSAGE,
                null,
                question.getAnswerKey(),
                "ham");
		return result;
	}
}

@@ -448,24 +448,26 @@
 werKey(),%0A  
+//
             
@@ -478,16 +478,19 @@
 am%22);%0A%09%09
+// 
 return r
@@ -496,13 +496,238 @@
 result;%0A
+%09%09 %22NOANSWER%22);%0A%09%09%0A%09%09//This code prevents the cancel button from breaking.%0A%09%09//If the cancel button is selected, the player will have answered incorrectly.%0A%09%09if (result != null)%0A%09%09%09return result;%0A%09%09else%0A%09%09%09return %22NOANSWER%22;%0A
 %09%7D%0A%7D%0A

Fix the Cancel button