bug 296691 - Change new Groups API to Virtual Resource API

Author: Szymon Brandys

bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/CopyVisitor.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -72,11 +72,11 @@ protected boolean copy(UnifiedTreeNode node) {
 
 	protected boolean copyContents(UnifiedTreeNode node, Resource source, Resource destination) {
 		try {
-			if (source.isGroup()) {
-				((Folder) destination).createGroup(updateFlags & IResource.ALLOW_MISSING_LOCAL, null);
+			if (source.isVirtual()) {
+				((Folder) destination).create(IResource.VIRTUAL, true, null);
 				return true;
 			}
-			if ((!isDeep || source.isUnderGroup()) && source.isLinked()) {
+			if ((!isDeep || source.isUnderVirtual()) && source.isLinked()) {
 				destination.createLink(source.getRawLocationURI(), updateFlags & IResource.ALLOW_MISSING_LOCAL, null);
 				return false;
 			}
@@ -144,8 +144,8 @@ protected Workspace getWorkspace() {
 	}
 
 	protected boolean isSynchronized(UnifiedTreeNode node) {
-		/* groups are always deemed as being synchronized */
-		if (node.getResource().isGroup())
+		/* virtual resources are always deemed as being synchronized */
+		if (node.getResource().isVirtual())
 			return true;
 		/* does the resource exist in workspace and file system? */
 		if (!node.existsInWorkspace() || !node.existsInFileSystem())

bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/DeleteVisitor.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -105,7 +105,7 @@ protected boolean isAncestorOfResourceToSkip(IResource resource) {
 	private void recursiveKeepHistory(IHistoryStore store, UnifiedTreeNode node) {
 		final IResource target = node.getResource();
 		//we don't delete linked content, so no need to keep history
-		if (target.isLinked() || target.isGroup() || node.isSymbolicLink())
+		if (target.isLinked() || target.isVirtual() || node.isSymbolicLink())
 			return;
 		if (node.isFolder()) {
 			monitor.subTask(NLS.bind(Messages.localstore_deleting, target.getFullPath()));

bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java

@@ -432,7 +432,7 @@ private FileStoreRoot getStoreRoot(IResource target) {
 			root = info.getFileStoreRoot();
 			if (root != null && root.isValid())
 				return root;
-			if (info.isSet(ICoreConstants.M_GROUP)) {
+			if (info.isSet(ICoreConstants.M_VIRTUAL)) {
 				ProjectDescription description = ((Project) target.getProject()).internalGetDescription();
 				if (description != null) {
 					setLocation(target, info, description.getGroupLocationURI(target.getProjectRelativePath()));

bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/AliasManager.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -363,7 +363,7 @@ private void addToLocationsMap(IProject project) {
 	}
 
 	private void addToLocationsMap(IResource link, IFileStore location) {
-		if (location != null && !link.isGroup())
+		if (location != null && !link.isVirtual())
 			if (locationsMap.add(location, link))
 				nonDefaultResourceCount++;
 	}

bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Folder.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -75,7 +75,12 @@ public IFile changeToFile() throws CoreException {
 	/* (non-Javadoc)
 	 * @see IFolder#create(int, boolean, IProgressMonitor)
 	 */
-	public void create(int updateFlags, boolean local, IProgressMonitor monitor) throws CoreException {
+	public void create(int updateFlags, boolean local, IProgressMonitor monitor) throws CoreException {	
+		if ((updateFlags & IResource.VIRTUAL) == IResource.VIRTUAL) {
+			createLink(LinkDescription.GROUP_LOCATION, updateFlags, monitor);
+			return;
+		}
+		
 		final boolean force = (updateFlags & IResource.FORCE) != 0;
 		monitor = Policy.monitorFor(monitor);
 		try {
@@ -120,16 +125,6 @@ public void create(boolean force, boolean local, IProgressMonitor monitor) throw
 		create((force ? IResource.FORCE : IResource.NONE), local, monitor);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IFolder#createGroup(int,
-	 *      IProgressMonitor)
-	 */
-	public void createGroup(int updateFlags, IProgressMonitor monitor) throws CoreException {
-		createLink(LinkDescription.GROUP_LOCATION, updateFlags, monitor);
-	}
-
 	/**
 	 * Ensures that this folder exists in the workspace. This is similar in
 	 * concept to mkdirs but it does not work on projects.
@@ -150,8 +145,8 @@ public void ensureExists(IProgressMonitor monitor) throws CoreException {
 			parent.checkExists(getFlags(info), true);
 		} else
 			((Folder) parent).ensureExists(monitor);
-		if (getType() == FOLDER && isUnderGroup())
-			createGroup(IResource.FORCE, monitor);
+		if (getType() == FOLDER && isUnderVirtual())
+			create(IResource.VIRTUAL | IResource.FORCE, true, monitor);
 		else
 			internalCreate(IResource.FORCE, true, monitor);
 	}

bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ICoreConstants.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -59,10 +59,10 @@ public interface ICoreConstants {
 	 */
 	static final int M_LINK = 0x10000;
 	/**
-	 * Marks this resource as a group.
+	 * Marks this resource as virtual.
 	 * @since 3.6
 	 */
-	static final int M_GROUP = 0x80000;
+	static final int M_VIRTUAL = 0x80000;
 	/**
 	 * The file has no content description.
 	 * @since 3.0

bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -749,8 +749,8 @@ public boolean isLinked(int options) {
 		return false;//projects are never linked
 	}
 
-	public boolean isGroup() {
-		return false;// projects are never groups
+	public boolean isVirtual() {
+		return false; // projects are never virtual
 	}
 
 	/* (non-Javadoc)
@@ -1024,7 +1024,7 @@ else if (arg0.equals(arg1))
 					((Folder) parent).ensureExists(Policy.monitorFor(null));
 				if (!toLink.exists() || !toLink.isLinked()) {
 					if (newLink.isGroup())
-						((Folder) toLink).createGroup(IResource.REPLACE | IResource.ALLOW_MISSING_LOCAL, null);
+						((Folder) toLink).create(IResource.REPLACE | IResource.VIRTUAL, true, null);
 					else
 						toLink.createLink(newLink.getLocationURI(), IResource.REPLACE | IResource.ALLOW_MISSING_LOCAL, null);
 				}

bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Resource.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -238,7 +238,7 @@ public IStatus checkCopyRequirements(IPath destination, int destinationType, int
 		checkAccessibleAndLocal(DEPTH_INFINITE);
 
 		IPath destinationParent = destination.removeLastSegments(1);
-		checkValidGroupContainer(destinationParent, isLinked(), isGroup());
+		checkValidGroupContainer(destinationParent, isLinked(), isVirtual());
 
 		Resource dest = workspace.newResource(destination, destinationType);
 		dest.checkDoesNotExist();
@@ -269,7 +269,7 @@ public IStatus checkCopyRequirements(IPath destination, int destinationType, int
 				throw new ResourceException(IResourceStatus.FAILED_READ_LOCAL, getFullPath(), message, null);
 			}
 			URI destLocation = dest.getLocationURI();
-			if (destLocation == null && (dest.isUnderGroup() == false)) {
+			if (destLocation == null && (dest.isUnderVirtual() == false)) {
 				message = NLS.bind(Messages.localstore_locationUndefined, dest.getFullPath());
 				throw new ResourceException(IResourceStatus.FAILED_READ_LOCAL, dest.getFullPath(), message, null);
 			}
@@ -371,7 +371,7 @@ protected IStatus checkMoveRequirements(IPath destination, int destinationType,
 		checkAccessibleAndLocal(DEPTH_INFINITE);
 
 		IPath destinationParent = destination.removeLastSegments(1);
-		checkValidGroupContainer(destinationParent, isLinked(), isGroup());
+		checkValidGroupContainer(destinationParent, isLinked(), isVirtual());
 
 		Resource dest = workspace.newResource(destination, destinationType);
 
@@ -406,7 +406,7 @@ protected IStatus checkMoveRequirements(IPath destination, int destinationType,
 				throw new ResourceException(IResourceStatus.FAILED_READ_LOCAL, getFullPath(), message, null);
 			}
 			URI destLocation = dest.getLocationURI();
-			if (destLocation == null && (dest.isUnderGroup() == false)) {
+			if (destLocation == null && (dest.isUnderVirtual() == false)) {
 				message = NLS.bind(Messages.localstore_locationUndefined, dest.getFullPath());
 				throw new ResourceException(IResourceStatus.FAILED_READ_LOCAL, dest.getFullPath(), message, null);
 			}
@@ -444,7 +444,7 @@ public void checkValidGroupContainer(IPath destination, boolean isLink, boolean
 			String message = Messages.group_invalidParent;
 			ResourceInfo info = workspace.getResourceInfo(destination, false,
 					false);
-			if (info != null && info.isSet(M_GROUP))
+			if (info != null && info.isSet(M_VIRTUAL))
 				throw new ResourceException(new ResourceStatus(
 						IResourceStatus.INVALID_VALUE, null, message));
 		}
@@ -460,7 +460,7 @@ public void checkValidGroupContainer(IPath destination, boolean isLink, boolean
 	public void checkValidGroupContainer(Container destination, boolean isLink, boolean isGroup) throws CoreException {
 		if (!isLink && !isGroup) {
 			String message = Messages.group_invalidParent;
-			if (destination.isGroup())
+			if (destination.isVirtual())
 				throw new ResourceException(new ResourceStatus(IResourceStatus.INVALID_VALUE, null, message));
 		}
 	}
@@ -469,7 +469,7 @@ public IStatus getValidGroupContainer(IPath destination, boolean isLink, boolean
 		if (!isLink && !isGroup) {
 			String message = Messages.group_invalidParent;
 			ResourceInfo info = workspace.getResourceInfo(destination, false, false);
-			if (info.isSet(M_GROUP))
+			if (info.isSet(M_VIRTUAL))
 				return new ResourceStatus(IResourceStatus.INVALID_VALUE, null, message);
 		}
 		return Status.OK_STATUS;
@@ -667,7 +667,7 @@ public void createLink(URI localLocation, int updateFlags, IProgressMonitor moni
 				localLocation = FileUtil.canonicalURI(localLocation);
 				LinkDescription linkDescription = new LinkDescription(this, localLocation);
 				if (linkDescription.isGroup())
-					info.set(M_GROUP);
+					info.set(M_VIRTUAL);
 				getLocalManager().link(this, localLocation, fileInfo);
 				monitor.worked(Policy.opWork * 5 / 100);
 				//save the location in the project description
@@ -1156,7 +1156,7 @@ private String findVariant(String target, String[] list) {
 	protected void fixupAfterMoveSource() throws CoreException {
 		ResourceInfo info = getResourceInfo(true, true);
 		//if a linked resource is moved, we need to remove the location info from the .project 
-		if (isLinked() || isGroup()) {
+		if (isLinked() || isVirtual()) {
 			Project project = (Project) getProject();
 			if (project.internalGetDescription().setLinkLocation(getProjectRelativePath(), null))
 				project.writeDescription(IResource.NONE);
@@ -1220,7 +1220,7 @@ public FileSystemResourceManager getLocalManager() {
 	 */
 	public long getLocalTimeStamp() {
 		ResourceInfo info = getResourceInfo(false, false);
-		return (info == null || isGroup()) ? IResource.NULL_STAMP : info.getLocalSyncInfo();
+		return (info == null || isVirtual()) ? IResource.NULL_STAMP : info.getLocalSyncInfo();
 	}
 
 	/* (non-Javadoc)
@@ -1338,7 +1338,7 @@ public URI getRawLocationURI() {
 	 * @see IResource#getResourceAttributes()
 	 */
 	public ResourceAttributes getResourceAttributes() {
-		if (!isAccessible() || isGroup())
+		if (!isAccessible() || isVirtual())
 			return null;
 		return getLocalManager().attributes(this);
 	}
@@ -1526,13 +1526,25 @@ public boolean isLinked(int options) {
 		return info != null && info.isSet(M_LINK);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see IResource#isGroup()
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.resources.IResource#isVirtual()
 	 */
-	public boolean isGroup() {
+	public boolean isVirtual() {
 		ResourceInfo info = getResourceInfo(false, false);
-		return info != null && info.isSet(M_GROUP);
+		return info != null && info.isSet(M_VIRTUAL);
+	}
+	
+	/*
+	 * @return whether the current resource has a parent that is virtual.
+	 */
+	public boolean isUnderVirtual() {
+		IContainer parent = getParent();
+		while (parent != null) {
+			if (parent.isVirtual())
+				return true;
+			parent = parent.getParent();
+		}
+		return false;
 	}
 
 	/* (non-Javadoc)
@@ -2122,7 +2134,7 @@ private void broadcastPreMoveEvent(final IResource destination, int updateFlags)
 			case IResource.FOLDER :
 				if (isLinked())
 					workspace.broadcastEvent(LifecycleEvent.newEvent(LifecycleEvent.PRE_LINK_MOVE, this, destination, updateFlags));
-				if (isGroup())
+				if (isVirtual())
 					workspace.broadcastEvent(LifecycleEvent.newEvent(LifecycleEvent.PRE_GROUP_MOVE, this, destination, updateFlags));
 				break;
 			case IResource.PROJECT :
@@ -2288,18 +2300,4 @@ public void setLinkLocation(IPath location, int updateFlags, IProgressMonitor mo
 				setLinkLocation(URIUtil.toURI(location.toPortableString()), updateFlags, monitor);
 			}
 	}
-
-	/*
-	 * @return whether the current resource has a parent that is a group.
-	 * 
-	 */
-	public boolean isUnderGroup() {
-		IContainer parent = getParent();
-		while (parent != null) {
-			if (parent.isGroup())
-				return true;
-			parent = parent.getParent();
-		}
-		return false;
-	}
 }

bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ResourceTree.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -981,7 +981,7 @@ public void standardMoveFolder(IFolder source, IFolder destination, int flags, I
 
 			//for linked resources, nothing needs to be moved in the file system
 			boolean isDeep = (flags & IResource.SHALLOW) == 0;
-			if (!isDeep && (source.isLinked() || source.isGroup())) {
+			if (!isDeep && (source.isLinked() || source.isVirtual())) {
 				movedFolderSubtree(source, destination);
 				return;
 			}
@@ -1123,7 +1123,7 @@ private void updateTimestamps(IResource root, final boolean isDeep) {
 		IResourceVisitor visitor = new IResourceVisitor() {
 			public boolean visit(IResource resource) {
 				if (resource.isLinked()) {
-					if (isDeep && !((Resource) resource).isUnderGroup()) {
+					if (isDeep && !((Resource) resource).isUnderVirtual()) {
 						//clear the linked resource bit, if any
 						ResourceInfo info = ((Resource) resource).getResourceInfo(false, true);
 						info.clear(ICoreConstants.M_LINK);

bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Workspace.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -756,7 +756,7 @@ else if (destination.segmentCount() == 1)
 		// update link locations in project descriptions
 		if (source.isLinked()) {
 			LinkDescription linkDescription;
-			if (((updateFlags & IResource.SHALLOW) != 0) || ((Resource) source).isUnderGroup()) {
+			if (((updateFlags & IResource.SHALLOW) != 0) || ((Resource) source).isUnderVirtual()) {
 				//for shallow move the destination is a linked resource with the same location
 				newInfo.set(ICoreConstants.M_LINK);
 				linkDescription = new LinkDescription(destinationResource, source.getLocationURI());
@@ -869,6 +869,8 @@ public ResourceInfo createResource(IResource resource, int updateFlags) throws C
 			info.set(M_TEAM_PRIVATE_MEMBER);
 		if ((updateFlags & IResource.HIDDEN) != 0)
 			info.set(M_HIDDEN);
+		//		if ((updateFlags & IResource.VIRTUAL) != 0)
+		//			info.set(M_VIRTUAL);
 		return info;
 	}