Attachment #58754 for bug #95974

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





import org.netbeans.modules.versioning.util.VersioningListener;
import org.netbeans.modules.versioning.util.VersioningEvent;
import org.netbeans.spi.queries.VisibilityQueryImplementation2;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.FileObject;


 * 
 * @author Maros Sandor
 */
public class SubversionVisibilityQuery implements VisibilityQueryImplementation2, VersioningListener {

    private List<ChangeListener>  listeners = new ArrayList<ChangeListener>();
    private FileStatusCache       cache;

    public boolean isVisible(FileObject fileObject) {
        if (fileObject.isData()) return true;
        File file = FileUtil.toFile(fileObject);
        return isVisible(file);
    }
    
    public boolean isVisible(File file) {
        if(file == null) return true;
        if (file.isFile()) {
            return true;
        }
        if(!(VersioningSupport.getOwner(file) instanceof SubversionVCS)) {
            return true;
        }

Return to bug 95974

Lines 43-49 Link Here

(-)a/subversion/src/org/netbeans/modules/subversion/SubversionVisibilityQuery.java (-3 / +10 lines)
43		43
44	import org.netbeans.modules.versioning.util.VersioningListener;	44	import org.netbeans.modules.versioning.util.VersioningListener;
45	import org.netbeans.modules.versioning.util.VersioningEvent;	45	import org.netbeans.modules.versioning.util.VersioningEvent;
46	import org.netbeans.spi.queries.VisibilityQueryImplementation;	46	import org.netbeans.spi.queries.VisibilityQueryImplementation2;
47	import org.openide.filesystems.FileUtil;	47	import org.openide.filesystems.FileUtil;
48	import org.openide.filesystems.FileObject;	48	import org.openide.filesystems.FileObject;
49		49
Lines 60-66 Link Here
60	*	60	*
61	* @author Maros Sandor	61	* @author Maros Sandor
62	*/	62	*/
63	public class SubversionVisibilityQuery implements VisibilityQueryImplementation, VersioningListener {	63	public class SubversionVisibilityQuery implements VisibilityQueryImplementation2, VersioningListener {
64		64
65	private List<ChangeListener> listeners = new ArrayList<ChangeListener>();	65	private List<ChangeListener> listeners = new ArrayList<ChangeListener>();
66	private FileStatusCache cache;	66	private FileStatusCache cache;
Lines 73-79 Link Here
73	public boolean isVisible(FileObject fileObject) {	73	public boolean isVisible(FileObject fileObject) {
74	if (fileObject.isData()) return true;	74	if (fileObject.isData()) return true;
75	File file = FileUtil.toFile(fileObject);	75	File file = FileUtil.toFile(fileObject);
76	if(file == null) return true;	76	return isVisible(file);
		77	}
		78
		79	public boolean isVisible(File file) {
		80	if(file == null) return true;
		81	if (file.isFile()) {
		82	return true;
		83	}
77	if(!(VersioningSupport.getOwner(file) instanceof SubversionVCS)) {	84	if(!(VersioningSupport.getOwner(file) instanceof SubversionVCS)) {
78	return true;	85	return true;
79	}	86	}

Lines 40-46 Link Here

(-)a/versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/CvsVisibilityQuery.java (-3 / +7 lines)
40	*/	40	*/
41	package org.netbeans.modules.versioning.system.cvss;	41	package org.netbeans.modules.versioning.system.cvss;
42		42
43	import org.netbeans.spi.queries.VisibilityQueryImplementation;	43	import org.netbeans.spi.queries.VisibilityQueryImplementation2;
44	import org.netbeans.modules.versioning.util.Utils;	44	import org.netbeans.modules.versioning.util.Utils;
45	import org.netbeans.modules.versioning.util.VersioningEvent;	45	import org.netbeans.modules.versioning.util.VersioningEvent;
46	import org.netbeans.modules.versioning.util.VersioningListener;	46	import org.netbeans.modules.versioning.util.VersioningListener;
Lines 59-65 Link Here
59	*	59	*
60	* @author Maros Sandor	60	* @author Maros Sandor
61	*/	61	*/
62	public class CvsVisibilityQuery implements VisibilityQueryImplementation, VersioningListener {	62	public class CvsVisibilityQuery implements VisibilityQueryImplementation2, VersioningListener {
63		63
64	private static CvsVisibilityQuery instance;	64	private static CvsVisibilityQuery instance;
65	private static final String MARKER_CVS_REMOVED = "CVS/.nb-removed";	65	private static final String MARKER_CVS_REMOVED = "CVS/.nb-removed";
Lines 80-86 Link Here
80	public boolean isVisible(FileObject fileObject) {	80	public boolean isVisible(FileObject fileObject) {
81	if (fileObject.isData()) return true;	81	if (fileObject.isData()) return true;
82	File file = FileUtil.toFile(fileObject);	82	File file = FileUtil.toFile(fileObject);
83	return file == null \|\| !isHiddenFolder(file);	83	return isVisible(file);
		84	}
		85
		86	public boolean isVisible(File file) {
		87	return file == null \|\| file.isFile() \|\| !isHiddenFolder(file);
84	}	88	}
85		89
86	public synchronized void addChangeListener(ChangeListener l) {	90	public synchronized void addChangeListener(ChangeListener l) {