Bug 546141: Incompatible Entry notification is broken

Show incompatible entry notification also when dropping on the wizard
dialog itself.



Change-Id: I66f137aca2ba9e845f7c72ae445bb761533ec922
Signed-off-by: Leif Geiger <geiger@yatta.de>

org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplaceWizard.java

@@ -986,24 +986,29 @@ protected boolean handleInstallRequest(final SolutionInstallationInfo installInf
 				throw new IllegalStateException();
 			}
 
+			SelectionModelStateSerializer stateSerializer = new SelectionModelStateSerializer(getCatalog(),
+					selectionModel);
 			getContainer().run(true, true, monitor -> {
-				SelectionModelStateSerializer stateSerializer = new SelectionModelStateSerializer(getCatalog(),
-						selectionModel);
 				stateSerializer.deserialize(installInfo.getState(), nodeIdToOperation, monitor);
 			});
 
-			if (selectionModel.getItemToSelectedOperation().size() > 0) {
+			boolean hasAvailableItems = selectionModel.getItemToSelectedOperation().size() > 0;
+			boolean hasUnavailableItems = stateSerializer.hasUnavailableItems();
+			if (hasAvailableItems || hasUnavailableItems) {
 				Display display = getShell().getDisplay();
 				if (!display.isDisposed()) {
 					display.asyncExec(() -> {
+						if (getShell().isDisposed()) {
+							return;
+						}
+
 						MarketplacePage catalogPage1 = getCatalogPage();
 						IWizardPage currentPage = getContainer().getCurrentPage();
-						if (catalogPage1 == currentPage) {
-							catalogPage1.getViewer()
-							.setSelection(new StructuredSelection(
-									selectionModel.getSelectedCatalogItems().toArray()));
+
+						updateSelection(stateSerializer);
+						if (catalogPage1 == currentPage && hasAvailableItems) {
 							catalogPage1.show(installInfo.getCatalogDescriptor(), ContentType.SELECTION);
-							IWizardPage nextPage = catalogPage1.getNextPage();
+							IWizardPage nextPage = getNextPage(catalogPage1);
 							if (nextPage != null && catalogPage1.isPageComplete()) {
 								getContainer().showPage(nextPage);
 							}