--- a/core/com.nokia.carbide.cpp.featureTracker/META-INF/MANIFEST.MF	Thu Aug 26 13:36:24 2010 -0500
+++ b/core/com.nokia.carbide.cpp.featureTracker/META-INF/MANIFEST.MF	Thu Aug 26 14:51:35 2010 -0500
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FeatureTracker
 Bundle-SymbolicName: com.nokia.carbide.cpp.featureTracker;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerPlugin
 Bundle-Vendor: Nokia
 Require-Bundle: org.eclipse.core.runtime

--- a/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/api/featureTracker/IFeatureUseTracker.java	Thu Aug 26 13:36:24 2010 -0500
+++ b/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/api/featureTracker/IFeatureUseTracker.java	Thu Aug 26 14:51:35 2010 -0500
@@ -21,14 +21,9 @@
 public interface IFeatureUseTracker {
 	
 	/**
-	 * Start using the feature (a.k.a. 'checkout')
-	 * @param featureName - The string of the feature to be used
+	 * Track the usage of the given feature
+	 * @param featureName the name of the feature being used
+	 * @since 3.0
 	 */
-	public void startUsingFeature(String featureName);
-	
-	/**
-	 * Called after 'startUsingFeature' once a feature is no longer being used
-	 * @param featureName - The string of the feature being used
-	 */
-	public void stopUsingFeature(String featureName);
+	public void useFeature(String featureName);
 }

--- a/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/featureTracker/FeatureUseTrackerConsts.java	Thu Aug 26 13:36:24 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-*/
-
-package com.nokia.carbide.cpp.internal.featureTracker;
-
-public class FeatureUseTrackerConsts {
-
-	public static final String CARBIDE_APP_TRK = "Carbide_App_TRK";
-	public static final String CARBIDE_UI_DESIGNER = "Carbide_UI_Designer";
-	public static final String CARBIDE_SYS_TRK = "Carbide_Sys_TRK";
-	public static final String CARBIDE_PROFILER = "Carbide_Profiler";
-	public static final String CARBIDE_CODESCANNER = "Carbide_CodeScanner";
-	public static final String CARBIDE_OST_TRACE = "Carbide_OST_Trace";
-	public static final String CARBIDE_IDE = "Carbide_IDE"; // did user launch IDE
-	public static final String CARBIDE_INTERNALONLY = "Carbide_InternalOnly"; // many carbide extensions
-
-}
\ No newline at end of file

--- a/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/featureTracker/FeatureUseTrackerProxy.java	Thu Aug 26 13:36:24 2010 -0500
+++ b/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/featureTracker/FeatureUseTrackerProxy.java	Thu Aug 26 14:51:35 2010 -0500
@@ -37,20 +37,14 @@
 	private List<IFeatureUseTracker> featureClients = new ArrayList<IFeatureUseTracker>();
 	private boolean featureClientInited;
 
-	public void startUsingFeature(String featureName) {
+	public void useFeature(String featureName) {
 		if (!featureClientInited) {
 			checkForClients();
 			featureClientInited = true;
 		}
 
 		for (IFeatureUseTracker client : featureClients) {
-			client.startUsingFeature(featureName);
-		}
-	}
-
-	public void stopUsingFeature(String featureName) {
-		for (IFeatureUseTracker client : featureClients) {
-			client.stopUsingFeature(featureName);
+			client.useFeature(featureName);
 		}
 	}
 	

--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java	Thu Aug 26 13:36:24 2010 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java	Thu Aug 26 14:51:35 2010 -0500
@@ -22,7 +22,6 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
-import com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerConsts;
 import com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerPlugin;
 import com.nokia.carbide.internal.discovery.ui.wizard.P2Utils;
 
@@ -31,6 +30,8 @@
  */
 public class ProductPlugin extends AbstractUIPlugin {
 
+	private static final String CARBIDE_IDE_FEATURE = "CARBIDE_IDE"; //$NON-NLS-1$
+	
 	//The shared instance.
 	private static ProductPlugin plugin;
 	
@@ -51,7 +52,7 @@
 			P2Utils.writeFeaturesToFile(file);
 		}
 
-		FeatureUseTrackerPlugin.getFeatureUseProxy().startUsingFeature(FeatureUseTrackerConsts.CARBIDE_IDE);
+		FeatureUseTrackerPlugin.getFeatureUseProxy().useFeature(CARBIDE_IDE_FEATURE);
 	}
 
 	/**

--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/Activator.java	Thu Aug 26 13:36:24 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/Activator.java	Thu Aug 26 14:51:35 2010 -0500
@@ -22,8 +22,6 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
-import com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerConsts;
-import com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerPlugin;
 import com.nokia.carbide.trk.support.status.ConnectionStatusReconciler;
 import com.nokia.cpp.internal.api.utils.core.Logging;