### Eclipse Workspace Patch 1.0
#P org.eclipse.trace.ui
Index: src/org/eclipse/trace/ui/internal/datamodel/TracingCaches.java
===================================================================
--- src/org/eclipse/trace/ui/internal/datamodel/TracingCaches.java	(revision 1)
+++ src/org/eclipse/trace/ui/internal/datamodel/TracingCaches.java	(working copy)
@@ -161,6 +161,10 @@
 										TracingConstants.TRACE_MODEL_STRING,
 										"The tracing component for id '" + id + "' already exists.  The bundles for this new component are added to the existing component."); //$NON-NLS-1$ //$NON-NLS-2$
 					}
+					// set the label if specified
+					if ( element.getAttribute(TracingConstants.TRACING_EXTENSION_LABEL_ATTRIBUTE) != null ) {
+						component.setLabel(element.getAttribute(TracingConstants.TRACING_EXTENSION_LABEL_ATTRIBUTE));
+					}
 					component.addBundles(element);
 				}
 			}
Index: src/org/eclipse/trace/ui/internal/TracingPreferencePage.java
===================================================================
--- src/org/eclipse/trace/ui/internal/TracingPreferencePage.java	(revision 1)
+++ src/org/eclipse/trace/ui/internal/TracingPreferencePage.java	(working copy)
@@ -627,11 +627,12 @@
 		// collapse and uncheck all elements in the tree
 		this.getViewer().setExpandedElements(new Object[0]);
 		this.getViewer().setCheckedElements(new Object[0]);
-		// set the UI back to the default
+		// set the preferences back to the default
 		PreferenceHandler.setDefaultPreferences();
-		this.setUIValuesFromPreferences();
 		// disable tracing
 		DebugOptionsHandler.setDebugEnabled(false);
+		// set the UI back to the default
+		this.setUIValuesFromPreferences();
 		if (TracingUIActivator.DEBUG_UI) {
 			TRACE.traceExit(TracingConstants.TRACE_UI_STRING);
 		}
@@ -670,7 +671,7 @@
 					.getDebugOptionsToRemove();
 			for (int i = 0; i < optionsToRemove.length; i++) {
 				if (TracingUIActivator.DEBUG_UI) {
-					TRACE.traceEntry(TracingConstants.TRACE_UI_STRING, "Removing debug option: " + optionsToAdd[i]); //$NON-NLS-1$
+					TRACE.traceEntry(TracingConstants.TRACE_UI_STRING, "Removing debug option: " + optionsToRemove[i]); //$NON-NLS-1$
 				}
 				DebugOptionsHandler.removeDebugOption(optionsToRemove[i]);
 			}
Index: src/org/eclipse/trace/ui/internal/providers/TracingComponentColumnEditingSupport.java
===================================================================
--- src/org/eclipse/trace/ui/internal/providers/TracingComponentColumnEditingSupport.java	(revision 1)
+++ src/org/eclipse/trace/ui/internal/providers/TracingComponentColumnEditingSupport.java	(working copy)
@@ -17,8 +17,10 @@
 import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
 import org.eclipse.trace.ui.internal.TracingConstants;
+import org.eclipse.trace.ui.internal.TracingUtils;
 import org.eclipse.trace.ui.internal.datamodel.TracingCaches;
 import org.eclipse.trace.ui.internal.datamodel.TracingComponentDebugOption;
+import org.eclipse.trace.ui.internal.plugin.TracingUIActivator;
 
 /**
  * An editing support object for the tracing UI viewer.
@@ -57,6 +59,10 @@
 		switch (this.columnIndex) {
 			case TracingConstants.VALUE_COLUMN_INDEX:
 				canEdit = true;
+				if (element instanceof TracingComponentDebugOption) {
+					String optionPathValue = ((TracingComponentDebugOption) element).getOptionPathValue();
+					canEdit = !TracingUtils.isValueBoolean(optionPathValue);
+				}
 				break;
 			default:
 				// do nothing - no other columns provide editing support
Index: schema/traceComponent.exsd
===================================================================
--- schema/traceComponent.exsd	(revision 1)
+++ schema/traceComponent.exsd	(working copy)
@@ -55,7 +55,7 @@
       </annotation>
       <complexType>
          <sequence>
-            <element ref="bundle" minOccurs="1" maxOccurs="unbounded"/>
+            <element ref="bundle" minOccurs="0" maxOccurs="unbounded"/>
          </sequence>
          <attribute name="id" type="string" use="required">
             <annotation>
@@ -64,7 +64,7 @@
                </documentation>
             </annotation>
          </attribute>
-         <attribute name="label" type="string" use="required">
+         <attribute name="label" type="string">
             <annotation>
                <documentation>
                   A human readable label for the component which will be displayed in the tracing dialog.