This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 236358
Collapse All | Expand All

(-)a/diff/src/org/netbeans/modules/diff/DiffAction.java (-1 / +2 lines)
Lines 72-77 Link Here
72
import org.netbeans.modules.diff.builtin.DefaultDiff;
72
import org.netbeans.modules.diff.builtin.DefaultDiff;
73
import org.netbeans.modules.diff.builtin.SingleDiffPanel;
73
import org.netbeans.modules.diff.builtin.SingleDiffPanel;
74
import org.netbeans.modules.diff.options.AccessibleJFileChooser;
74
import org.netbeans.modules.diff.options.AccessibleJFileChooser;
75
import org.netbeans.spi.diff.FileChooserProvider;
75
import org.openide.DialogDisplayer;
76
import org.openide.DialogDisplayer;
76
import org.openide.ErrorManager;
77
import org.openide.ErrorManager;
77
import org.openide.util.lookup.ProxyLookup;
78
import org.openide.util.lookup.ProxyLookup;
Lines 199-205 Link Here
199
    private FileObject promptForFileobject(FileObject peer) {
200
    private FileObject promptForFileobject(FileObject peer) {
200
        String path = DiffModuleConfig.getDefault().getPreferences().get("diffToLatestFolder", peer.getParent().getPath());
201
        String path = DiffModuleConfig.getDefault().getPreferences().get("diffToLatestFolder", peer.getParent().getPath());
201
        File latestPath = FileUtil.normalizeFile(new File(path));
202
        File latestPath = FileUtil.normalizeFile(new File(path));
202
        JFileChooser fileChooser = new AccessibleJFileChooser(NbBundle.getMessage(DiffAction.class, "ACSD_BrowseDiffToFile"), latestPath); // NOI18N
203
        JFileChooser fileChooser = FileChooserProvider.createFileChooser(NbBundle.getMessage(DiffAction.class, "ACSD_BrowseDiffToFile"), peer.getParent()); // NOI18N
203
        fileChooser.setDialogTitle(NbBundle.getMessage(DiffAction.class, "DiffTo_BrowseFile_Title", peer.getName())); // NOI18N
204
        fileChooser.setDialogTitle(NbBundle.getMessage(DiffAction.class, "DiffTo_BrowseFile_Title", peer.getName())); // NOI18N
204
        fileChooser.setMultiSelectionEnabled(false);
205
        fileChooser.setMultiSelectionEnabled(false);
205
        fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
206
        fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
(-)a97a4c508134 (+72 lines)
Added Link Here
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
4
 * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
5
 *
6
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7
 * Other names may be trademarks of their respective owners.
8
 *
9
 * The contents of this file are subject to the terms of either the GNU
10
 * General Public License Version 2 only ("GPL") or the Common
11
 * Development and Distribution License("CDDL") (collectively, the
12
 * "License"). You may not use this file except in compliance with the
13
 * License. You can obtain a copy of the License at
14
 * http://www.netbeans.org/cddl-gplv2.html
15
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16
 * specific language governing permissions and limitations under the
17
 * License.  When distributing the software, include this License Header
18
 * Notice in each file and include the License file at
19
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
20
 * particular file as subject to the "Classpath" exception as provided
21
 * by Oracle in the GPL Version 2 section of the License file that
22
 * accompanied this code. If applicable, add the following below the
23
 * License Header, with the fields enclosed by brackets [] replaced by
24
 * your own identifying information:
25
 * "Portions Copyrighted [year] [name of copyright owner]"
26
 *
27
 * If you wish your version of this file to be governed by only the CDDL
28
 * or only the GPL Version 2, indicate your decision by adding
29
 * "[Contributor] elects to include this software in this distribution
30
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
31
 * single choice of license, a recipient has the option to distribute
32
 * your version of this file under either the CDDL, the GPL Version 2 or
33
 * to extend the choice of license to its licensees as provided above.
34
 * However, if you add GPL Version 2 code and therefore, elected the GPL
35
 * Version 2 license, then the option applies only if the new code is
36
 * made subject to such option by the copyright holder.
37
 *
38
 * Contributor(s):
39
 *
40
 * Portions Copyrighted 2013 Sun Microsystems, Inc.
41
 */
42
43
package org.netbeans.spi.diff;
44
45
import java.io.File;
46
import javax.swing.JFileChooser;
47
import org.netbeans.modules.diff.DiffModuleConfig;
48
import org.netbeans.modules.diff.options.AccessibleJFileChooser;
49
import org.openide.filesystems.FileObject;
50
import org.openide.filesystems.FileUtil;
51
import org.openide.util.Lookup;
52
53
/**
54
 *
55
 * @author vkvashin
56
 */
57
public abstract class FileChooserProvider {
58
59
    public static JFileChooser createFileChooser(String acsd, FileObject currentDirectory) {
60
        for (FileChooserProvider provider : Lookup.getDefault().lookupAll(FileChooserProvider.class)) {
61
            JFileChooser chooser = provider.createFileChooserImpl(acsd, currentDirectory);
62
            if (chooser != null) {
63
                return chooser;
64
            }
65
        }
66
//        String path = DiffModuleConfig.getDefault().getPreferences().get("diffToLatestFolder", currentDirectory.getPath());
67
//        File latestPath = FileUtil.normalizeFile(new File(path));        
68
        return new AccessibleJFileChooser(acsd, FileUtil.toFile(currentDirectory));
69
    }
70
    
71
    protected abstract JFileChooser createFileChooserImpl(String acsd, FileObject currentDirectory);
72
}
(-)a/dlight.remote/nbproject/project.xml (+9 lines)
Lines 15-20 Link Here
15
                    </run-dependency>
15
                    </run-dependency>
16
                </dependency>
16
                </dependency>
17
                <dependency>
17
                <dependency>
18
                    <code-name-base>org.netbeans.modules.diff</code-name-base>
19
                    <build-prerequisite/>
20
                    <compile-dependency/>
21
                    <run-dependency>
22
                        <release-version>1</release-version>
23
                        <specification-version>1.45</specification-version>
24
                    </run-dependency>
25
                </dependency>
26
                <dependency>
18
                    <code-name-base>org.netbeans.modules.dlight.libs.common</code-name-base>
27
                    <code-name-base>org.netbeans.modules.dlight.libs.common</code-name-base>
19
                    <build-prerequisite/>
28
                    <build-prerequisite/>
20
                    <compile-dependency/>
29
                    <compile-dependency/>
(-)a97a4c508134 (+71 lines)
Added Link Here
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
4
 * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
5
 *
6
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7
 * Other names may be trademarks of their respective owners.
8
 *
9
 * The contents of this file are subject to the terms of either the GNU
10
 * General Public License Version 2 only ("GPL") or the Common
11
 * Development and Distribution License("CDDL") (collectively, the
12
 * "License"). You may not use this file except in compliance with the
13
 * License. You can obtain a copy of the License at
14
 * http://www.netbeans.org/cddl-gplv2.html
15
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16
 * specific language governing permissions and limitations under the
17
 * License.  When distributing the software, include this License Header
18
 * Notice in each file and include the License file at
19
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
20
 * particular file as subject to the "Classpath" exception as provided
21
 * by Oracle in the GPL Version 2 section of the License file that
22
 * accompanied this code. If applicable, add the following below the
23
 * License Header, with the fields enclosed by brackets [] replaced by
24
 * your own identifying information:
25
 * "Portions Copyrighted [year] [name of copyright owner]"
26
 *
27
 * If you wish your version of this file to be governed by only the CDDL
28
 * or only the GPL Version 2, indicate your decision by adding
29
 * "[Contributor] elects to include this software in this distribution
30
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
31
 * single choice of license, a recipient has the option to distribute
32
 * your version of this file under either the CDDL, the GPL Version 2 or
33
 * to extend the choice of license to its licensees as provided above.
34
 * However, if you add GPL Version 2 code and therefore, elected the GPL
35
 * Version 2 license, then the option applies only if the new code is
36
 * made subject to such option by the copyright holder.
37
 *
38
 * Contributor(s):
39
 *
40
 * Portions Copyrighted 2013 Sun Microsystems, Inc.
41
 */
42
43
package org.netbeans.modules.remote.support;
44
45
import javax.swing.JFileChooser;
46
import org.netbeans.modules.nativeexecution.api.ExecutionEnvironment;
47
import org.netbeans.modules.remote.api.ui.FileChooserBuilder;
48
import org.netbeans.modules.remote.spi.FileSystemProvider;
49
import org.netbeans.spi.diff.FileChooserProvider;
50
import org.openide.filesystems.FileObject;
51
import org.openide.util.lookup.ServiceProvider;
52
53
/**
54
 *
55
 * @author vkvashin
56
 */
57
@ServiceProvider(service = FileChooserProvider.class)
58
public class FileChooserProviderImpl extends FileChooserProvider {
59
60
    @Override
61
    protected JFileChooser createFileChooserImpl(String acsd, FileObject currentDirectory) {
62
        ExecutionEnvironment env = FileSystemProvider.getExecutionEnvironment(currentDirectory);
63
        if (env != null && env.isRemote()) {
64
            FileChooserBuilder fcb = new FileChooserBuilder(env);
65
            FileChooserBuilder.JFileChooserEx chooser = fcb.createFileChooser(currentDirectory.getPath());
66
            return chooser;
67
        }
68
        return null;
69
    }
70
    
71
}

Return to bug 236358