From 2a10b79368cf39fd4d7c704cb7e7ff42227fc382 Mon Sep 17 00:00:00 2001
From: gv1 <gv1@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Thu, 13 Aug 2009 15:07:20 +0000
Subject: [PATCH] changed booleanUserInput signature
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@11537 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
uk/ac/sanger/artemis/io/UI.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/uk/ac/sanger/artemis/io/UI.java b/uk/ac/sanger/artemis/io/UI.java
index b03ac0f41..48ddde5f6 100644
--- a/uk/ac/sanger/artemis/io/UI.java
+++ b/uk/ac/sanger/artemis/io/UI.java
@@ -58,7 +58,7 @@ public class UI {
return result.trim();
}
- public static boolean booleanUserInput(final String prompt)
+ public static boolean booleanUserInput(final String label, final String message)
{
if (mode == UIMode.SCRIPT)
{
@@ -68,9 +68,8 @@ public class UI {
else if (mode == UIMode.SWING)
{
final JPanel msgPanel = new JPanel(new BorderLayout());
- msgPanel.add(new JLabel("Destination format can't handle all " +
- "keys/qualifiers - continue?"), BorderLayout.NORTH);
- JTextArea msgError = new JTextArea(prompt);
+ msgPanel.add(new JLabel(label), BorderLayout.NORTH);
+ JTextArea msgError = new JTextArea(message);
msgError.setLineWrap(true);
msgError.setEditable(false);
JScrollPane scollMsg = new JScrollPane(msgError);
@@ -90,7 +89,7 @@ public class UI {
boolean valid = false;
while ( valid == false )
{
- input = userInput(prompt + "(y/n)", false);
+ input = userInput(label + "\n" + message + "(y/n)", false);
if (input.equals("y"))
valid = true;
else if (input.equals("n"))
--
GitLab