Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed
JFileChooser jfc = new JFileChooser() {
// Trick stolen from ProjectChooserAccessory.ProjectFileChooser:
@Override
public void approveSelection() {
File dir = FileUtil.normalizeFile(getSelectedFile());
if (NbPlatform.isHarness(dir)) {
Expand All @@ -203,7 +204,6 @@ public void approveSelection() {
}
}
};
FileUtil.preventFileChooserSymlinkTraversal(jfc, null);
jfc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
jfc.setSelectedFile(plaf.getHarnessLocation());
if (jfc.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ public class ${TEMPLATENAME}PanelVisual extends JPanel implements DocumentListen
String command = evt.getActionCommand();
if ("BROWSE".equals(command)) {
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setDialogTitle("Select Project Location");
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
String path = this.projectLocationTextField.getText();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {

private void browseLocationJButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseLocationJButtonActionPerformed
JFileChooser chooser = new JFileChooser ();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setDialogTitle(NbBundle.getMessage(PanelProjectLocationVisual.class,"GetProjectLocationPanel.FileChooserTitle"));
chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
String path = projectLocationTextField.getText().trim();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,6 @@ public void actionPerformed(ActionEvent e) {

private void addPathElement () {
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setMultiSelectionEnabled (true);
String title = null;
String message = null;
Expand All @@ -630,9 +629,7 @@ private void addPathElement () {
//#61789 on old macosx (jdk 1.4.1) these two method need to be called in this order.
chooser.setAcceptAllFileFilterUsed( false );
chooser.setFileFilter (new SimpleFileFilter(message,new String[] {"ZIP","JAR"})); //NOI18N
if (this.currentDir != null && currentDir.exists()) {
chooser.setCurrentDirectory(this.currentDir);
}
chooser.setCurrentDirectory(this.currentDir != null && currentDir.exists() ? this.currentDir : null);
if (chooser.showOpenDialog(this)==JFileChooser.APPROVE_OPTION) {
File[] fs = chooser.getSelectedFiles();
PathModel model = (PathModel) this.resources.getModel();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>

<!--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -375,18 +375,15 @@ private void loadkeysButtonActionPerformed(java.awt.event.ActionEvent evt) {//GE

private void keystoreLocationButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_keystoreLocationButtonActionPerformed
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setDialogTitle(NbBundle.getMessage(KeystorePanel.class, "LBL_KeystoreBrowse_Title")); //NOI18N
chooser.setFileSelectionMode (JFileChooser.FILES_ONLY);
chooser.setMultiSelectionEnabled(false);
chooser.setFileFilter(new StoreFileFilter());
File f = new File(keystoreLocationTextField.getText());
if ((f != null) && (f.exists())) {
if (f.isDirectory()) {
chooser.setCurrentDirectory(f);
} else {
chooser.setCurrentDirectory(f.getParentFile());
}
if (f.exists()) {
chooser.setCurrentDirectory(f);
} else {
chooser.setCurrentDirectory(null);
}
if (chooser.showOpenDialog(this)== JFileChooser.APPROVE_OPTION) {
File file = chooser.getSelectedFile();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>

<!--

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,18 +335,15 @@ private void loadkeysButtonActionPerformed(java.awt.event.ActionEvent evt) {//GE

private void storeLocationButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_storeLocationButtonActionPerformed
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setDialogTitle(NbBundle.getMessage(TruststorePanel.class, "LBL_TruststoreBrowse_Title")); //NOI18N
chooser.setFileSelectionMode (JFileChooser.FILES_ONLY);
chooser.setMultiSelectionEnabled(false);
chooser.setFileFilter(new StoreFileFilter());
File f = new File(storeLocationTextField.getText());
if ((f != null) && (f.exists())) {
if (f.isDirectory()) {
chooser.setCurrentDirectory(f);
} else {
chooser.setCurrentDirectory(f.getParentFile());
}
if (f.exists()) {
chooser.setCurrentDirectory(f);
} else {
chooser.setCurrentDirectory(null);
}
if (chooser.showOpenDialog(this)== JFileChooser.APPROVE_OPTION) {
File file = chooser.getSelectedFile();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) {

private void jButtonWorkingDirectoryBrowseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonWorkingDirectoryBrowseActionPerformed
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
chooser.setMultiSelectionEnabled(false);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {

private void configFilesFolderBrowseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_configFilesFolderBrowseActionPerformed
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
File fileName = new File(jTextFieldConfigFilesFolder.getText());
File configFiles = fileName.isAbsolute() ? fileName : new File(projectFld, fileName.getPath());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {

private void jButtonLibrariesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonLibrariesActionPerformed
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
if (jTextFieldLibraries.getText().length() > 0 && getLibraries().exists()) {
chooser.setSelectedFile(getLibraries());
Expand All @@ -399,7 +398,6 @@ private void jButtonLibrariesActionPerformed(java.awt.event.ActionEvent evt) {//

private void jButtonConfigFilesLocationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonConfigFilesLocationActionPerformed
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
if (jTextFieldConfigFiles.getText().length() > 0 && getConfigFiles().exists()) {
chooser.setSelectedFile(getConfigFiles());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {

private void jButtonBrowseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonBrowseActionPerformed
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
File fileName = new File(jTextFieldConfigFilesFolder.getText());
File configFiles = fileName.isAbsolute() ? fileName : new File(projectFld, fileName.getPath());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>

<!--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {

private void jButtonLibrariesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonLibrariesActionPerformed
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
if (jTextFieldLibraries.getText().length() > 0 && getLibraries().exists()) {
chooser.setSelectedFile(getLibraries());
Expand All @@ -400,7 +399,6 @@ private void jButtonLibrariesActionPerformed(java.awt.event.ActionEvent evt) {//

private void jButtonConfigFilesLocationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonConfigFilesLocationActionPerformed
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
if (jTextFieldConfigFiles.getText().length() > 0 && getConfigFiles().exists()) {
chooser.setSelectedFile(getConfigFiles());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ private void addResource(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addR
baseFolder = new File(URI.create(area.getLocation().toExternalForm())).getParentFile();
}
FileChooser chooser = new FileChooser(baseFolder, baseFolder);
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setAcceptAllFileFilterUsed(false);
if (!this.volumeType.equals(ServerLibraryTypeProvider.VOLUME_JAVADOC)
&& !this.volumeType.equals(ServerLibraryTypeProvider.VOLUME_SOURCE)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
private void selectSourceButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectSourceButtonActionPerformed
String command = evt.getActionCommand();
if ("BROWSE".equals(command)) {
JFileChooser chooser = new JFileChooser();
//FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setCurrentDirectory(chooser.getCurrentDirectory());
JFileChooser chooser = new JFileChooser();
chooser.setDialogTitle("Select source to transform");
chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
String path = this.source.getText();
Expand All @@ -163,9 +161,7 @@ private void selectSourceButtonActionPerformed(java.awt.event.ActionEvent evt) {
private void selectTargetButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectTargetButtonActionPerformed
String command = evt.getActionCommand();
if ("BROWSE".equals(command)) {
JFileChooser chooser = new JFileChooser();
//FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setCurrentDirectory(chooser.getCurrentDirectory());
JFileChooser chooser = new JFileChooser();
chooser.setDialogTitle("Select Folder to Transform");
chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
String path = this.target.getText();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ private void browseLocationAction(java.awt.event.ActionEvent evt) {//GEN-FIRST:e
String command = evt.getActionCommand();
if ( "BROWSE".equals( command ) ) { // NOI18N
JFileChooser chooser = new JFileChooser ();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setDialogTitle(NbBundle.getMessage(ProjectLocationPanel.class,"LBL_NWP1_SelectProjectLocation"));
chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
String path = this.projectLocationTextField.getText();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,6 @@ public void actionPerformed(ActionEvent e) {

private void addPathElement () {
JFileChooser chooser = new JFileChooser();
chooser.setCurrentDirectory(null);
chooser.setMultiSelectionEnabled (true);
String title = null;
String message = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,6 @@ private void initComponents(PathModel model) {

private void addPathElement () {
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setMultiSelectionEnabled (true);
String title = null;
String message = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,20 +305,17 @@ private void removeClasspathActionPerformed(java.awt.event.ActionEvent evt) {//G

private void addClasspathActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addClasspathActionPerformed
FileChooser chooser = new FileChooser(this.projectFolder, null);
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setCurrentDirectory(null);
chooser.setFileSelectionMode (JFileChooser.FILES_AND_DIRECTORIES);
chooser.setMultiSelectionEnabled(true);
if (lastChosenFile != null) {
chooser.setSelectedFile(lastChosenFile);
}
else {
if (projectFolder!= null) {
File files[] = projectFolder.listFiles();
if (files != null && files.length > 0) {
chooser.setSelectedFile(files[0]);
} else {
chooser.setSelectedFile(projectFolder);
}
} else if (projectFolder!= null) {
File[] files = projectFolder.listFiles();
if (files != null && files.length > 0) {
chooser.setSelectedFile(files[0]);
} else {
chooser.setSelectedFile(projectFolder);
}
}
chooser.setDialogTitle(NbBundle.getMessage(WebClasspathPanel.class, "LBL_Browse_Classpath"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ private void jButtonWebActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
private static JFileChooser createChooser(File webPagesLoc, WizardDescriptor wizardDescriptor) {
String path = webPagesLoc.getAbsolutePath();
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, new File(path));
chooser.setCurrentDirectory(new File(path));
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
chooser.setAcceptAllFileFilterUsed(false);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,6 @@ private void includeExcludeButtonActionPerformed(java.awt.event.ActionEvent evt)

private void updateFolder(JTextField textField) {
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
File fileName = new File(textField.getText());
File folder = fileName.isAbsolute() ? fileName : new File(projectFld, fileName.getPath());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
private void btBrowseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btBrowseActionPerformed
if ("BROWSE".equals(evt.getActionCommand())) { //NOI18N
JFileChooser chooser = new JFileChooser();
chooser.setCurrentDirectory(null);
chooser.setDialogTitle(Bundle.TIT_Select_Project_Location());
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
String path = tfLocation.getText();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
private void btBrowseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btBrowseActionPerformed
if ("BROWSE".equals(evt.getActionCommand())) { //NOI18N
JFileChooser chooser = new JFileChooser();
chooser.setCurrentDirectory(null);
chooser.setDialogTitle(Bundle.TIT_Select_Project_Location());
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
String path = tfProjectLocation.getText();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
String command = evt.getActionCommand();
if ("BROWSE".equals(command)) {
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setDialogTitle("Select Project Location");
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
String path = this.projectLocationTextField.getText();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
String command = evt.getActionCommand();
if ("BROWSE".equals(command)) {
JFileChooser chooser = new JFileChooser();
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setDialogTitle("Select Project Location");
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
String path = this.projectLocationTextField.getText();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ public void setDialogDescriptor(DialogDescriptor desc) {
private void chooseFile(JTextField txtField) {
JFileChooser chooser = new JFileChooser();

chooser.setCurrentDirectory(null);
chooser.setFileSelectionMode (JFileChooser.FILES_ONLY);

String path = txtField.getText().trim();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {

private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
JFileChooser chooser = new JFileChooser();
chooser.setCurrentDirectory(null);
chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
String location = getInstallLocation();
if (location.length() > 0) {
Expand All @@ -326,7 +325,6 @@ private void derbyInstallActionPerformed(java.awt.event.ActionEvent evt) {//GEN-

private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed
JFileChooser chooser = new JFileChooser();
chooser.setCurrentDirectory(null);
chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
String derbySystemHome = getDerbySystemHome();
if (derbySystemHome.length() > 0) {
Expand Down
2 changes: 1 addition & 1 deletion ide/diff/src/org/netbeans/modules/diff/PatchAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ private File getPatchFor(FileObject fo) {
break;
}
}
FileUtil.preventFileChooserSymlinkTraversal(chooser, patchDir);
chooser.setCurrentDirectory(patchDir);
chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
String title = NbBundle.getMessage(PatchAction.class,
(fo.isData()) ? "TITLE_SelectPatchForFile"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed
JFileChooser chooser = new JFileChooser();
chooser.setFileHidingEnabled(false);
FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
chooser.setMultiSelectionEnabled(false);
chooser.setDialogTitle(NbBundle.getBundle(VariablePanel.class).getString("MSG_Choose_Folder"));
Expand Down
Loading
Loading