removed unneeded code.
authorwpaul
Thu, 05 Aug 2010 14:24:42 -0500
changeset 1775 2771fd853ac2
parent 1774 689cfe252aa4
child 1777 490bb9a68e6b
removed unneeded code.
project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java	Thu Aug 05 14:20:57 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java	Thu Aug 05 14:24:42 2010 -0500
@@ -35,7 +35,6 @@
 import org.eclipse.ui.IWorkbench;
 
 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.project.ui.ProjectUIPlugin;
 import com.nokia.carbide.cpp.project.core.ProjectCorePlugin;
@@ -89,8 +88,6 @@
 		// way the project setting will be set to build bld.inf.
 		final List<String> components = mmpSelectionPage.areAllMakMakeReferencesChecked() ? new ArrayList<String>(0) : mmpSelectionPage.getSelectedMakMakeReferences();
 
-		final List<String> refs = getSelectedMakMakeReferences();
-		
 		final List<ISymbianBuildContext> selectedConfigs = getSelectedConfigs();
 
 		// run this in a workspace job
@@ -99,33 +96,13 @@
 			public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
 				monitor.beginTask(Messages.BldInfImportWizard_CreatingProjectJobName, IProgressMonitor.UNKNOWN);
 
-				// write the debug target mmp setting - use the last mmp in
-				// the list of selected mak make files.
-				// We also need to check for project test mmpfiles and add that only if the project is only comprised of test mmp files
-				String debugMMP = ""; //$NON-NLS-1$
-				boolean hasOneNormalMMP = false; // Don't add test mmp if there's a regular MMP
-				for (String ref : refs) {
-					if (ref.toLowerCase().endsWith(".mmp")){
-						hasOneNormalMMP = true;
-						debugMMP = ref;
-					}
-					
-					if (hasOneNormalMMP == false){
-						if (ref.toLowerCase().endsWith(".mmp " + ICarbideProjectInfo.TEST_COMPONENT_LABEL)) { //$NON-NLS-1$
-			    			debugMMP = ref;
-		    				debugMMP = debugMMP.substring(0, debugMMP.indexOf( " " + ICarbideProjectInfo.TEST_COMPONENT_LABEL));
-			    		}
-					}
-				} // for
-
-				IProject newProject = null;
-        		newProject = ProjectCorePlugin.createProject(projectName, rootDirectory.toOSString());
+				IProject newProject = ProjectCorePlugin.createProject(projectName, rootDirectory.toOSString());
         		monitor.worked(1);
 
     			newProject.setSessionProperty(CarbideBuilderPlugin.SBSV2_PROJECT, Boolean.valueOf(useSBSv2Builder()));
 
     			// TODO pass PKG file path to postProjectCreatedActions, currently passing null
-        		ProjectCorePlugin.postProjectCreatedActions(newProject, projectRelativePath, selectedConfigs, components, debugMMP, null, monitor);
+        		ProjectCorePlugin.postProjectCreatedActions(newProject, projectRelativePath, selectedConfigs, components, null, null, monitor);
         		
         		if (monitor.isCanceled()) {
 	    			// the user canceled the import so delete the project