cleanup

[idea/community.git] / platform / vcs-impl / src / com / intellij / openapi / vcs / changes / ui / ChangeListChooser.java

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListChooser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListChooser.java
index 155557ab6f3c36b407bf9cf5602506c8d3375f79..6e4f4fc887bec412f31cb9417b2e695d0ba97dd2 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListChooser.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListChooser.java
@@ -18,9 +18,9 @@ package com.intellij.openapi.vcs.changes.ui;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vcs.changes.ChangeList;
+import com.intellij.openapi.vcs.changes.ChangeListEditHandler;
 import com.intellij.openapi.vcs.changes.LocalChangeList;
 import com.intellij.openapi.vcs.changes.LocalChangeListImpl;
-import com.intellij.openapi.vcs.changes.ChangeListEditHandler;
 import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -44,7 +44,7 @@ public class ChangeListChooser extends DialogWrapper {
     super(project, false);
     myProject = project;
 
-    ChangeListEditHandler handler = null;
+    ChangeListEditHandler handler;
     for (ChangeList changelist : changelists) {
       handler = ((LocalChangeListImpl)changelist).getEditHandler();
       if (handler != null) {
@@ -52,13 +52,14 @@ public class ChangeListChooser extends DialogWrapper {
       }
     }
 
-    myPanel = new ChangeListChooserPanel(null, new Consumer<Boolean>() {
-      public void consume(final Boolean aBoolean) {
-        setOKActionEnabled(aBoolean);
+    myPanel = new ChangeListChooserPanel(myProject, new Consumer<String>() {
+      public void consume(final String errorMessage) {
+        setOKActionEnabled(errorMessage == null);
+        setErrorText(errorMessage);
       }
     });
 
-    myPanel.init(project);
+    myPanel.init();
     myPanel.setChangeLists(changelists);
     myPanel.setDefaultSelection(defaultSelection);