mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-01 06:05:24 +02:00
Code Issues Wiki Activity

support container

Browse source
This commit is contained in:
David Inglis 2004-04-29 21:04:25 +00:00
parent dc66afff94
commit 36934f4bc9
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/org.eclipse.cdt.ui/schema/PathContainerPage.exsd
View file

@ -65,6 +65,16 @@
</documentation> </documentation>
</annotation> </annotation>
</attribute> </attribute>
<attribute name="icon" type="string">
<annotation>
<documentation>
</documentation>
<appInfo>
<meta.attribute kind="resource"/>
</appInfo>
</annotation>
</attribute>
</complexType> </complexType>
</element> </element>

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerWizard.java
View file

@ -112,7 +112,7 @@ public class CPathContainerWizard extends Wizard {
allContainers.add(0, new ProjectContainerDescriptor(fFilterType)); allContainers.add(0, new ProjectContainerDescriptor(fFilterType));
} }
fSelectionWizardPage = new CPathContainerSelectionPage( fSelectionWizardPage = new CPathContainerSelectionPage(
(IContainerDescriptor[]) allContainers.toArray(new IContainerDescriptor[0])); (IContainerDescriptor[])allContainers.toArray(new IContainerDescriptor[0]));
addPage(fSelectionWizardPage); addPage(fSelectionWizardPage);
// add as dummy, will not be shown // add as dummy, will not be shown
@ -162,7 +162,8 @@ public class CPathContainerWizard extends Wizard {
fContainerPage = getContainerPage(selected); fContainerPage = getContainerPage(selected);
return fContainerPage; return fContainerPage;
} else if (page == fContainerPage) { } else if (page == fContainerPage) {
if ( fContainerPage.getContainerEntries().length > 0 && fContainerPage.getContainerEntries()[0] != null) { if (fContainerPage.finish() && fContainerPage.getContainerEntries().length > 0
&& fContainerPage.getContainerEntries()[0] != null) {
fFilterPage.setParentEntry(fContainerPage.getContainerEntries()[0]); fFilterPage.setParentEntry(fContainerPage.getContainerEntries()[0]);
} }
return fFilterPage; return fFilterPage;

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java
View file

@ -100,7 +100,9 @@ public class CPathFilterPage extends WizardPage {
} else if (fParentEntry.getEntryKind() == IPathEntry.CDT_CONTAINER) { } else if (fParentEntry.getEntryKind() == IPathEntry.CDT_CONTAINER) {
try { try {
IPathEntryContainer container = CoreModel.getPathEntryContainer(fParentEntry.getPath(), fCElement.getCProject()); IPathEntryContainer container = CoreModel.getPathEntryContainer(fParentEntry.getPath(), fCElement.getCProject());
fPaths = Arrays.asList(container.getPathEntries()); if (container != null) {
fPaths = Arrays.asList(container.getPathEntries());
}
} catch (CModelException e) { } catch (CModelException e) {
} }
} }