Skip to content

Fix HDInsight project wizard accessibility issue #5968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wezhang merged 1 commit into from
Oct 22, 2021
Merged

Fix HDInsight project wizard accessibility issue #5968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion ...lij/src/main/java/com/microsoft/azure/hdinsight/projects/ui/HDInsightProjectTypeStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.PluginsAdvertiser;
import com.intellij.platform.ProjectTemplate;
import com.microsoft.azure.hdinsight.projects.HDInsightExternalSystem;
import com.microsoft.azure.hdinsight.projects.HDInsightModuleBuilder;
import com.microsoft.azure.hdinsight.projects.HDInsightProjectTemplate;
import com.microsoft.azure.hdinsight.projects.HDInsightTemplatesType;
import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
import com.microsoft.intellij.ui.AccessibleListCellRenderer;
import org.jetbrains.annotations.NotNull;

import javax.swing.*;
Expand All @@ -39,10 +41,20 @@ public class HDInsightProjectTypeStep extends ModuleWizardStep implements Dispos

public HDInsightProjectTypeStep(HDInsightModuleBuilder moduleBuilder) {
this.moduleBuilder = moduleBuilder;
this.scalaPluginInstalled = PluginManager.getPlugin(PluginId.findId(SCALA_PLUGIN_ID)) != null;
this.scalaPluginInstalled = PluginManagerCore.getPlugin(PluginId.findId(SCALA_PLUGIN_ID)) != null;

this.templateList.addListSelectionListener(e -> onTemplateSelected());
this.templateList.setTemplates(moduleBuilder.getTemplates(), false);

var templateListView = this.templateList.getList();
templateListView.setCellRenderer(new AccessibleListCellRenderer<>() {
@NotNull
@Override
public String getText(ProjectTemplate template) {
return template.getName();
}
});

checkScalaPlugin();

this.externalSystemsLabel.setText("Build tool:");
Expand Down
23 changes: 23 additions & 0 deletions ...oolkit-for-intellij/src/main/java/com/microsoft/intellij/ui/AccessibleListCellRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*/

package com.microsoft.intellij.ui

import com.intellij.ui.SimpleListCellRenderer
import com.intellij.util.ui.JBUI
import javax.swing.JList

abstract class AccessibleListCellRenderer<T>() : SimpleListCellRenderer<T>() {
override fun customize(list: JList<out T>, value: T, index: Int, selected: Boolean, hasFocus: Boolean) {
text = getText(value)

if (selected) {
background = JBUI.CurrentTheme.List.Selection.background(hasFocus)
foreground = JBUI.CurrentTheme.List.Selection.foreground(hasFocus)
}
}

abstract fun getText(value: T): String
}