Exclude closed projects from list of candidates for conversion

7 files changed, 29 insertions, 29 deletions

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java
index 600324c11d6..abee866a1e6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java
@@ -145,7 +145,13 @@ public abstract class ConversionWizard
 
     /**
      * Method addPages allows subclasses to add as many pages as they need. Overwrite
-     * to create a conversion specific page.
+     * to create at least one conversion specific page. <p>
+     * 
+     * i.e. <br>
+     *<pre> 
+     *   mainPage = new ConvertSimpleToCStdMakeProjectWizardPage(getPrefix());
+     *   addPage(mainPage);
+     *</pre>
      * 
      * @see Wizard#createPages
      */
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertCtoCCStdMakeProjectWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertCtoCCStdMakeProjectWizardPage.java
index 8ddd744ecbf..0c372f0ce6c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertCtoCCStdMakeProjectWizardPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertCtoCCStdMakeProjectWizardPage.java
@@ -66,14 +66,12 @@ public class ConvertCtoCCStdMakeProjectWizardPage extends ConvertProjectWizardPa
      * @return boolean
      */
     protected boolean isCandidate(IProject project) {
-        if (project.isOpen()) {
-            try {
-                if (project.hasNature(CoreModel.C_NATURE_ID) 
-                        && !project.hasNature(CoreModel.CC_NATURE_ID))
-                    return true;
-            } catch (CoreException e) {
-               CPlugin.log(e);
-            }
+        try {
+            if (project.hasNature(CoreModel.C_NATURE_ID) 
+                    && !project.hasNature(CoreModel.CC_NATURE_ID))
+                return true;
+        } catch (CoreException e) {
+           CPlugin.log(e);
         }
         return false;
     }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java
index 1192cc8f803..a08a0010c4d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java
@@ -51,8 +51,10 @@ import org.eclipse.ui.PlatformUI;
  * conversion through the method convertProjects([]Object), which is also
  * defined by all subclasses.<br> Subclasses provide the methods that
  * determine what files are displayed and what action is performed on them as
- * well as the labels for the Wizard.
- * </p>
+ * well as the labels for the Wizard.</p>
+ * 
+ * Note: Only Projects that are open will be considered for conversion.
+ * 
  * 
  * @author Judy N. Green
  * @since Aug 6, 2002 <p>
@@ -330,7 +332,9 @@ public abstract class ConvertProjectWizardPage
 
     /**
      * Returns a list of open projects that are determined to be candidates
-     * through the method isCandidate().
+     * through the method isCandidate().<br>
+     * 
+     * Note: Only Projects that are open will be considered for conversion.
      * 
      * @return Object[] which may be null
      */
@@ -341,11 +345,13 @@ public abstract class ConvertProjectWizardPage
         Vector     candidates = new Vector(projects.length);
         IProject   next = null;
 
-        // ensure we only present valid candidates to the user
+        // ensure we only present open, valid candidates to the user
         for (int i = 0; i < projects.length; i++) {
             next = (IProject)projects[i];
 
-            if ((next != null) && isCandidate(next)) {
+            if ((next != null) 
+                    && next.isOpen() 
+                        && isCandidate(next)) {
                 candidates.addElement(next);
             }
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertSimpleToCCStdMakeProjectWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertSimpleToCCStdMakeProjectWizardPage.java
index 64cf97b7281..414f0de2ee0 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertSimpleToCCStdMakeProjectWizardPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertSimpleToCCStdMakeProjectWizardPage.java
@@ -68,18 +68,13 @@ public class ConvertSimpleToCCStdMakeProjectWizardPage extends ConvertSimpleToCS
     protected boolean isCandidate(IProject project) {
         boolean noCNature = super.isCandidate(project);
         boolean noCCNature = false;
-        
-        // hasNature() throws a CoreException if the 
-        // project is not open and/or is not visible to this view
-        // which is what happens when a project does not have a 
-        // C nature
-       
+
        try {
             noCCNature = !project.hasNature(CoreModel.CC_NATURE_ID);
        } catch (CoreException e) {
            noCCNature = true;
         }
-        return (noCNature && noCCNature);
+        return noCNature && noCCNature;
     }
 
     /**
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertSimpleToCStdMakeProjectWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertSimpleToCStdMakeProjectWizardPage.java
index 21765938f7f..1c48f8c4220 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertSimpleToCStdMakeProjectWizardPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertSimpleToCStdMakeProjectWizardPage.java
@@ -67,17 +67,12 @@ public class ConvertSimpleToCStdMakeProjectWizardPage extends ConvertProjectWiza
      */
     protected boolean isCandidate(IProject project) {       
         boolean noCNature = false;
-       
-        // hasNature() throws a CoreException if the 
-        // project is not open and/or is not visible to this view
-        // which is what happens when a project does not have a 
-        // C nature
         try {
             noCNature =  !project.hasNature(CoreModel.C_NATURE_ID);
        } catch (CoreException e) {
            noCNature = true;
        }
-        return (noCNature);
+        return noCNature;
     }
    
     /**
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/SimpleToCCStdMakeConversionWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/SimpleToCCStdMakeConversionWizard.java
index b887c3f3d2b..b5569e4a04f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/SimpleToCCStdMakeConversionWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/SimpleToCCStdMakeConversionWizard.java
@@ -76,7 +76,7 @@ public class SimpleToCCStdMakeConversionWizard extends ConversionWizard {
     }
     
     /**
-     * Method addPages adds our C++ conversion Wizard page.
+     * Method addPages adds our Simple to C++ conversion Wizard page.
      * 
      * @see Wizard#createPages
      */ 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/SimpleToCStdMakeConversionWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/SimpleToCStdMakeConversionWizard.java
index 4d7d72b8fe4..d8f45e9cbda 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/SimpleToCStdMakeConversionWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/SimpleToCStdMakeConversionWizard.java
@@ -76,7 +76,7 @@ public class SimpleToCStdMakeConversionWizard extends ConversionWizard {
     }
     
     /**
-     * Method addPages adds our C to C++ conversion Wizard page.
+     * Method addPages adds our Simple to C conversion Wizard page.
      * 
      * @see Wizard#createPages
      */