Attachment #3598 for bug #17984

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

Lines 385-388 Link Here

(-)org/netbeans/modules/cvsclient/NbJavaCvsFileSystem.java (-64 / +17 lines)
385	addParentToRefresher(name);
386	}
387	private void addParentToRefresher(String name) {
Line 402 Link Here
402	addParentToRefresher(oldName);	398	int lastIndex = oldName.lastIndexOf('/');
403	--	399	String parent;
		400	if (lastIndex > 0) {
		401	parent = oldName.substring(0, lastIndex);
		402	} else {
		403	parent = "";
		404	}
		405	if (refresher != null) {
		406	// System.out.println("refreshing..=" + parent);
		407	// System.out.println("oldName=" + oldName);
		408	refresher.addPrefferedFolder(parent);
		409	}
Lines 462-464 Link Here
462	if (isCreateBackups()) {
463	addParentToRefresher(name);
464	}
Lines 1390-1396 Link Here
1390	// System.out.println("creating ref.=" + fo.getNameExt());	1394	setVirtualDataLoader(fo);
1391	// setVirtualDataLoader(fo);
1392	if (checkVirtual(fo.getPackageNameExt('/','.'))) {
1393	// System.out.println(" !!! new ref is virtual");
1394	((CacheReference)retValue).setVirtual(true);
1395	}
1396	--
Line 1436 Link Here
1436	if (ms <= 0 \|\| System.getProperty ("netbeans.debug.heap") != null) { //NOI18N	1434	if (ms <= 0 \|\| System.getProperty ("netbeans.debug.heap") != null) {
1437	--
Line 1439 Link Here
1439	//testing only comment refresher = new VcsRefreshRequest (this, ms, this);
Lines 1553-1568 Link Here
1553	} else if ("NetBeansAttrAssignedLoader".equals(attrName)) { /* DataObject.EA_ASSIGNED_LOADER */ //NOI18N
1554	CacheReference ref = getCacheReference(name);
1555	if (ref != null) {
1556	if (ref.isVirtual()) {
1557	// System.out.println("is virtual.." + name);
1558	return VirtualsDataLoader.class.getName();
1559	}
1560	}
1561	} else if ("NetBeansAttrAssignedLoaderModule".equals(attrName)) { /* DataObject.EA_ASSIGNED_LOADER_MODULE */ //NOI18N
1562	CacheReference ref = getCacheReference(name);
1563	if (ref != null) {
1564	if (ref.isVirtual()) {
1565	// System.out.println("is vitrual module..");
1566	return "org.netbeans.modules.vcscore"; //NOI18N
1567	}
1568	}
Lines 1583-1584 Link Here
1583	}	1564	} else {
1584	return super.readAttribute(name, attrName);	1565	return super.readAttribute(name, attrName);
1585	--	1566	}
Lines 1632-1658 Link Here
1632	if ("NetBeansAttrAssignedLoader".equals(attrName)) { /* DataObject.EA_ASSIGNED_LOADER */ //NOI18N
1633	if (value != null && "org.netbeans.modules.vcscore.util.virtuals.VirtualsDataLoader".equals(value.toString())) {
1634	// System.out.println("dont write loader attribute,.," + name);
1635	//don't write to .nbattrs file..
1636	CacheReference ref = getCacheReference(name);
1637	if (ref != null) {
1638	// System.out.println("writed is virtual");
1639	ref.setVirtual(true);
1640	}
1641	return;
1642	}
1643	if (value == null) {
1644	CacheReference ref = getCacheReference(name);
1645	if (ref != null) {
1646	ref.setVirtual(false);
1647	}
1648	}
1649	// System.out.println("write assigned loader for=" + name);
1650	}
1651	if ("NetBeansAttrAssignedLoaderModule".equals(attrName)) { /* DataObject.EA_ASSIGNED_LOADER_MODULE */ //NOI18N
1652	if (value != null && "org.netbeans.modules.vcscore".equals(value.toString()) //NOI18N
1653	&& checkVirtual(name)) {
1654	//don't write to .nbattrs file..
1655	return;
1656	}
1657	// System.out.println("write assigned module=" + value);
1658	}

Line 824 Link Here

