--- GlobalUndoContext.java	Thu Aug  6 16:58:13 2009
+++ UndoContext.java	Thu Aug  6 16:59:16 2009
@@ -8,31 +8,48 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.core.internal.commands.operations;
+package org.eclipse.core.commands.operations;
 
-import org.eclipse.core.commands.operations.IUndoContext;
-
 /**
  * <p>
- * An operation context that matches to any context.  It can be used to 
- * get an unfiltered (global) history.
+ * A simple, lightweight undo context that can be used to tag any operation. It
+ * does not provided a specialized label. This class may be instantiated by
+ * clients. This class may also be subclassed.
  * </p>
  * 
  * @since 3.1
  */
-public class GlobalUndoContext implements IUndoContext {
+public class UndoContext implements IUndoContext {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.IUndoContext#getLabel()
+	/**
+	 * <p>
+	 * Get the label that describes the undo context. The default implementation
+	 * returns the empty String. Subclasses may override.
+	 * </p>
+	 * 
+	 * @return the label for the context.
 	 */
 	public String getLabel() {
-		return "Global Undo Context"; //$NON-NLS-1$
+		return ""; //$NON-NLS-1$
 	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.IUndoContext#matches(IUndoContext context)
+
+	/**
+	 * <p>
+	 * Return whether the specified context is considered a match for the
+	 * receiving context. When a context matches another context, operations
+	 * that have the context are considered to also have the matching context.
+	 * The default implementation checks whether the supplied context is
+	 * identical to this context. Subclasses may override.
+	 * </p>
+	 * 
+	 * @param context
+	 *            the context to be checked against the receiving context.
+	 * 
+	 * @return <code>true</code> if the receiving context can be considered a
+	 *         match for the specified context, and <code>false</code> if it
+	 *         cannot.
 	 */
 	public boolean matches(IUndoContext context) {
-		return true;
+		return context == this;
 	}
 }
