diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/EditMediator.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/EditMediator.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/EditMediator.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/EditMediator.java @@ -234,7 +234,12 @@ if ( source == addJar ) { // Let user search for the Jar file - FileChooser chooser = new FileChooser(helper, true); + FileChooser chooser; + if (helper.isSharableProject()) { + chooser = new FileChooser(helper, true); + } else { + chooser = new FileChooser(FileUtil.toFile(project.getProjectDirectory()), null); + } FileUtil.preventFileChooserSymlinkTraversal(chooser, null); chooser.setFileSelectionMode(fileSelectionMode); chooser.setMultiSelectionEnabled( true ); diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/LibrariesNode.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/LibrariesNode.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/LibrariesNode.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/LibrariesNode.java @@ -675,8 +675,12 @@ } public void actionPerformed(ActionEvent e) { - org.netbeans.api.project.ant.FileChooser chooser = - new org.netbeans.api.project.ant.FileChooser(helper, true); + org.netbeans.api.project.ant.FileChooser chooser; + if (helper.isSharableProject()) { + chooser = new org.netbeans.api.project.ant.FileChooser(helper, true); + } else { + chooser = new org.netbeans.api.project.ant.FileChooser(FileUtil.toFile(helper.getProjectDirectory()), null); + } FileUtil.preventFileChooserSymlinkTraversal(chooser, null); chooser.setFileSelectionMode( JFileChooser.FILES_AND_DIRECTORIES ); chooser.setMultiSelectionEnabled( true ); diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/LibrariesNode.java b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/LibrariesNode.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/LibrariesNode.java +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/LibrariesNode.java @@ -712,7 +712,12 @@ assert cpProvider != null; final J2SEProjectClassPathModifier cpMod = project.getProjectClassPathModifier(); assert cpMod != null; - FileChooser chooser = new FileChooser(project.getAntProjectHelper(), true); + FileChooser chooser; + if (project.getAntProjectHelper().isSharableProject()) { + chooser = new FileChooser(project.getAntProjectHelper(), true); + } else { + chooser = new FileChooser(FileUtil.toFile(project.getProjectDirectory()), null); + } FileUtil.preventFileChooserSymlinkTraversal(chooser, null); chooser.setFileSelectionMode( JFileChooser.FILES_AND_DIRECTORIES ); chooser.setMultiSelectionEnabled( true ); diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEClassPathUi.java b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEClassPathUi.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEClassPathUi.java +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEClassPathUi.java @@ -432,7 +432,12 @@ if ( source == addJar ) { // Let user search for the Jar file - FileChooser chooser = new FileChooser(project.getAntProjectHelper(), true); + FileChooser chooser; + if (project.getAntProjectHelper().isSharableProject()) { + chooser = new FileChooser(project.getAntProjectHelper(), true); + } else { + chooser = new FileChooser(FileUtil.toFile(project.getProjectDirectory()), null); + } FileUtil.preventFileChooserSymlinkTraversal(chooser, null); chooser.setFileSelectionMode( JFileChooser.FILES_AND_DIRECTORIES ); chooser.setMultiSelectionEnabled( true ); diff --git a/java.project/src/org/netbeans/spi/java/project/support/ui/EditJarPanel.java b/java.project/src/org/netbeans/spi/java/project/support/ui/EditJarPanel.java --- a/java.project/src/org/netbeans/spi/java/project/support/ui/EditJarPanel.java +++ b/java.project/src/org/netbeans/spi/java/project/support/ui/EditJarPanel.java @@ -191,7 +191,12 @@ }// //GEN-END:initComponents private void btnJavadocActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnJavadocActionPerformed // Let user search for the Jar file - FileChooser chooser = new FileChooser(helper, true); + FileChooser chooser; + if (helper.isSharableProject()) { + chooser = new FileChooser(helper, true); + } else { + chooser = new FileChooser(FileUtil.toFile(helper.getProjectDirectory()), null); + } FileUtil.preventFileChooserSymlinkTraversal(chooser, null); chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); chooser.setMultiSelectionEnabled(false); @@ -220,7 +225,12 @@ }//GEN-LAST:event_btnJavadocActionPerformed private void btnSourceActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSourceActionPerformed - FileChooser chooser = new FileChooser(helper, true); + FileChooser chooser; + if (helper.isSharableProject()) { + chooser = new FileChooser(helper, true); + } else { + chooser = new FileChooser(FileUtil.toFile(helper.getProjectDirectory()), null); + } FileUtil.preventFileChooserSymlinkTraversal(chooser, null); chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); chooser.setMultiSelectionEnabled(false); diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/WarIncludesUi.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/WarIncludesUi.java --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/WarIncludesUi.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/WarIncludesUi.java @@ -173,7 +173,12 @@ if ( source == addJar ) { // Let user search for the Jar file - FileChooser chooser = new FileChooser(project.getAntProjectHelper(), true); + FileChooser chooser; + if (project.getAntProjectHelper().isSharableProject()) { + chooser = new FileChooser(project.getAntProjectHelper(), true); + } else { + chooser = new FileChooser(FileUtil.toFile(project.getProjectDirectory()), null); + } FileUtil.preventFileChooserSymlinkTraversal(chooser, null); chooser.setFileSelectionMode( JFileChooser.FILES_AND_DIRECTORIES ); chooser.setMultiSelectionEnabled( true );