From 41522141d992c75c2e5af46729e1b6fac01777b6 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Thu, 14 Mar 2013 22:50:57 -0700 Subject: [PATCH] Bug 403409. Organize Includes throws IllegalStateException --- .../refactoring/includes/IncludeOrganizer.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java index 2bb0f80ef5c..6825718609a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java @@ -965,13 +965,15 @@ public class IncludeOrganizer { break; } } - IPath header = fHeaderChooser.chooseHeader(request.getBinding().getName(), candidatePaths); - if (header == null) - throw new OperationCanceledException(); - - request.resolve(header); - if (!fContext.isAlreadyIncluded(header)) - fContext.addHeaderToInclude(header); + if (!request.isResolved()) { + IPath header = fHeaderChooser.chooseHeader(request.getBinding().getName(), candidatePaths); + if (header == null) + throw new OperationCanceledException(); + + request.resolve(header); + if (!fContext.isAlreadyIncluded(header)) + fContext.addHeaderToInclude(header); + } } } }