--- a/sysperfana/perfinvestigator/com.nokia.carbide.cpp.pi.wizards/src/com/nokia/carbide/cpp/internal/pi/wizards/ui/NewPIWizardPageBupMapTask.java	Tue Apr 20 14:41:43 2010 +0300
+++ b/sysperfana/perfinvestigator/com.nokia.carbide.cpp.pi.wizards/src/com/nokia/carbide/cpp/internal/pi/wizards/ui/NewPIWizardPageBupMapTask.java	Wed Apr 21 15:14:16 2010 +0300
@@ -24,7 +24,9 @@
 
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.SWT;
@@ -105,9 +107,9 @@
 	 */
 	public void setupPageFromFromNewPIWizardSettings() {
 		if (settings.keyMapProfile != null) {
-			profileTreeViewer.collapseAll();
+			profileTreeViewer.expandAll();
+			profileTreeViewer.setSelection(new StructuredSelection(settings.keyMapProfile));
 			profileTreeViewer.reveal(settings.keyMapProfile);
-			profileTreeViewer.setSelection(new StructuredSelection(settings.keyMapProfile));
 		}
 	}
 
@@ -169,9 +171,8 @@
 			if (profiles.size() == 1) {
 				IBupEventMapProfile profile = profiles.get(0);
 				rationaleText.setText(Messages.getString("NewPIWizardPageBupMapTask.6") + profile.getProfileId() + Messages.getString("NewPIWizardPageBupMapTask.7") + profile.getSDK().getUniqueId()+ Messages.getString("NewPIWizardPageBupMapTask.8")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				profileTreeViewer.collapseAll();
+				profileTreeViewer.setSelection(new StructuredSelection(profile));
 				profileTreeViewer.reveal(profile);
-				profileTreeViewer.setSelection(new StructuredSelection(profile));
 				return true;
 
 			} else {
@@ -203,9 +204,8 @@
 				if (profiles.size() == 1) {
 					IBupEventMapProfile profile = profiles.get(0);
 					rationaleText.setText(Messages.getString("NewPIWizardPageBupMapTask.11") + profile.getProfileId() + Messages.getString("NewPIWizardPageBupMapTask.12") + profile.getSDK().getUniqueId()+ Messages.getString("NewPIWizardPageBupMapTask.13")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					profileTreeViewer.collapseAll();
+					profileTreeViewer.setSelection(new StructuredSelection(profile));
 					profileTreeViewer.reveal(profile);
-					profileTreeViewer.setSelection(new StructuredSelection(profile));
 					return true;
 				} else {
 					rationaleText.setText(Messages.getString("NewPIWizardPageBupMapTask.14") + sdks.get(0).getUniqueId()+ Messages.getString("NewPIWizardPageBupMapTask.15")); //$NON-NLS-1$ //$NON-NLS-2$
@@ -219,10 +219,10 @@
 			}	
 		}
 		
-		profileTreeViewer.collapseAll();
-		profileTreeViewer.reveal(BupEventMapManager.getInstance().getPrefSelectedProfile());
-		profileTreeViewer.setSelection(new StructuredSelection(BupEventMapManager.getInstance().getPrefSelectedProfile()));
-
+		IBupEventMapProfile profile = BupEventMapManager.getInstance().getPrefSelectedProfile();
+		profileTreeViewer.setSelection(new StructuredSelection(profile));
+		profileTreeViewer.reveal(profile);
+		
 		return false;
 	}