# HG changeset patch # User Ed Swartz # Date 1264114559 21600 # Node ID 7395fd14bbe101dfa7eb0e6eb7e091f3613fbf3d # Parent 8c7fa6db96c0ac483159f339c2869272fb1ba903# Parent aedbee09433665fad650cb10dd940a279f67910b Merge commit diff -r aedbee094336 -r 7395fd14bbe1 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java Thu Jan 21 14:38:58 2010 -0600 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java Thu Jan 21 16:55:59 2010 -0600 @@ -94,6 +94,8 @@ SymbianBuildContextDataCache.startProjectOperation(); for (final ISymbianBuildContext context : buildConfigs) { + if (monitor.isCanceled()) + break; EpocEnginePlugin.runWithBldInfData(bldInfFilePath, new DefaultViewConfiguration(context, bldInfFilePath, new AcceptedNodesViewFilter()), new BldInfDataRunnableAdapter() { @@ -157,6 +159,8 @@ SymbianBuildContextDataCache.startProjectOperation(); for (final ISymbianBuildContext context : buildConfigs) { + if (monitor.isCanceled()) + break; EpocEnginePlugin.runWithBldInfData(bldInfFilePath, new DefaultViewConfiguration(context, bldInfFilePath, new AcceptedNodesViewFilter()), new BldInfDataRunnableAdapter() { @@ -213,6 +217,8 @@ SymbianBuildContextDataCache.startProjectOperation(); for (final ISymbianBuildContext context : buildConfigs) { + if (monitor.isCanceled()) + break; EpocEnginePlugin.runWithBldInfData(bldInfFilePath, new DefaultViewConfiguration(context, bldInfFilePath, new AcceptedNodesViewFilter()), new BldInfDataRunnableAdapter() { @@ -265,6 +271,8 @@ SymbianBuildContextDataCache.startProjectOperation(); for (final ISymbianBuildContext context : buildConfigs) { + if (monitor.isCanceled()) + break; EpocEnginePlugin.runWithBldInfData(bldInfFilePath, new DefaultViewConfiguration(context, bldInfFilePath, new AcceptedNodesViewFilter()), new BldInfDataRunnableAdapter() {