cdt/cdt_6_0_x/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
equal
deleted
inserted
replaced
533 if (objects.length > 0) { |
533 if (objects.length > 0) { |
534 objects = filterNonCResources(objects, container.getCProject()); |
534 objects = filterNonCResources(objects, container.getCProject()); |
535 } |
535 } |
536 } catch (CModelException e) { |
536 } catch (CModelException e) { |
537 } |
537 } |
538 if (objects == null || objects.length == 0) { |
538 |
539 return children; |
539 Object[] result = children; |
540 } |
540 if (missingElements.size() > 0) { |
541 Object[] result = concatenate(children, objects); |
541 result = concatenate(result, missingElements.toArray()); |
542 return concatenate(result, missingElements.toArray()); |
542 } |
|
543 |
|
544 if (objects != null && objects.length > 0) { |
|
545 result = concatenate(result, objects); |
|
546 } |
|
547 |
|
548 return result; |
543 } |
549 } |
544 |
550 |
545 private List<ICElement> getMissingElements(ICContainer container, ICElement[] elements) { |
551 private List<ICElement> getMissingElements(ICContainer container, ICElement[] elements) { |
546 // nested source roots may be filtered out below the project root, |
552 // nested source roots may be filtered out below the project root, |
547 // we need to find them to add them back in |
553 // we need to find them to add them back in |