From f2f00ced61ced88a36a66aea2b3593621aee8b94 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Wed, 25 May 2011 15:56:24 +0200 Subject: [PATCH] IDEA-69943 (CVS checkout caused an exception) --- .../cvsSupport2/ui/experts/checkout/CheckoutWizard.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/CheckoutWizard.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/CheckoutWizard.java index d1d71f96aa45..d13c9e7da1ab 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/CheckoutWizard.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/CheckoutWizard.java @@ -24,6 +24,7 @@ import com.intellij.cvsSupport2.ui.experts.SelectCVSConfigurationStep; import com.intellij.cvsSupport2.ui.experts.SelectCvsElementStep; import com.intellij.cvsSupport2.ui.experts.SelectLocationStep; import com.intellij.openapi.project.Project; +import org.netbeans.lib.cvsclient.command.KeywordSubstitution; import javax.swing.tree.TreeSelectionModel; import java.io.File; @@ -62,7 +63,12 @@ public class CheckoutWizard extends CvsWizard { config.MAKE_CHECKED_OUT_FILES_READONLY = myChooseModeStep.getMakeNewFilesReadOnly(); config.CHECKOUT_PRUNE_EMPTY_DIRECTORIES = myChooseModeStep.getPruneEmptyDirectories(); - config.CHECKOUT_KEYWORD_SUBSTITUTION = myChooseModeStep.getKeywordSubstitution().toString(); + final KeywordSubstitution keywordSubstitution = myChooseModeStep.getKeywordSubstitution(); + if (keywordSubstitution == null) { + config.CHECKOUT_KEYWORD_SUBSTITUTION = null; + } else { + config.CHECKOUT_KEYWORD_SUBSTITUTION = keywordSubstitution.toString(); + } super.doOKAction(); }