MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-339513 Mark TreeClassChooserFactory.createFileChooser as deprecate

Browse Source 
closes https://github.com/JetBrains/intellij-community/pull/2612

GitOrigin-RevId: 40d5fdcad0f248da5fd15bee147cebd071ef73ff
This commit is contained in:
Madalin Valceleanu
2023-12-01 13:26:32 +00:00
committed by intellij-monorepo-bot
parent 502196ef75
commit f123efb2be
5 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java-impl/src/com/intellij/ide/util/TreeClassChooserFactoryImpl.java
View File

@@ -97,7 +97,7 @@ public class TreeClassChooserFactoryImpl extends TreeClassChooserFactory {
final PsiFile initialFile,
FileType fileType,
TreeFileChooser.PsiFileFilter filter) {
return new TreeFileChooserDialog(myProject, title, initialFile, fileType, filter, null, false, false);
return createFileChooser(title, initialFile, fileType, filter, false);
}
@Override
@@ -108,7 +108,7 @@ public class TreeClassChooserFactoryImpl extends TreeClassChooserFactory {
@Nullable FileType fileType,
@Nullable TreeFileChooser.PsiFileFilter filter,
boolean disableStructureProviders) {
return new TreeFileChooserDialog(myProject, title, initialFile, fileType, filter, null, disableStructureProviders, false);
return createFileChooser(title, initialFile, fileType, filter, disableStructureProviders, false);
}
@@ -120,6 +120,7 @@ public class TreeClassChooserFactoryImpl extends TreeClassChooserFactory {
@Nullable TreeFileChooser.PsiFileFilter filter,
boolean disableStructureProviders,
boolean showLibraryContents) {
return new TreeFileChooserDialog(myProject, title, initialFile, fileType, filter, null, disableStructureProviders, showLibraryContents);
return TreeFileChooserFactory.getInstance(myProject)
.createFileChooser(title, initialFile, fileType, filter, disableStructureProviders, showLibraryContents);
}
}

13
java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java
View File

@@ -77,6 +77,10 @@ public abstract class TreeClassChooserFactory {
ClassFilter classFilter,
@Nullable Comparator<? super NodeDescriptor<?>> comparator);
/**
* @deprecated Use {@link TreeFileChooserFactory#createFileChooser(String, PsiFile, FileType, TreeFileChooser.PsiFileFilter)}
*/
@Deprecated
@NotNull
public abstract TreeFileChooser createFileChooser(@NotNull @NlsContexts.DialogTitle String title,
@Nullable PsiFile initialFile,
@@ -84,6 +88,10 @@ public abstract class TreeClassChooserFactory {
@Nullable TreeFileChooser.PsiFileFilter filter);
/**
* @deprecated Use {@link TreeFileChooserFactory#createFileChooser(String, PsiFile, FileType, TreeFileChooser.PsiFileFilter, boolean)}
*/
@Deprecated
@NotNull
public abstract TreeFileChooser createFileChooser(@NotNull @NlsContexts.DialogTitle String title,
@Nullable PsiFile initialFile,
@@ -91,7 +99,10 @@ public abstract class TreeClassChooserFactory {
@Nullable TreeFileChooser.PsiFileFilter filter,
boolean disableStructureProviders);
/**
* @deprecated Use {@link TreeFileChooserFactory#createFileChooser(String, PsiFile, FileType, TreeFileChooser.PsiFileFilter, boolean, boolean)}
*/
@Deprecated
@NotNull
public abstract TreeFileChooser createFileChooser(@NotNull @NlsContexts.DialogTitle String title,
@Nullable PsiFile initialFile,

3
plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItemDialog.java
View File

@@ -6,6 +6,7 @@ import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.ide.util.TreeClassChooser;
import com.intellij.ide.util.TreeClassChooserFactory;
import com.intellij.ide.util.TreeFileChooser;
import com.intellij.ide.util.TreeFileChooserFactory;
import com.intellij.openapi.application.AccessToken;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.event.DocumentListener;
@@ -394,7 +395,6 @@ public final class ComponentItemDialog extends DialogWrapper {
@Override
public void actionPerformed(ActionEvent e) {
final TreeClassChooserFactory factory = TreeClassChooserFactory.getInstance(myProject);
PsiFile formFile = null;
if (myTextField.getText().length() > 0) {
VirtualFile formVFile = ResourceFileUtil.findResourceFileInScope(myTextField.getText(), myProject, ProjectScope.getAllScope(myProject));
@@ -402,6 +402,7 @@ public final class ComponentItemDialog extends DialogWrapper {
formFile = PsiManager.getInstance(myProject).findFile(formVFile);
}
}
final TreeFileChooserFactory factory = TreeFileChooserFactory.getInstance(myProject);
TreeFileChooser fileChooser = factory.createFileChooser(myTitle, formFile, null, myFilter, true, true);
fileChooser.showDialog();
PsiFile file = fileChooser.getSelectedFile();

4
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/IconEditor.java
View File

@@ -1,8 +1,8 @@
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.uiDesigner.propertyInspector.editors;
import com.intellij.ide.util.TreeClassChooserFactory;
import com.intellij.ide.util.TreeFileChooser;
import com.intellij.ide.util.TreeFileChooserFactory;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ResourceFileUtil;
import com.intellij.openapi.ui.TextFieldWithBrowseButton;
@@ -33,7 +33,7 @@ public class IconEditor extends PropertyEditor<IconDescriptor> {
myTextField.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
final TreeClassChooserFactory factory = TreeClassChooserFactory.getInstance(getModule().getProject());
final TreeFileChooserFactory factory = TreeFileChooserFactory.getInstance(getModule().getProject());
PsiFile iconFile = null;
if (myValue != null) {
VirtualFile iconVFile = ResourceFileUtil.findResourceFileInScope(myValue.getIconPath(), getModule().getProject(),

6
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.java
View File

@@ -2,8 +2,8 @@
package com.intellij.uiDesigner.propertyInspector.editors.string;
import com.intellij.CommonBundle;
import com.intellij.ide.util.TreeClassChooserFactory;
import com.intellij.ide.util.TreeFileChooser;
import com.intellij.ide.util.TreeFileChooserFactory;
import com.intellij.lang.properties.IProperty;
import com.intellij.lang.properties.PropertiesFileType;
import com.intellij.lang.properties.PropertiesReferenceManager;
@@ -358,8 +358,8 @@ public final class StringEditorDialog extends DialogWrapper{
PropertiesFile file = PropertiesUtilBase.getPropertiesFile(bundleNameText, myEditor.getModule(), myLocale);
PsiFile initialPropertiesFile = file == null ? null : file.getContainingFile();
final GlobalSearchScope moduleScope = GlobalSearchScope.moduleWithDependenciesScope(myEditor.getModule());
TreeFileChooser fileChooser = TreeClassChooserFactory.getInstance(project).createFileChooser(UIDesignerBundle.message("title.choose.properties.file"), initialPropertiesFile,
PropertiesFileType.INSTANCE, new TreeFileChooser.PsiFileFilter() {
TreeFileChooser fileChooser = TreeFileChooserFactory.getInstance(project).createFileChooser(UIDesignerBundle.message("title.choose.properties.file"), initialPropertiesFile,
PropertiesFileType.INSTANCE, new TreeFileChooser.PsiFileFilter() {
@Override
public boolean accept(PsiFile file) {
final VirtualFile virtualFile = file.getVirtualFile();