From 2f3d3c01dc3fc1db5ff659e3446132f791c7ac8d Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Sat, 11 Apr 2015 22:01:17 +0200 Subject: [PATCH] Check InputDialog validator also for initial value --- .../src/com/intellij/openapi/ui/Messages.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/platform/platform-api/src/com/intellij/openapi/ui/Messages.java b/platform/platform-api/src/com/intellij/openapi/ui/Messages.java index 763f773105aa..269afab8d08c 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/Messages.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1706,6 +1706,7 @@ public class Messages { super(project, message, title, options, defaultOption, icon, true); myValidator = validator; myField.setText(initialValue); + enableOkAction(); } public InputDialog(@Nullable Project project, @@ -1726,6 +1727,7 @@ public class Messages { super(parent, message, title, new String[]{OK_BUTTON, CANCEL_BUTTON}, 0, icon, true); myValidator = validator; myField.setText(initialValue); + enableOkAction(); } public InputDialog(String message, @@ -1736,6 +1738,11 @@ public class Messages { super(message, title, new String[]{OK_BUTTON, CANCEL_BUTTON}, 0, icon, true); myValidator = validator; myField.setText(initialValue); + enableOkAction(); + } + + private void enableOkAction() { + getOKAction().setEnabled(myValidator == null || myValidator.checkInput(myField.getText().trim())); } @NotNull