Mercurial Mercurial > oss > FCL > sftools > dev > ide > carbidecpp / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add feature strings for new http feature tracker
authortimkelly
Thu, 26 Aug 2010 20:49:15 -0500
changeset 1899 d1e402149e7f
parent 1898 2a78cecf2c2d
child 1900 346e4625dacb
add feature strings for new http feature tracker
core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/api/featureTracker/IFeatureUseTracker.java file | annotate | diff | comparison | revisions
core/com.nokia.carbide.templatewizard/META-INF/MANIFEST.MF file | annotate | diff | comparison | revisions
core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/internal/api/templatewizard/ui/TemplateWizard.java file | annotate | diff | comparison | revisions
project/com.nokia.carbide.cpp.project.ui/META-INF/MANIFEST.MF file | annotate | diff | comparison | revisions
project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java file | annotate | diff | comparison | revisions
qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF file | annotate | diff | comparison | revisions
qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileImportWizard.java file | annotate | diff | comparison | revisions 
--- a/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/api/featureTracker/IFeatureUseTracker.java	Thu Aug 26 18:02:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/api/featureTracker/IFeatureUseTracker.java	Thu Aug 26 20:49:15 2010 -0500
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2009-2010 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"
--- a/core/com.nokia.carbide.templatewizard/META-INF/MANIFEST.MF	Thu Aug 26 18:02:08 2010 -0500
+++ b/core/com.nokia.carbide.templatewizard/META-INF/MANIFEST.MF	Thu Aug 26 20:49:15 2010 -0500
@@ -11,7 +11,8 @@
  org.eclipse.emf.ecore.xmi,
  org.eclipse.ui.ide,
  com.nokia.cpp.utils.core,
- com.nokia.cpp.utils.ui
+ com.nokia.cpp.utils.ui,
+ com.nokia.carbide.cpp.featureTracker;bundle-version="3.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.internal.api.template.engine,
  com.nokia.carbide.internal.api.templatewizard.ui,
--- a/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/internal/api/templatewizard/ui/TemplateWizard.java	Thu Aug 26 18:02:08 2010 -0500
+++ b/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/internal/api/templatewizard/ui/TemplateWizard.java	Thu Aug 26 20:49:15 2010 -0500
@@ -18,13 +18,15 @@
 
 package com.nokia.carbide.internal.api.templatewizard.ui;
 
-import com.nokia.carbide.internal.api.template.engine.TemplateEngine;
-import com.nokia.carbide.template.engine.*;
-import com.nokia.carbide.templatewizard.TemplateWizardPlugin;
-import com.nokia.cpp.internal.api.utils.core.Check;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.jface.viewers.IFilter;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -33,7 +35,15 @@
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
 
-import java.util.*;
+import com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerPlugin;
+import com.nokia.carbide.internal.api.template.engine.TemplateEngine;
+import com.nokia.carbide.template.engine.DialogSettingsPersistedStorage;
+import com.nokia.carbide.template.engine.ILoadedTemplate;
+import com.nokia.carbide.template.engine.ILoadedTemplateUI;
+import com.nokia.carbide.template.engine.IPersistedSettingStorage;
+import com.nokia.carbide.template.engine.ITemplate;
+import com.nokia.carbide.templatewizard.TemplateWizardPlugin;
+import com.nokia.cpp.internal.api.utils.core.Check;
 
 public abstract class TemplateWizard extends BasicNewResourceWizard {
 
@@ -43,6 +53,8 @@
 	private boolean hideFilterCheckbox;
 	private ChooseTemplatePage chooseTemplatePage;
 
+	private static final String CARBIDE_INF_PROJECT_WIZ_FEATURE = "CARBIDE_INF_PROJECT_WIZARD"; //$NON-NLS-1$
+	
 	@Override
 	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
 		super.init(workbench, currentSelection);
@@ -100,6 +112,8 @@
 		job.setRule(getJobSchedulingRule());
 		job.schedule();
 		
+		FeatureUseTrackerPlugin.getFeatureUseProxy().useFeature(CARBIDE_INF_PROJECT_WIZ_FEATURE);
+		
 	    return true;
 	}
 
