# HG changeset patch # User timkelly # Date 1277488686 18000 # Node ID 69d5b194482bab136ea7c8b76ec48063ce7b29b0 # Parent e94e8b7c075ca4ea4a5a2850e984609d694d763b fix bug 11556 diff -r e94e8b7c075c -r 69d5b194482b core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java Thu Jun 24 16:24:14 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java Fri Jun 25 12:58:06 2010 -0500 @@ -22,6 +22,8 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.ui.PlatformUI; import com.nokia.carbide.cpp.internal.api.sdk.BuildContextSBSv2; import com.nokia.carbide.cpp.internal.api.sdk.ISBSv2BuildInfo; @@ -33,6 +35,7 @@ import com.nokia.carbide.cpp.sdk.core.ISymbianSDK; import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin; import com.nokia.cpp.internal.api.utils.core.Logging; +import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils; /** * SBSv2 specific build information. @@ -48,6 +51,7 @@ private Map aliasToMeaningMap = new HashMap(); private List productList = null; private IPath cachedVariantHRHFile = null; + private static boolean hasShownDialog; public SBSv2BuildInfo(ISymbianSDK sdk) { this.sdk = sdk; @@ -71,10 +75,21 @@ if (aliasToMeaningMap.size() == 0){ try { aliasToMeaningMap = SBSv2QueryUtils.getAliasesForSDK(sdk); - } catch (SBSv2MinimumVersionException e) { + } catch (final SBSv2MinimumVersionException e) { + if (hasShownDialog == false){ + + PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { + public void run() { + MessageDialog.openError(WorkbenchUtils.getSafeShell(), "Minimum sbs version not met.", e.getMessage()); + } + }); + Logging.log( SDKCorePlugin.getDefault(), Logging.newSimpleStatus(0, IStatus.ERROR, MessageFormat.format(e.getMessage(), ""), e)); + + hasShownDialog = true; + } } } diff -r e94e8b7c075c -r 69d5b194482b core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/BuildPlatformFilterPage.java --- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/BuildPlatformFilterPage.java Thu Jun 24 16:24:14 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/BuildPlatformFilterPage.java Fri Jun 25 12:58:06 2010 -0500 @@ -53,15 +53,13 @@ GridData tabFolderGridData = new GridData(SWT.FILL, SWT.FILL, true, true); tabFolder.setLayoutData(tabFolderGridData); - if (SBSv2Utils.enableSBSv2Support()) { - TabItem sbsv2TabItem = new TabItem(tabFolder, SWT.NONE); - sbsv2TabItem.setText(Messages.getString("BuildPlatformFilterPage.SBSv2TabText")); //$NON-NLS-1$ - sbsv2TabItem.setToolTipText(Messages.getString("BuildPlatformFilterPage.SBSv2TabToolTip")); //$NON-NLS-1$ + TabItem sbsv2TabItem = new TabItem(tabFolder, SWT.NONE); + sbsv2TabItem.setText(Messages.getString("BuildPlatformFilterPage.SBSv2TabText")); //$NON-NLS-1$ + sbsv2TabItem.setToolTipText(Messages.getString("BuildPlatformFilterPage.SBSv2TabToolTip")); //$NON-NLS-1$ - sbsv2Tab = new SBSv2PlatformFilterComposite(tabFolder); - sbsv2Tab.createControls(); - sbsv2TabItem.setControl(sbsv2Tab); - } + sbsv2Tab = new SBSv2PlatformFilterComposite(tabFolder); + sbsv2Tab.createControls(); + sbsv2TabItem.setControl(sbsv2Tab); if (SBSv2Utils.enableSBSv1Support()) { TabItem sbsv1TabItem = new TabItem(tabFolder, SWT.NONE);