X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fbin%2FJalview.java;h=b7d15e55161637b5cb93bbc3a19803546a67293c;hb=a0770a417ea5add70c3075b9ae9218a58533ef13;hp=dbc1d8819cdd4159f52f21b4482c34c7727c8577;hpb=8dca84768d848bc368985a8f0938a6c7ac059952;p=jalview.git
diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index dbc1d88..b7d15e5 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -841,8 +841,6 @@ public class Jalview
cmds.processArgs();
boolean commandsSuccess = cmds.argsWereParsed();
- cliWarning();
-
if (commandsSuccess)
{
if (headlessArg)
@@ -1252,6 +1250,8 @@ public class Jalview
}
desktop.setInBatchMode(false);
}
+
+ cliWarning();
}
private static void setLookAndFeel()
@@ -1632,8 +1632,8 @@ public class Jalview
*/
PromptUserConfig prompter = new PromptUserConfig(Desktop.desktop,
"USAGESTATS",
- MessageManager.getString("prompt.plausible_analytics_title"),
- MessageManager.getString("prompt.plausible_analytics"),
+ MessageManager.getString("prompt.analytics_title"),
+ MessageManager.getString("prompt.analytics"),
new Runnable()
{
@Override
@@ -2060,14 +2060,14 @@ public class Jalview
if (oldStyle)
{
String warning = MessageManager
- .getString("warning.using_old_command_line_arguments")
- + "https://www.jalview.org/help/html/features/commandline.html";
+ .getString("warning.using_old_command_line_arguments");
+ String url = "https://www.jalview.org/help/html/features/commandline.html";
if (Desktop.instance != null)
{
String cont = MessageManager.getString("label.continue");
- Desktop.instance.nonBlockingDialog(32, 2, title, warning, cont,
- JvOptionPane.WARNING_MESSAGE, false, false);
+ Desktop.instance.nonBlockingDialog(32, 2, title, warning, url, cont,
+ JvOptionPane.WARNING_MESSAGE, false, true, true);
}
}
if (j.getCommands() != null && j.getCommands().getErrors().size() > 0)
@@ -2077,9 +2077,17 @@ public class Jalview
String message = MessageManager
.getString("warning.the_following_errors");
String ok = MessageManager.getString("action.ok");
- Desktop.instance.nonBlockingDialog(60, 16, title,
- message + "\n" + j.getCommands().errorsToString(), ok,
- JvOptionPane.WARNING_MESSAGE, true, true);
+ int shortest = 60;
+ List errors = j.getCommands().getErrors();
+ for (int i = 0; i < errors.size(); i++)
+ {
+ shortest = Math.min(shortest, errors.get(i).length());
+ }
+ Desktop.instance.nonBlockingDialog(
+ Math.max(message.length(), Math.min(60, shortest)),
+ Math.min(errors.size(), 20), title, message,
+ j.getCommands().errorsToString(), ok,
+ JvOptionPane.WARNING_MESSAGE, true, false, true);
}
}
}