Author: rob.stryker(a)jboss.com Date: 2008-08-22 16:30:51 -0400 (Fri, 22 Aug 2008) New Revision: 9873 Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java Log: JBIDE-2665 - a few more tiny changes to make sure the selection listener was in top shape Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java 2008-08-22 20:14:53 UTC (rev 9872) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java 2008-08-22 20:30:51 UTC (rev 9873) @@ -27,6 +27,7 @@ import org.jboss.ide.eclipse.archives.core.model.IArchiveNode; import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages; import org.jboss.ide.eclipse.archives.ui.PrefsInitializer; +import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate.WrappedProject; public class ProjectArchivesCommonView extends CommonNavigator { protected static ProjectArchivesCommonView instance; @@ -70,10 +71,13 @@ IProject project = getProject(element); if( project != null && project != currentProject ) { currentProject = project; - if( showProjectRoot()) - getCommonViewer().setInput(ResourcesPlugin.getWorkspace().getRoot()); - else + if( showProjectRoot()) { + boolean showAll = PrefsInitializer.getBoolean(PrefsInitializer.PREF_SHOW_ALL_PROJECTS); + if( !showAll || !getCommonViewer().getInput().equals(ResourcesPlugin.getWorkspace().getRoot())) + getCommonViewer().setInput(ResourcesPlugin.getWorkspace().getRoot()); + } else { getCommonViewer().setInput(currentProject); + } } } @@ -87,6 +91,12 @@ if( resource != null ) return resource.getProject(); } + if( element instanceof WrappedProject ) + return ((WrappedProject)element).getElement(); + if( element instanceof IArchiveNode ) { + String projName = ((IArchiveNode)element).getProjectName(); + return ResourcesPlugin.getWorkspace().getRoot().getProject(projName); + } return null; }