mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug #190042 : Configuration icons disabled when Includes folder selected

Browse source
This commit is contained in:
Oleg Krasilnikov 2007-05-31 12:56:17 +00:00
parent 11b35857bf
commit 9964787e29
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigActionBase.java
View file

@ -29,6 +29,9 @@ import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescription;
import org.eclipse.cdt.internal.ui.cview.IncludeRefContainer;
import org.eclipse.cdt.internal.ui.cview.IncludeReferenceProxy;
/** /**
* Base class for build configuration actions. * Base class for build configuration actions.
*/ */
@ -161,6 +164,17 @@ public class ChangeBuildConfigActionBase {
} }
else if (selItem instanceof IResource) { else if (selItem instanceof IResource) {
project = ((IResource)selItem).getProject(); project = ((IResource)selItem).getProject();
} else if (selItem instanceof IncludeRefContainer) {
ICProject fCProject = ((IncludeRefContainer)selItem).getCProject();
if (fCProject != null)
project = fCProject.getProject();
} else if (selItem instanceof IncludeReferenceProxy) {
IncludeRefContainer irc = ((IncludeReferenceProxy)selItem).getIncludeRefContainer();
if (irc != null) {
ICProject fCProject = irc.getCProject();
if (fCProject != null)
project = fCProject.getProject();
}
} }
// Check whether the project is CDT project // Check whether the project is CDT project
if (project != null) { if (project != null) {

18
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigSelector.java
View file

@ -23,6 +23,10 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.internal.ui.cview.IncludeRefContainer;
import org.eclipse.cdt.internal.ui.cview.IncludeReferenceProxy;
/** /**
* This class provides static methods to work with multiple * This class provides static methods to work with multiple
@ -79,7 +83,19 @@ public class ManageConfigSelector {
prj = ((ICElement)obs[i]).getCProject().getProject(); prj = ((ICElement)obs[i]).getCProject().getProject();
} else if (obs[i] instanceof IResource) { // for other views } else if (obs[i] instanceof IResource) { // for other views
prj = ((IResource)obs[i]).getProject(); prj = ((IResource)obs[i]).getProject();
} /* get project from Include folder elements */
} else if (obs[i] instanceof IncludeRefContainer) {
ICProject fCProject = ((IncludeRefContainer)obs[i]).getCProject();
if (fCProject != null)
prj = fCProject.getProject();
} else if (obs[i] instanceof IncludeReferenceProxy) {
IncludeRefContainer irc = ((IncludeReferenceProxy)obs[i]).getIncludeRefContainer();
if (irc != null) {
ICProject fCProject = irc.getCProject();
if (fCProject != null)
prj = fCProject.getProject();
}
}
if (prj == null || lst.contains(prj) || if (prj == null || lst.contains(prj) ||
!CoreModel.getDefault().isNewStyleProject(prj)) !CoreModel.getDefault().isNewStyleProject(prj))