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

Fix for 205013: Project Explorer: filtering non-C project also filters out the C projects

Browse source
This commit is contained in:
Anton Leherbauer 2007-10-11 10:03:19 +00:00
parent 35a31af9c6
commit 3930fa6ccf
3 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.ui/plugin.properties
View file

@ -242,7 +242,7 @@ HideArchiveFiles.description= Hides Archive files
HideObjectFiles.label= Object files HideObjectFiles.label= Object files
HideObjectFiles.description= Hides Object files HideObjectFiles.description= Hides Object files
HideNonCElements.label= Non-C resource HideNonCElements.label= Non-C elements
HideNonCElements.description= Show only C elements HideNonCElements.description= Show only C elements
HideNonCProjects.label = Non-C projects HideNonCProjects.label = Non-C projects

16
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCElementFilter.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2006 IBM Corporation and others. * Copyright (c) 2000, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -7,9 +7,11 @@
* *
* Contributors: * Contributors:
* IBM Corporation - initial API and implementation * IBM Corporation - initial API and implementation
* Anton Leherbauer (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.filters; package org.eclipse.cdt.internal.ui.filters;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
@ -21,7 +23,7 @@ import org.eclipse.jface.viewers.ViewerFilter;
/** /**
* Filters out all non-Java elements. * Filters out all non-C elements.
*/ */
public class NonCElementFilter extends ViewerFilter { public class NonCElementFilter extends ViewerFilter {
@ -35,12 +37,18 @@ public class NonCElementFilter extends ViewerFilter {
if (element instanceof ICElement) if (element instanceof ICElement)
return true; return true;
if (element instanceof IResource) { if (element instanceof IProject) {
IProject project = (IProject)element;
if (!project.isOpen() || CoreModel.hasCNature(project)) {
return true;
}
return false;
} else if (element instanceof IResource) {
IProject project= ((IResource)element).getProject(); IProject project= ((IResource)element).getProject();
return project == null || !project.isOpen(); return project == null || !project.isOpen();
} }
// Exclude all IStorage elements which are neither Java elements nor resources // Exclude all IStorage elements which are neither C elements nor resources
if (element instanceof IStorage) if (element instanceof IStorage)
return false; return false;

18
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCProjectsFilter.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2006 IBM Corporation and others. * Copyright (c) 2000, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -7,18 +7,21 @@
* *
* Contributors: * Contributors:
* IBM Corporation - initial API and implementation * IBM Corporation - initial API and implementation
* Anton Leherbauer (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.filters; package org.eclipse.cdt.internal.ui.filters;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICProject;
/** /**
* Filters closed projects * Filters (open) non-C projects.
*/ */
public class NonCProjectsFilter extends ViewerFilter { public class NonCProjectsFilter extends ViewerFilter {
@ -29,7 +32,14 @@ public class NonCProjectsFilter extends ViewerFilter {
if (element instanceof ICProject) { if (element instanceof ICProject) {
return true; return true;
} else if (element instanceof IProject) { } else if (element instanceof IProject) {
return !((IProject)element).isOpen(); IProject project = (IProject)element;
if (!project.isOpen()) {
return true;
}
if (CoreModel.hasCNature(project)) {
return true;
}
return false;
} }
return true; return true;
} }