From 5224001197fac0602b03b3f90e2a1284cd096bc5 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 13 Feb 2012 10:16:55 +0100 Subject: [PATCH] Dialog Wrapper: get fit --- .../intellij/openapi/ui/DialogWrapper.java | 45 ------------------- .../com/intellij/openapi/ui/OptionAction.java | 28 ++++++++++++ .../intellij/openapi/ui/ValidationInfo.java | 38 ++++++++++++++++ .../internal/validation/ValidationTest.java | 1 + .../changes/ui/CommitChangeListDialog.java | 3 -- .../actions/CreateXmlResourceDialog.java | 1 + .../android/logcat/EditLogFilterDialog.java | 1 + .../checkin/GitUserNameNotDefinedDialog.java | 1 + .../intentions/dynamic/ui/DynamicDialog.java | 1 + .../parameter/GrIntroduceParameterDialog.java | 1 + 10 files changed, 72 insertions(+), 48 deletions(-) create mode 100644 platform/platform-api/src/com/intellij/openapi/ui/OptionAction.java create mode 100644 platform/platform-api/src/com/intellij/openapi/ui/ValidationInfo.java diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java index ae9ed058fe81..e5032442360b 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java @@ -44,7 +44,6 @@ import com.intellij.util.ui.DialogUtil; import com.intellij.util.ui.UIUtil; import org.intellij.lang.annotations.MagicConstant; import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -1717,48 +1716,4 @@ public abstract class DialogWrapper { } private static enum ErrorPaintingType {DOT, SIGN, LINE} - - public static final class ValidationInfo { - public final String message; - public final JComponent component; - - public ValidationInfo(@NotNull String message, @Nullable JComponent component) { - this.message = message; - this.component = component; - } - - public ValidationInfo(@NotNull String message) { - this(message, null); - } - } - - public interface OptionAction extends Action { - - @NotNull - Action[] getOptions(); - - abstract class Impl extends AbstractAction implements OptionAction { - - private Action[] myOptions; - - public Impl(@NotNull Action[] options) { - myOptions = options; - } - - public Impl(String name, @NotNull Action[] options) { - super(name); - myOptions = options; - } - - public Impl(String name, Icon icon, @NotNull Action[] options) { - super(name, icon); - myOptions = options; - } - - @Override - public Action[] getOptions() { - return myOptions; - } - } - } } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/OptionAction.java b/platform/platform-api/src/com/intellij/openapi/ui/OptionAction.java new file mode 100644 index 000000000000..5e18ad3f388c --- /dev/null +++ b/platform/platform-api/src/com/intellij/openapi/ui/OptionAction.java @@ -0,0 +1,28 @@ +/* + * Copyright 2000-2012 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.openapi.ui; + +import org.jetbrains.annotations.NotNull; + +import javax.swing.*; + +/** +* @author Konstantin Bulenkov +*/ +public interface OptionAction extends Action { + @NotNull + Action[] getOptions(); +} diff --git a/platform/platform-api/src/com/intellij/openapi/ui/ValidationInfo.java b/platform/platform-api/src/com/intellij/openapi/ui/ValidationInfo.java new file mode 100644 index 000000000000..06a69663c806 --- /dev/null +++ b/platform/platform-api/src/com/intellij/openapi/ui/ValidationInfo.java @@ -0,0 +1,38 @@ +/* + * Copyright 2000-2012 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.openapi.ui; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import javax.swing.*; + +/** +* @author Konstantin Bulenkov +*/ +public final class ValidationInfo { + public final String message; + public final JComponent component; + + public ValidationInfo(@NotNull String message, @Nullable JComponent component) { + this.message = message; + this.component = component; + } + + public ValidationInfo(@NotNull String message) { + this(message, null); + } +} diff --git a/platform/platform-impl/src/com/intellij/internal/validation/ValidationTest.java b/platform/platform-impl/src/com/intellij/internal/validation/ValidationTest.java index 243dc14498ee..17f4a4f7f802 100644 --- a/platform/platform-impl/src/com/intellij/internal/validation/ValidationTest.java +++ b/platform/platform-impl/src/com/intellij/internal/validation/ValidationTest.java @@ -18,6 +18,7 @@ package com.intellij.internal.validation; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.ui.ValidationInfo; import javax.swing.*; import java.util.regex.Pattern; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java index fb5976f0501c..a8f8919f25e7 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java @@ -522,9 +522,6 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj return myHelpId; } - - - private class CommitAction extends AbstractAction implements OptionAction { private Action[] myOptions = new Action[0]; diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java b/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java index 8bc1055a1fd6..00efd1826104 100644 --- a/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java +++ b/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java @@ -11,6 +11,7 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.ui.ValidationInfo; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.components.JBLabel; diff --git a/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java b/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java index 48f9f698b44c..fc8bff1c052e 100644 --- a/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java +++ b/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java @@ -14,6 +14,7 @@ import com.intellij.openapi.editor.ex.FocusChangeListener; import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; +import com.intellij.openapi.ui.ValidationInfo; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.EnumComboBoxModel; diff --git a/plugins/git4idea/src/git4idea/checkin/GitUserNameNotDefinedDialog.java b/plugins/git4idea/src/git4idea/checkin/GitUserNameNotDefinedDialog.java index 05ed716e9663..8673ec383318 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitUserNameNotDefinedDialog.java +++ b/plugins/git4idea/src/git4idea/checkin/GitUserNameNotDefinedDialog.java @@ -17,6 +17,7 @@ package git4idea.checkin; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; +import com.intellij.openapi.ui.ValidationInfo; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/ui/DynamicDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/ui/DynamicDialog.java index 2a3cd094879f..11b3fd9d70b2 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/ui/DynamicDialog.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/ui/DynamicDialog.java @@ -25,6 +25,7 @@ import com.intellij.openapi.editor.Document; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.ui.ValidationInfo; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.ProjectScope; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java index 5dc151d670af..24365e5db527 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java @@ -18,6 +18,7 @@ package org.jetbrains.plugins.groovy.refactoring.introduce.parameter; import com.intellij.openapi.application.AccessToken; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.ui.Splitter; +import com.intellij.openapi.ui.ValidationInfo; import com.intellij.openapi.ui.VerticalFlowLayout; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.text.StringUtil;