diff --git a/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.form b/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.form index e50ca1a24ec8..2eb4669ceb45 100644 --- a/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.form +++ b/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.form @@ -1,13 +1,13 @@
- + - - + + @@ -29,7 +29,7 @@ - + @@ -56,17 +56,17 @@ - + - + - + @@ -79,7 +79,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -96,19 +96,19 @@ - + + + + + + + + + - - - - - - - - diff --git a/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.java b/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.java index e80ee7188ac4..5e92b031ab07 100644 --- a/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.java +++ b/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.java @@ -26,6 +26,7 @@ import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.ui.InputValidator; import com.intellij.openapi.ui.Messages; import com.intellij.ui.ListUtil; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -187,4 +188,17 @@ public class JavaAutoImportOptions implements AutoImportOptionsProvider { private static boolean isModified(JToggleButton checkBox, boolean value) { return checkBox.isSelected() != value; } + + @Nls + public String getDisplayName() { + return "Java"; + } + + public Icon getIcon() { + return null; + } + + public String getHelpTopic() { + return "reference.settingsdialog.IDE.editor.autoimport"; + } } diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.form b/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.form deleted file mode 100644 index f00a801e7c1c..000000000000 --- a/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.form +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java index 17cbb8eb4c35..64ae8fbffecf 100644 --- a/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java @@ -16,22 +16,25 @@ package com.intellij.application.options.editor; +import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.extensions.Extensions; -import com.intellij.openapi.options.CompositeConfigurable; +import com.intellij.openapi.options.TabbedConfigurable; import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; -import java.awt.*; import java.util.Arrays; import java.util.List; /** * @author Dmitry Avdeev */ -public class AutoImportOptionsConfigurable extends CompositeConfigurable implements EditorOptionsProvider { - private JPanel myPanel; - private JPanel myProvidersPanel; +public class AutoImportOptionsConfigurable extends TabbedConfigurable implements EditorOptionsProvider { + + public AutoImportOptionsConfigurable(@NotNull Application application) { + super(application); + } protected List createConfigurables() { return Arrays.asList(Extensions.getExtensions(AutoImportOptionsProvider.EP_NAME)); @@ -50,19 +53,6 @@ public class AutoImportOptionsConfigurable extends CompositeConfigurable EP_NAME = ExtensionPointName.create("com.intellij.autoImportOptionsProvider"); diff --git a/platform/platform-impl/src/com/intellij/openapi/options/TabbedConfigurable.java b/platform/platform-impl/src/com/intellij/openapi/options/TabbedConfigurable.java index 05aeb2f36063..cc647fc660b2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/TabbedConfigurable.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/TabbedConfigurable.java @@ -25,7 +25,7 @@ import java.awt.*; /** * @author yole */ -public abstract class TabbedConfigurable extends CompositeConfigurable { +public abstract class TabbedConfigurable extends CompositeConfigurable { protected TabbedPaneWrapper myTabbedPane; private final Disposable myParent; diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties index f7ee122452fc..895921483d05 100644 --- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties +++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties @@ -292,8 +292,8 @@ group.virtual.space=Virtual Space checkbox.allow.placement.of.caret.after.end.of.line=Allow placement of caret after end of line checkbox.allow.placement.of.caret.inside.tabs=Allow placement of caret inside tabs checkbox.show.virtual.space.at.file.bottom=Show virtual space at file bottom -checkbox.optimize.imports.on.the.fly=Optimize imports on the fly -checkbox.add.unambiguous.imports.on.the.fly=Add unambiguous imports on the fly +checkbox.optimize.imports.on.the.fly=&Optimize imports on the fly +checkbox.add.unambiguous.imports.on.the.fly=&Add unambiguous imports on the fly combobox.strip.trailing.spaces.on.save=Strip trailing spaces on Save: group.limits=Limits editbox.recent.files.limit=Recent files limit: @@ -464,7 +464,7 @@ application.save.settings.error=Could not save application settings: {0} exit.confirm.title=Confirm Exit exit.confirm.prompt=Are you sure you want to exit {0}? exit.confirm.prompt.tasks=You have background tasks running. Are you sure you want to cancel them and exit {0}? -exclude.from.completion.group=Exclude from Import and Completion +exclude.from.completion.group=E&xclude from import and completion: exclude.from.completion.prompt=Enter the name of the package or class to exclude from auto-import and class name completion: exclude.from.completion.title=Exclude Package exclude.from.imports.add=A&dd diff --git a/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.form b/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.form index f2c539ce2bd0..56f7306a59fc 100644 --- a/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.form +++ b/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.form @@ -6,7 +6,7 @@ - + diff --git a/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.java b/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.java index 23e708377e7b..9a5be20252ee 100644 --- a/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.java +++ b/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.java @@ -17,6 +17,7 @@ package com.intellij.application.options; import com.intellij.application.options.editor.AutoImportOptionsProvider; import com.intellij.openapi.options.ConfigurationException; +import org.jetbrains.annotations.Nls; import javax.swing.*; @@ -47,4 +48,17 @@ public class XmlAutoImportOptionsProvider implements AutoImportOptionsProvider { public void disposeUIResources() { } + + @Nls + public String getDisplayName() { + return "XML"; + } + + public Icon getIcon() { + return null; + } + + public String getHelpTopic() { + return "reference.settingsdialog.IDE.editor.autoimport"; + } }