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

[159965] fix for subset problem

Browse source
This commit is contained in:
David McKnight 2006-11-22 16:42:15 +00:00
parent 40587bb556
commit afa03fabe0
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java
View file

@ -584,7 +584,6 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
String[] filters = subsetDialog.getFilters(); String[] filters = subsetDialog.getFilters();
_currentItem.setFilters(filters); _currentItem.setFilters(filters);
_viewer.setViewFilters(filters); _viewer.setViewFilters(filters);
} }
} }
} }
@ -618,16 +617,16 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
class RestoreStateRunnable extends UIJob class RestoreStateRunnable extends UIJob
{ {
private IMemento _memento; private IMemento _rmemento;
public RestoreStateRunnable(IMemento memento) public RestoreStateRunnable(IMemento memento)
{ {
super("Restore RSE Table"); super("Restore RSE Table");
_memento = memento; _rmemento = memento;
} }
public IStatus runInUIThread(IProgressMonitor monitor) public IStatus runInUIThread(IProgressMonitor monitor)
{ {
IMemento memento = _memento; IMemento memento = _rmemento;
String profileId = memento.getString(TAG_TABLE_VIEW_PROFILE_ID); String profileId = memento.getString(TAG_TABLE_VIEW_PROFILE_ID);
String connectionId = memento.getString(TAG_TABLE_VIEW_CONNECTION_ID); String connectionId = memento.getString(TAG_TABLE_VIEW_CONNECTION_ID);
String subsystemId = memento.getString(TAG_TABLE_VIEW_SUBSYSTEM_ID); String subsystemId = memento.getString(TAG_TABLE_VIEW_SUBSYSTEM_ID);
@ -936,8 +935,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
{ {
Composite main = SystemWidgetHelpers.createComposite(parent, 1); Composite main = SystemWidgetHelpers.createComposite(parent, 1);
Label label = SystemWidgetHelpers.createLabel(main, SystemResources.RESID_TABLE_SELECT_COLUMNS_DESCRIPTION_LABEL);
Composite c = SystemWidgetHelpers.createComposite(main, 4); Composite c = SystemWidgetHelpers.createComposite(main, 4);
c.setLayoutData(new GridData(GridData.FILL_BOTH)); c.setLayoutData(new GridData(GridData.FILL_BOTH));
_availableList = SystemWidgetHelpers.createListBox(c, SystemResources.RESID_TABLE_SELECT_COLUMNS_AVAILABLE_LABEL, this, true); _availableList = SystemWidgetHelpers.createListBox(c, SystemResources.RESID_TABLE_SELECT_COLUMNS_AVAILABLE_LABEL, this, true);
@ -1396,7 +1394,23 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
public void setInput(IAdaptable object) public void setInput(IAdaptable object)
{ {
setInput(object, null, _isLocked); String[] filters = null;
if (_currentItem != null)
{
IAdaptable item = _currentItem.getObject();
ISystemViewElementAdapter adapter1 = (ISystemViewElementAdapter)object.getAdapter(ISystemViewElementAdapter.class);
ISystemViewElementAdapter adapter2 = (ISystemViewElementAdapter)item.getAdapter(ISystemViewElementAdapter.class);
if (adapter1 == adapter2)
{
filters = _currentItem.getFilters();
}
else
{
_viewer.setViewFilters(null);
}
}
setInput(object, filters, _isLocked);
if (!_isLocked) if (!_isLocked)
{ {
@ -1407,7 +1421,9 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
public void setInput(HistoryItem historyItem) public void setInput(HistoryItem historyItem)
{ {
setInput(historyItem.getObject(), historyItem.getFilters(), false); setInput(historyItem.getObject(), historyItem.getFilters(), false);
_currentItem = historyItem; _currentItem = historyItem;
} }
public void setInput(IAdaptable object, String[] filters, boolean updateHistory) public void setInput(IAdaptable object, String[] filters, boolean updateHistory)
@ -1434,6 +1450,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
} }
_currentItem = new HistoryItem(object, filters); _currentItem = new HistoryItem(object, filters);
_browseHistory.add(_currentItem); _browseHistory.add(_currentItem);
_browsePosition = _browseHistory.lastIndexOf(_currentItem); _browsePosition = _browseHistory.lastIndexOf(_currentItem);
@ -1547,7 +1564,6 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
public void systemRemoteResourceChanged(ISystemRemoteChangeEvent event) public void systemRemoteResourceChanged(ISystemRemoteChangeEvent event)
{ {
int eventType = event.getEventType(); int eventType = event.getEventType();
Object remoteResourceParent = event.getResourceParent();
Object remoteResource = event.getResource(); Object remoteResource = event.getResource();
Vector remoteResourceNames = null; Vector remoteResourceNames = null;