(-)org/netbeans/modules/javacvs/JavaCvsFileSystem.java (-18 / +23 lines)
		824	/**
		825	* Utility method that find the fileobject reference and if it exists, retypes it to CacheReference.
		826	* @param name pathname of the resource.
		827	* @returns the cacheReference instance if one exists or null
		828	*/
		829	protected CacheReference getCacheReference(String name) {
		830	Reference ref = findReference(name);
		831	if (ref != null && ref instanceof CacheReference) {
		832	CacheReference cref = (CacheReference)ref;
		833	return cref;
		834	}
		835	return null;
		836	}
Lines 944-947 Link Here
944	FileObject file = findResource(name);	958	// FileObject file = findResource(name);
945	if (file != null && (!file.isVirtual())	959	File file = getFile(name);
946	&& (!name.endsWith("~")) && file.getSize() > 0) { //NOI18N	960	if (file != null && (!checkVirtual(name))
947	FileObject fo = findResource(name + "~"); //NOI18N	961	&& (!name.endsWith("~")) && file.length() > 0) { //NOI18N
948	--
Line 953 Link Here
953	InputStream input = file.getInputStream();	967	InputStream input = new BufferedInputStream(new FileInputStream(file));
954	--
Line 958 Link Here
958	file.getParent().refresh();	972	// file.getParent().refresh();
959	--
Line 980 Link Here
980	CacheReference ref = (CacheReference)findReference(name);	994	CacheReference ref = getCacheReference(name);
981	--
Line 1218 Link Here
1218	Reference rf = findReference(name);	1232	CacheReference rf = getCacheReference(name);
1219	--
Lines 1220-1221 Link Here
1220	CacheReference ref = (CacheReference)rf;	1234	return rf.isImportant();
1221	return ref.isImportant();
1222	--
Line 1697 Link Here
1697	CacheReference ref = (CacheReference)findReference(name);	1710	CacheReference ref = getCacheReference(name);
1698	--

Line 17 Link Here

(-)org/netbeans/modules/vcscore/cache/CacheReference.java (-4 / +31 lines)
17	*	17	* Class that extends WeakReference and is used by the filesystem to
18	--	18	* store reference to the FileObject. It also stores some dynamic fileobject-related
		19	* information.
Line 19 Link Here
19	* @version
Line 30 Link Here
		31	private boolean virtual;
Line 37 Link Here
		39	virtual = false;
Line 38 Link Here
38	--	41	/**
		42	* The reference pointer into the VCS status cache.
		43	*/
Line 43 Link Here
		49	/**
		50	* Identifier of the cache object this reference belongs to.
		51	*
		52	*/
Line 51 Link Here
		61	/**
		62	* marks the reference (fileobject) as important.
		63	*/
Line 54 Link Here
		67	/**
		68	* marks the reference (fileobject) as unimportant.
		69	*/
Line 57 Link Here
		74	}
		75	/**
		76	* Set the reference (fileobject) as being virtual.
		77	* Virtual means the fileobject has no local file bound to itself.
		78	*/
		79	public void setVirtual(boolean virt) {
		80	virtual = virt;
		81	}
		82	/**
		83	*
		84	*/
		85	public boolean isVirtual() {
		86	return virtual;

Line 55 Link Here

(-)org/netbeans/modules/vcscore/util/virtuals/VcsRefreshRequest.java (-4 / +19 lines)
		55	private boolean interrupt;
Line 107 Link Here
		109	} else {
		110	//task is running - attempt to interrupt..
		111	interrupt = true;
Line 118 Link Here
		123	private boolean shouldBeInterrupted() {
		124	return interrupt;
		125	}
Line 165 Link Here
		174	interrupt = false;
Line 178 Link Here
		188	interrupt = false;
Line 182 Link Here
		193	// if there's any prefferer folders, shcedule earlier
		194	if (hasPrefferedFolder()) {
		195	t.schedule(1000);
		196	} else {
Line 183 Link Here
183	t.schedule (ms);	198	t.schedule (ms);
184	--	199	}
Line 209 Link Here
		225	if (shouldBeInterrupted()) {
		226	return;
		227	}
Line 219 Link Here
219	if (refreshTime <= 0) {	238	if (refreshTime <= 0 \|\| shouldBeInterrupted()) {
220	--

Return to bug 17984