MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-123421 File chooser without path bar

Browse Source
This commit is contained in:
Dmitry Avdeev
2016-11-16 17:09:11 +03:00
parent d77e5e2c45
commit b2669e0d9f
3 changed files with 96 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/javaee/MapExternalResourceDialog.form
+32 -37
View File
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.javaee.MapExternalResourceDialog">
<grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="500" height="400"/>
<xy x="20" y="20" width="545" height="233"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value=""/>
</clientProperties>
<border type="none"/>
<children>
<component id="95c44" class="com.intellij.ui.components.JBLabel">
@@ -25,56 +28,48 @@
</constraints>
<properties/>
</component>
<grid id="2057d" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="462c0" binding="mySchemasPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="1" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
<html.disable class="java.lang.Boolean" value="false"/>
</clientProperties>
<border type="etched" title="Project &amp;Schemas"/>
<children>
<tabbedpane id="c9457" class="com.intellij.ui.components.JBTabbedPane" binding="myTabs">
<scrollpane id="ec831" class="com.intellij.ui.components.JBScrollPane">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="39983" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<tabbedpane title="Schemas"/>
</constraints>
<component id="a85b4" class="com.intellij.ui.treeStructure.Tree" binding="mySchemasTree">
<constraints/>
<properties/>
<border type="none"/>
<children>
<scrollpane id="ec831" class="com.intellij.ui.components.JBScrollPane">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="a85b4" class="com.intellij.ui.treeStructure.Tree" binding="mySchemasTree">
<constraints/>
<properties/>
</component>
</children>
</scrollpane>
</children>
</grid>
<grid id="d3553" binding="myExplorerPanel" custom-create="true" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="Explorer"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</component>
</children>
</tabbedpane>
</scrollpane>
</children>
</grid>
<component id="83ad2" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myFileTextField" custom-create="true">
<constraints>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="3b4be" class="com.intellij.ui.components.JBLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<labelFor value="83ad2"/>
<text value="&amp;File:"/>
</properties>
</component>
</children>
</grid>
</form>
xml/impl/src/com/intellij/javaee/MapExternalResourceDialog.java
+53 -86
View File
@@ -15,19 +15,17 @@
*/
package com.intellij.javaee;
import com.intellij.ide.DataManager;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.colors.EditorFontType;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileChooser.FileSystemTree;
import com.intellij.openapi.fileChooser.ex.FileSystemTreeImpl;
import com.intellij.openapi.fileChooser.FileChooserFactory;
import com.intellij.openapi.fileChooser.FileTextField;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.ui.TextBrowseFolderListener;
import com.intellij.openapi.ui.TextFieldWithBrowseButton;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
@@ -36,8 +34,6 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.ui.ColoredTreeCellRenderer;
import com.intellij.ui.DocumentAdapter;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.components.JBTabbedPane;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.tree.TreeUtil;
import com.intellij.xml.config.ConfigFileSearcher;
@@ -46,12 +42,13 @@ import com.intellij.xml.index.IndexedRelevantResource;
import com.intellij.xml.index.XmlNamespaceIndex;
import com.intellij.xml.index.XsdNamespaceBuilder;
import com.intellij.xml.util.XmlUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.event.DocumentEvent;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
@@ -68,14 +65,14 @@ import java.util.Set;
*/
public class MapExternalResourceDialog extends DialogWrapper {
private static final String MAP_EXTERNAL_RESOURCE_SELECTED_TAB = "map.external.resource.selected.tab";
private static final FileChooserDescriptor FILE_CHOOSER_DESCRIPTOR = new FileChooserDescriptor(true, false, false, false, true, false).withTitle("Choose Schema File");
private JTextField myUri;
private JPanel myMainPanel;
private JTree mySchemasTree;
private JPanel myExplorerPanel;
private JBTabbedPane myTabs;
private final FileSystemTreeImpl myExplorer;
private String myLocation;
private JPanel mySchemasPanel;
private TextFieldWithBrowseButton myFileTextField;
private boolean mySchemaFound;
public MapExternalResourceDialog(String uri, @Nullable Project project, @Nullable PsiFile file, @Nullable String location) {
super(project);
@@ -88,47 +85,24 @@ public class MapExternalResourceDialog extends DialogWrapper {
}
});
myExplorer = new FileSystemTreeImpl(project, new FileChooserDescriptor(true, false, false, false, true, false));
Disposer.register(getDisposable(), myExplorer);
myExplorer.addListener(new FileSystemTree.Listener() {
@Override
public void selectionChanged(List<VirtualFile> selection) {
validateInput();
}
}, myExplorer);
MouseAdapter mouseAdapter = new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
if (e.getClickCount() > 1 && isOKActionEnabled()) {
doOKAction();
}
}
};
myExplorer.getTree().addMouseListener(mouseAdapter);
myExplorerPanel.add(ScrollPaneFactory.createScrollPane(myExplorer.getTree()), BorderLayout.CENTER);
AnAction actionGroup = ActionManager.getInstance().getAction("FileChooserToolbar");
ActionToolbar toolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, (ActionGroup)actionGroup, true);
toolbar.setTargetComponent(myExplorerPanel);
myExplorerPanel.add(toolbar.getComponent(), BorderLayout.NORTH);
if (project != null) {
setupSchemasTab(uri, project, file, location, mouseAdapter);
String path = project.getBasePath();
if (path != null) {
myFileTextField.setText(FileUtil.toSystemDependentName(path));
}
setupSchemasTree(uri, project, file, location);
}
else {
myTabs.removeTabAt(0);
mySchemasPanel.setVisible(false);
}
myFileTextField.addBrowseFolderListener(new TextBrowseFolderListener(FILE_CHOOSER_DESCRIPTOR, project));
init();
}
private void setupSchemasTab(String uri,
@NotNull Project project,
@Nullable PsiFile file,
@Nullable String location,
MouseAdapter mouseAdapter) {
private void setupSchemasTree(String uri,
@NotNull Project project,
@Nullable PsiFile file,
@Nullable String location) {
DefaultMutableTreeNode root = new DefaultMutableTreeNode();
mySchemasTree.setModel(new DefaultTreeModel(root));
@@ -168,6 +142,14 @@ public class MapExternalResourceDialog extends DialogWrapper {
renderer.setFont(EditorColorsManager.getInstance().getGlobalScheme().getFont(EditorFontType.PLAIN));
mySchemasTree.setCellRenderer(renderer);
MouseAdapter mouseAdapter = new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
if (e.getClickCount() > 1 && isOKActionEnabled()) {
doOKAction();
}
}
};
mySchemasTree.addMouseListener(mouseAdapter);
mySchemasTree.getSelectionModel().addTreeSelectionListener(new TreeSelectionListener() {
@Override
@@ -176,6 +158,7 @@ public class MapExternalResourceDialog extends DialogWrapper {
}
});
mySchemasTree.setSelectionRow(0);
PsiFile schema = null;
if (file != null) {
schema = XmlUtil.findNamespaceByLocation(file, uri);
@@ -190,26 +173,11 @@ public class MapExternalResourceDialog extends DialogWrapper {
if (schema != null) {
DefaultMutableTreeNode node = TreeUtil.findNodeWithObject(root, schema);
if (node != null) {
mySchemaFound = true;
TreeUtil.selectNode(mySchemasTree, node);
}
myExplorer.select(schema.getVirtualFile(), null);
myFileTextField.setText(schema.getVirtualFile().getCanonicalPath());
}
int index = PropertiesComponent.getInstance().getInt(MAP_EXTERNAL_RESOURCE_SELECTED_TAB, 0);
myTabs.setSelectedIndex(index);
myTabs.getModel().addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent e) {
PropertiesComponent.getInstance().setValue(MAP_EXTERNAL_RESOURCE_SELECTED_TAB, Integer.toString(myTabs.getSelectedIndex()));
}
});
}
@Override
protected void processDoNotAskOnOk(int exitCode) {
super.processDoNotAskOnOk(exitCode);
// store it since explorer will be disposed
myLocation = getResourceLocation();
}
private void validateInput() {
@@ -223,7 +191,18 @@ public class MapExternalResourceDialog extends DialogWrapper {
@Override
public JComponent getPreferredFocusedComponent() {
return StringUtil.isEmpty(myUri.getText()) ? myUri : mySchemasTree;
return StringUtil.isEmpty(myUri.getText()) ? myUri : mySchemaFound ? mySchemasTree : myFileTextField.getTextField();
}
@Override
public Dimension getPreferredSize() {
return new Dimension(400, 300);
}
@Nullable
@Override
protected String getDimensionServiceKey() {
return getClass().getName();
}
public String getUri() {
@@ -232,9 +211,7 @@ public class MapExternalResourceDialog extends DialogWrapper {
@Nullable
public String getResourceLocation() {
if (myLocation != null) return myLocation;
if (myTabs.getTabCount() > 1 && myTabs.getSelectedIndex() == 0) {
if (mySchemasTree.hasFocus()) {
TreePath path = mySchemasTree.getSelectionPath();
if (path == null) return null;
Object object = ((DefaultMutableTreeNode)path.getLastPathComponent()).getUserObject();
@@ -242,28 +219,18 @@ public class MapExternalResourceDialog extends DialogWrapper {
return FileUtil.toSystemIndependentName(((PsiFile)object).getVirtualFile().getPath());
}
else {
VirtualFile file = myExplorer.getSelectedFile();
return file == null ? null : FileUtil.toSystemIndependentName(file.getPath());
return myFileTextField.getText();
}
}
private void createUIComponents() {
myExplorerPanel = new JPanel(new BorderLayout());
DataManager.registerDataProvider(myExplorerPanel, new DataProvider() {
@Nullable
@Override
public Object getData(@NonNls String dataId) {
if (FileSystemTree.DATA_KEY.is(dataId)) {
return myExplorer;
}
return null;
}
});
}
@Nullable
@Override
protected String getHelpId() {
return "Map External Resource dialog";
}
private void createUIComponents() {
FileTextField field = FileChooserFactory.getInstance().createFileTextField(FILE_CHOOSER_DESCRIPTOR, getDisposable());
myFileTextField = new TextFieldWithBrowseButton(field.getField());
}
}
xml/impl/src/com/intellij/xml/config/ConfigFilesTreeBuilder.java
+11 -12
View File
@@ -181,27 +181,26 @@ public class ConfigFilesTreeBuilder {
renderer.append(fileName, SimpleTextAttributes.REGULAR_ATTRIBUTES);
final VirtualFile virtualFile = psiFile.getVirtualFile();
if (virtualFile != null) {
String path = virtualFile.getPath();
final int i = path.indexOf(JarFileSystem.JAR_SEPARATOR);
if (i >= 0) {
path = path.substring(i + JarFileSystem.JAR_SEPARATOR.length());
}
renderer.append(" (" + path + ")", SimpleTextAttributes.GRAYED_ATTRIBUTES);
renderPath(renderer, virtualFile);
}
}
else if (object instanceof VirtualFile) {
VirtualFile file = (VirtualFile)object;
renderer.setIcon(VirtualFilePresentation.getIcon(file));
renderer.append(file.getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
String path = file.getPath();
final int i = path.indexOf(JarFileSystem.JAR_SEPARATOR);
if (i >= 0) {
path = path.substring(i + JarFileSystem.JAR_SEPARATOR.length());
}
renderer.append(" (" + path + ")", SimpleTextAttributes.GRAYED_ATTRIBUTES);
renderPath(renderer, file);
}
}
private static void renderPath(ColoredTreeCellRenderer renderer, VirtualFile virtualFile) {
String path = virtualFile.getPath();
final int i = path.indexOf(JarFileSystem.JAR_SEPARATOR);
if (i >= 0) {
path = path.substring(i + JarFileSystem.JAR_SEPARATOR.length());
}
renderer.append(" (" + path.substring(0, path.length() - virtualFile.getName().length() - 1) + ")", SimpleTextAttributes.GRAYED_ATTRIBUTES);
}
public static void installSearch(JTree tree) {
new TreeSpeedSearch(tree, new Convertor<TreePath, String>() {
@Override