MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java] Get rid of the ProgressIndicator for home path validity check

Browse Source 
IJ-CR-113554

GitOrigin-RevId: 1ce99ed76a26353f946838b8998ffc658775c85d
This commit is contained in:
Louis Vignier
2023-10-10 16:10:34 +02:00
committed by intellij-monorepo-bot
parent 1acd193bff
commit 2efb8e3072
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java
View File

@@ -6,11 +6,10 @@ import com.intellij.ide.plugins.newui.TwoLineProgressIndicator;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.SdkEditorAdditionalOptionsProvider;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectBundle;
import com.intellij.openapi.projectRoots.*;
@@ -28,7 +27,6 @@ import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.openapi.util.NlsSafe;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.DiskQueryRelay;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.wm.impl.status.InlineProgressIndicator;
import com.intellij.ui.TabbedPaneWrapper;
@@ -47,6 +45,8 @@ import java.awt.*;
import java.awt.event.HierarchyEvent;
import java.awt.event.HierarchyListener;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.*;
@@ -88,7 +88,6 @@ public class SdkEditor implements Configurable, Place.Navigator {
private final Consumer<Boolean> myResetCallback = __ -> {
if (!myIsDisposed) reset();
};
private ProgressIndicator myHomePathValidityProgressIndicator;
public SdkEditor(@NotNull Project project,
@NotNull ProjectSdksModel sdkModel,
@@ -140,7 +139,16 @@ public class SdkEditor implements Configurable, Place.Navigator {
myTabbedPane.addChangeListener(e -> myHistory.pushQueryPlace());
myHomeComponent = createHomeComponent();
myHomeComponent.getTextField().setEditable(false);
final JTextField textField = myHomeComponent.getTextField();
textField.setEditable(false);
textField.addHierarchyListener(new HierarchyListener() {
@Override
public void hierarchyChanged(HierarchyEvent e) {
if ((e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) == 0 || !textField.isShowing()) { return; }
checkHomePathValidity();
}
});
myHomeFieldLabel = new JLabel(getHomeFieldLabelValue());
myHomeFieldLabel.setLabelFor(myHomeComponent.getTextField());
myMainPanel.add(myHomeFieldLabel, new GridBagConstraints(
@@ -261,7 +269,6 @@ public class SdkEditor implements Configurable, Place.Navigator {
}
myAdditionalDataConfigurables.clear();
myAdditionalDataComponents.clear();
if (myHomePathValidityProgressIndicator != null) myHomePathValidityProgressIndicator.cancel();
Disposer.dispose(myDisposable);
}
@@ -278,36 +285,29 @@ public class SdkEditor implements Configurable, Place.Navigator {
private void setHomePathValue(@NlsSafe String absolutePath) {
myHomeComponent.setText(absolutePath);
JTextField textField = myHomeComponent.getTextField();
if (absolutePath != null && !absolutePath.isEmpty() && mySdk.getSdkType().isLocalSdk(mySdk)) {
textField.addHierarchyListener(new HierarchyListener() {
@Override
public void hierarchyChanged(HierarchyEvent e) {
if (myHomePathValidityProgressIndicator != null) myHomePathValidityProgressIndicator.cancel();
myHomeComponent.getTextField().setForeground(UIUtil.getFieldForegroundColor());
if ((e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) == 0) {
return;
}
if (myHomeComponent.isShowing()) {
checkHomePathValidity();
}
}
new Task.Backgroundable(myProject, ProjectBundle.message("sdk.configure.checking.home.path.validity"), true) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
myHomePathValidityProgressIndicator = indicator;
final File homeDir = new File(absolutePath);
boolean homeMustBeDirectory = ((SdkType)mySdk.getSdkType()).getHomeChooserDescriptor().isChooseFolders();
final boolean valid = DiskQueryRelay.compute(() -> homeDir.exists() && homeDir.isDirectory() == homeMustBeDirectory);
SwingUtilities.invokeLater(() -> {
textField.setForeground(valid ? UIUtil.getFieldForegroundColor()
: PathEditor.INVALID_COLOR);
});
}
}.queue();
}
});
}
else {
textField.setForeground(UIUtil.getFieldForegroundColor());
private void checkHomePathValidity() {
final JTextField textField = myHomeComponent.getTextField();
if (textField.getText().isEmpty() && !mySdk.getSdkType().isLocalSdk(mySdk)) {
return;
}
ApplicationManager.getApplication().executeOnPooledThread(() -> {
var homeDir = Path.of(textField.getText());
var homeMustBeDirectory = ((SdkType)mySdk.getSdkType()).getHomeChooserDescriptor().isChooseFolders();
var isValid = homeMustBeDirectory ? Files.isDirectory(homeDir) : Files.isRegularFile(homeDir);
ApplicationManager.getApplication().invokeLater(
() -> textField.setForeground(isValid ? UIUtil.getFieldForegroundColor() : PathEditor.INVALID_COLOR),
ModalityState.stateForComponent(myHomeComponent)
);
});
}
private void doSelectHomePath() {