mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-25 01:03:48 +02:00
Code Issues Wiki Activity

Bug 403409. Organize Includes throws IllegalStateException

Browse source
This commit is contained in:
Sergey Prigogin 2013-03-14 22:50:57 -07:00
parent 48c9cc0b73
commit 41522141d9
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java
View file

@ -965,13 +965,15 @@ public class IncludeOrganizer {
break; break;
} }
} }
IPath header = fHeaderChooser.chooseHeader(request.getBinding().getName(), candidatePaths); if (!request.isResolved()) {
if (header == null) IPath header = fHeaderChooser.chooseHeader(request.getBinding().getName(), candidatePaths);
throw new OperationCanceledException(); if (header == null)
throw new OperationCanceledException();
request.resolve(header);
if (!fContext.isAlreadyIncluded(header)) request.resolve(header);
fContext.addHeaderToInclude(header); if (!fContext.isAlreadyIncluded(header))
fContext.addHeaderToInclude(header);
}
} }
} }
} }