mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 04:55:22 +02:00
Code Issues Wiki Activity

[210563] error messages need to be shown if incurred during filter expansion

Browse source
This commit is contained in:
David McKnight 2007-11-23 01:29:34 +00:00
parent 8f8e0ed7c3
commit 5e81be52d6
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java
View file

@ -23,6 +23,7 @@
* Kevin Doyle (IBM) - [187707] Added separator between New Folder and New File in context menu * Kevin Doyle (IBM) - [187707] Added separator between New Folder and New File in context menu
* David McKnight (IBM) - [199566] Remove synchronzied from internalGetChildren * David McKnight (IBM) - [199566] Remove synchronzied from internalGetChildren
* Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread * Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread
* David McKnight (IBM) - [210563] error messages need to be shown if incurred during filter expansion
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -269,7 +270,8 @@ public class SystemViewFilterReferenceAdapter
ISubSystemConfiguration configuration = subsystem.getSubSystemConfiguration(); ISubSystemConfiguration configuration = subsystem.getSubSystemConfiguration();
Object adapter = Platform.getAdapterManager().getAdapter(configuration, ISubSystemConfigurationAdapter.class); Object adapter = Platform.getAdapterManager().getAdapter(configuration, ISubSystemConfigurationAdapter.class);
if (adapter instanceof ISubSystemConfigurationAdapter) { if (adapter instanceof ISubSystemConfigurationAdapter)
{
children = ((ISubSystemConfigurationAdapter)adapter).applyViewFilters(element, children); children = ((ISubSystemConfigurationAdapter)adapter).applyViewFilters(element, children);
} }
@ -424,21 +426,27 @@ public class SystemViewFilterReferenceAdapter
} }
else else
{ {
if (allChildren.length == 1 && allChildren[0] instanceof ISystemMessageObject)
{
// error to display
return allChildren; // nothing to sort or cache - just show the error
}
if (nestedFilterReferences != null) if (nestedFilterReferences != null)
{ {
int nbrNestedFilters = nestedFilterReferences.length; int nbrNestedFilters = nestedFilterReferences.length;
children = new Object[nbrNestedFilters + allChildren.length]; children = new Object[nbrNestedFilters + allChildren.length];
int idx = 0; int idx = 0;
for (idx = 0; idx < nbrNestedFilters; idx++) for (idx = 0; idx < nbrNestedFilters; idx++)
children[idx] = nestedFilterReferences[idx]; children[idx] = nestedFilterReferences[idx];
for (int jdx = 0; jdx < allChildren.length; jdx++) for (int jdx = 0; jdx < allChildren.length; jdx++)
children[idx++] = allChildren[jdx]; children[idx++] = allChildren[jdx];
if (!referencedFilter.isTransient() && ssf.supportsFilterCaching()) if (!referencedFilter.isTransient() && ssf.supportsFilterCaching())
{ {
fRef.setContents(SystemChildrenContentsType.getInstance(), children); fRef.setContents(SystemChildrenContentsType.getInstance(), children);
} }
} }
} }
} }