From 53773e5adea660c0fc5b1aa9df402581bbf67a44 Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Fri, 30 Mar 2007 08:06:28 +0000 Subject: [PATCH] Fix for [Bug 180133] DBCS3.3: Convert C/C++ project wizard won't be launched --- .../dataprovider/DataProviderMessages.properties | 1 + .../internal/dataprovider/ProjectConverter.java | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.properties b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.properties index fddb4ff2be6..cbe5de6bdd3 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.properties +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.properties @@ -17,3 +17,4 @@ ProjectConverter.5=the specified project can not be converted ProjectConverter.6=the project conversion failed ProjectConverter.7=targets conversion ProjectConverter.8=the project conversion failed due to unknown reason +ProjectConverter.9=the given project is not a valid CDT project diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java index ee7bc6250ad..aa3b6e74692 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java @@ -390,6 +390,15 @@ public class ProjectConverter implements ICProjectConverter { // } ICProjectDescription des = CCorePlugin.getDefault().getProjectDescription(project, false); + + if(des == null){ + if(throwExceptions) + throw new CoreException(new Status(IStatus.ERROR, + ManagedBuilderCorePlugin.getUniqueIdentifier(), + DataProviderMessages.getString("ProjectConverter.9"))); //$NON-NLS-1$ + return false; + } + ICConfigurationDescription cfgs[] = des.getConfigurations(); if(cfgs.length != 1){ if(throwExceptions)