Attachment #19528 for bug #52271

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 52271
Collapse All | Expand All




                }
                filesWithMessages.put(messageFiles.toArray(new FileObject[0]), message);
            } else {
                Lookup.Result nonRecFolders = nodes[i].getLookup().lookup(new Lookup.Template(NonRecursiveFolder.class));
                Collection nrfs = nonRecFolders.allInstances();
                if (nrfs != null && nrfs.size() > 0) {
                    List nrFiles = new ArrayList(nrfs.size());
                    Collection fos = new ArrayList(nrfs.size());
                    for (Iterator it = nrfs.iterator(); it.hasNext(); ) {
                        NonRecursiveFolder nrf = (NonRecursiveFolder) it.next();
                        fos.add(nrf.getFolder());
                    }
                    FileObject one = (FileObject) fos.iterator().next();
                    addAllFromSingleFS(one, fos, nrFiles);
                    filesWithMessages.put(nrFiles.toArray(new FileObject[0]), NonRecursiveFolder.class);
                } else {
                Lookup.Result fileObjects = nodes[i].getLookup().lookup(new Lookup.Template(FileObject.class));
                Collection fos;
                if (fileObjects != null && (fos = fileObjects.allInstances()).size() > 0) {

                    //files.addAll(dd.files());
                    //addAllWorkaround(dd.files(), files);
                    addAllFromSingleFS(dd.getPrimaryFile(), dd.files(), files);
                    }
                }
            }
        }

Lines 417-423 Link Here

(-)CommandMenu.java (-1 / +11 lines)
417	public void run() {	417	public void run() {
418	for (Iterator it = filesWithMessages.keySet().iterator(); it.hasNext(); ) {	418	for (Iterator it = filesWithMessages.keySet().iterator(); it.hasNext(); ) {
419	FileObject[] files = (FileObject[]) it.next();	419	FileObject[] files = (FileObject[]) it.next();
420	String message = (String) filesWithMessages.get(files);	420	Object fileInfo = filesWithMessages.get(files);
		421	String message = null;
		422	boolean nonRecursive;
		423	if (fileInfo instanceof String) {
		424	message = (String) fileInfo;
		425	} else if (fileInfo == NonRecursiveFolder.class) {
		426	nonRecursive = true;
		427	}
421	Command[] cmds;	428	Command[] cmds;
422	if (cmdSupports != null) {	429	if (cmdSupports != null) {
423	cmds = new Command[cmdSupports.length];	430	cmds = new Command[cmdSupports.length];
Lines 442-447 Link Here
442	}	449	}
443	if (message != null && cmd instanceof MessagingCommand) {	450	if (message != null && cmd instanceof MessagingCommand) {
444	((MessagingCommand) cmd).setMessage(message);	451	((MessagingCommand) cmd).setMessage(message);
		452	}
		453	if (nonRecursive && cmd instanceof RecursionAwareCommand) {
		454	((RecursionAwareCommand) cmd).setRecursionBanned(true);
445	}	455	}
446	cmd.setGUIMode(true);	456	cmd.setGUIMode(true);
447	if (changeExpertMode) cmd.setExpertMode(expertMode);	457	if (changeExpertMode) cmd.setExpertMode(expertMode);

Return to bug 52271

Lines 116-121 Link Here

(-)VcsFSCommandsAction.java (+14 lines)
116	}	116	}
117	filesWithMessages.put(messageFiles.toArray(new FileObject[0]), message);	117	filesWithMessages.put(messageFiles.toArray(new FileObject[0]), message);
118	} else {	118	} else {
		119	Lookup.Result nonRecFolders = nodes[i].getLookup().lookup(new Lookup.Template(NonRecursiveFolder.class));
		120	Collection nrfs = nonRecFolders.allInstances();
		121	if (nrfs != null && nrfs.size() > 0) {
		122	List nrFiles = new ArrayList(nrfs.size());
		123	Collection fos = new ArrayList(nrfs.size());
		124	for (Iterator it = nrfs.iterator(); it.hasNext(); ) {
		125	NonRecursiveFolder nrf = (NonRecursiveFolder) it.next();
		126	fos.add(nrf.getFolder());
		127	}
		128	FileObject one = (FileObject) fos.iterator().next();
		129	addAllFromSingleFS(one, fos, nrFiles);
		130	filesWithMessages.put(nrFiles.toArray(new FileObject[0]), NonRecursiveFolder.class);
		131	} else {
119	Lookup.Result fileObjects = nodes[i].getLookup().lookup(new Lookup.Template(FileObject.class));	132	Lookup.Result fileObjects = nodes[i].getLookup().lookup(new Lookup.Template(FileObject.class));
120	Collection fos;	133	Collection fos;
121	if (fileObjects != null && (fos = fileObjects.allInstances()).size() > 0) {	134	if (fileObjects != null && (fos = fileObjects.allInstances()).size() > 0) {
Lines 131-136 Link Here
131	//files.addAll(dd.files());	144	//files.addAll(dd.files());
132	//addAllWorkaround(dd.files(), files);	145	//addAllWorkaround(dd.files(), files);
133	addAllFromSingleFS(dd.getPrimaryFile(), dd.files(), files);	146	addAllFromSingleFS(dd.getPrimaryFile(), dd.files(), files);
		147	}
134	}	148	}
135	}	149	}
136	}	150	}