--- a/project/com.nokia.carbide.cpp.project.ui/META-INF/MANIFEST.MF	Thu Aug 26 18:02:08 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/META-INF/MANIFEST.MF	Thu Aug 26 20:49:15 2010 -0500
@@ -30,7 +30,8 @@
  com.nokia.carbide.cpp.ui,
  org.eclipse.ui.navigator,
  org.eclipse.ui.navigator.resources,
- org.eclipse.core.filesystem;bundle-version="1.2.0"
+ org.eclipse.core.filesystem;bundle-version="1.2.0",
+ com.nokia.carbide.cpp.featureTracker;bundle-version="3.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp.internal.project.ui,
  com.nokia.carbide.cpp.internal.project.ui.actions,
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java	Thu Aug 26 18:02:08 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java	Thu Aug 26 20:49:15 2010 -0500
@@ -39,6 +39,7 @@
 import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
 import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo;
 import com.nokia.carbide.cpp.internal.api.sdk.ISDKManagerInternal;
+import com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerPlugin;
 import com.nokia.carbide.cpp.internal.project.ui.ProjectUIPlugin;
 import com.nokia.carbide.cpp.internal.sdk.core.model.SDKManager;
 import com.nokia.carbide.cpp.project.core.ProjectCorePlugin;
@@ -56,6 +57,7 @@
 	private MMPSelectionPage mmpSelectionPage;
 	private ProjectPropertiesPage projectPropertiesPage;
 
+	private static final String CARBIDE_BLDINF_IMFPORTER_FEATURE = "CARBIDE_BLDINF_IMPORTER"; //$NON-NLS-1$
 
 	public BldInfImportWizard() {
 		super();
@@ -161,6 +163,8 @@
 		job.setRule(ResourcesPlugin.getWorkspace().getRoot());
 		job.schedule();
 
+		FeatureUseTrackerPlugin.getFeatureUseProxy().useFeature(CARBIDE_BLDINF_IMFPORTER_FEATURE);
+		
 		return true;
 	}
 	 
--- a/qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF	Thu Aug 26 18:02:08 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF	Thu Aug 26 20:49:15 2010 -0500
@@ -24,6 +24,7 @@
  org.eclipse.ui.ide,
  com.trolltech.qtcppproject;bundle-version="1.6.0";resolution:=optional,
  com.nokia.cpp.utils.ui,
- com.nokia.cpp.utils.core;bundle-version="1.0.0"
+ com.nokia.cpp.utils.core;bundle-version="1.0.0",
+ com.nokia.carbide.cpp.featureTracker;bundle-version="3.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
--- a/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileImportWizard.java	Thu Aug 26 18:02:08 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileImportWizard.java	Thu Aug 26 20:49:15 2010 -0500
@@ -38,6 +38,7 @@
 
 import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
 import com.nokia.carbide.cpp.internal.api.sdk.ISDKManagerInternal;
+import com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerPlugin;
 import com.nokia.carbide.cpp.internal.project.ui.ProjectUIPlugin;
 import com.nokia.carbide.cpp.internal.qt.core.QtCorePlugin;
 import com.nokia.carbide.cpp.internal.qt.core.QtSDKUtils;
@@ -57,6 +58,7 @@
 	private QtProFileSelectionPage proFileSelectionPage;
 	private QtImporterBuildTargetsPage buildTargetsPage;
 
+	private static final String CARBIDE_QTPRO_IMFPORTER_FEATURE = "CARBIDE_QTPRO_IMPORTER"; //$NON-NLS-1$
 
 	public QtProFileImportWizard() {
 		super();
@@ -156,6 +158,8 @@
 		job.setRule(ResourcesPlugin.getWorkspace().getRoot());
 		job.schedule();
 
+		FeatureUseTrackerPlugin.getFeatureUseProxy().useFeature(CARBIDE_QTPRO_IMFPORTER_FEATURE);
+		
 		return true;
 	}
FCL/sftools/dev/ide/carbidecpp