From 356daa5a07ce2ddf05077af6c428350a0d620a2f Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 5 Aug 2015 19:55:20 +0200 Subject: [PATCH] IDEA-143470 Open File dialog: unnecessary dot in the end of the phrase --- .../openapi/fileChooser/ex/FileChooserDialogImpl.java | 7 +++---- .../cvsSupport2/ui/experts/SelectLocationStep.java | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java index 95dfbd806b22..c027dc4d24e3 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java @@ -31,7 +31,6 @@ import com.intellij.openapi.fileChooser.impl.FileChooserUtil; import com.intellij.openapi.project.DumbModePermission; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; -import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.popup.JBPopupFactory; @@ -78,6 +77,8 @@ import java.util.Map; public class FileChooserDialogImpl extends DialogWrapper implements FileChooserDialog, PathChooserDialog, FileLookup { @NonNls public static final String FILE_CHOOSER_SHOW_PATH_PROPERTY = "FileChooser.ShowPath"; public static final String RECENT_FILES_KEY = "file.chooser.recent.files"; + public static final String DRAG_N_DROP_HINT = + "
Drag and drop a file into the space above to quickly locate it in the tree
"; private final FileChooserDescriptor myChooserDescriptor; protected FileSystemTreeImpl myFileSystemTree; private Project myProject; @@ -357,9 +358,7 @@ public class FileChooserDialogImpl extends DialogWrapper implements FileChooserD panel.setPreferredSize(JBUI.size(400)); - panel.add(new JLabel( - "
Drag and drop a file into the space above to quickly locate it in the tree.
", - SwingConstants.CENTER), BorderLayout.SOUTH); + panel.add(new JLabel(DRAG_N_DROP_HINT, SwingConstants.CENTER), BorderLayout.SOUTH); ApplicationManager.getApplication().getMessageBus().connect(getDisposable()) diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectLocationStep.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectLocationStep.java index cd49d6bff01e..276e6568b291 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectLocationStep.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectLocationStep.java @@ -25,6 +25,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.FileSystemTree; import com.intellij.openapi.fileChooser.FileSystemTreeFactory; +import com.intellij.openapi.fileChooser.ex.FileChooserDialogImpl; import com.intellij.openapi.fileChooser.ex.FileDrop; import com.intellij.openapi.fileChooser.ex.FileTextFieldImpl; import com.intellij.openapi.fileChooser.ex.LocalFsFinder; @@ -141,9 +142,7 @@ public abstract class SelectLocationStep extends WizardStep { myNorthPanel.add(toolbarPanel, BorderLayout.NORTH); panel.add(myNorthPanel, BorderLayout.NORTH); panel.add(ScrollPaneFactory.createScrollPane(myFileSystemTree.getTree()), BorderLayout.CENTER); - panel.add(new JLabel( - "
Drag and drop a file into the space above to quickly locate it in the tree.
", - SwingConstants.CENTER), BorderLayout.SOUTH); + panel.add(new JLabel(FileChooserDialogImpl.DRAG_N_DROP_HINT, SwingConstants.CENTER), BorderLayout.SOUTH); myUiUpdater = new MergingUpdateQueue("FileChooserUpdater", 200, false, panel); Disposer.register(myFileSystemTree, myUiUpdater); new UiNotifyConnector(panel, myUiUpdater);