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

[283793] [dstore] Expansion indicator(+) does not reset after no connect

Browse source
This commit is contained in:
David McKnight 2009-08-24 15:01:15 +00:00
parent a74fdbac49
commit 8e42638601
1 changed files with 47 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
View file

@ -71,6 +71,7 @@
* David McKnight (IBM) - [190001] [refresh] Avoid unnecessary duplicate queries during drag&drop to filter * David McKnight (IBM) - [190001] [refresh] Avoid unnecessary duplicate queries during drag&drop to filter
* Martin Oberhuber (Wind River) - [276195] Avoid unnecessary selectionChanged when restoring connections * Martin Oberhuber (Wind River) - [276195] Avoid unnecessary selectionChanged when restoring connections
* David McKnight (IBM) - [277328] Unhandled Event Loop Exception When Right-Clicking on "Pending..." Message * David McKnight (IBM) - [277328] Unhandled Event Loop Exception When Right-Clicking on "Pending..." Message
* David McKnight (IBM) - [283793] [dstore] Expansion indicator(+) does not reset after no connect
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -6287,8 +6288,8 @@ public class SystemView extends SafeTreeViewer
public void add(Object parentElementOrTreePath, Object[] childElements) { public void add(Object parentElementOrTreePath, Object[] childElements) {
assertElementsNotNull(childElements); assertElementsNotNull(childElements);
IContextObject contextObject = null; IContextObject contextObject = null;
ISystemFilterReference originalFilter = null; ISystemFilterReference originalFilter = null;
if (parentElementOrTreePath instanceof IContextObject) if (parentElementOrTreePath instanceof IContextObject)
@ -6299,6 +6300,7 @@ public class SystemView extends SafeTreeViewer
} }
List matches = new Vector(); List matches = new Vector();
findAllRemoteItemReferences(parentElementOrTreePath, parentElementOrTreePath, matches); findAllRemoteItemReferences(parentElementOrTreePath, parentElementOrTreePath, matches);
@ -6309,34 +6311,58 @@ public class SystemView extends SafeTreeViewer
ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)((IAdaptable)parentElementOrTreePath).getAdapter(ISystemViewElementAdapter.class); ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)((IAdaptable)parentElementOrTreePath).getAdapter(ISystemViewElementAdapter.class);
if (adapter != null) if (adapter != null)
{ {
IHost parentHost = adapter.getSubSystem(parentElementOrTreePath).getHost(); ISubSystem subSystem = adapter.getSubSystem(parentElementOrTreePath);
boolean unexpandContainer = false;
// if the subsystem is not connected, then need to keep the widget expandable
if (childElements.length == 0 && !subSystem.isConnected()){
unexpandContainer = true;
}
IHost parentHost = subSystem.getHost();
for (int i = 0; i < matches.size(); i++) for (int i = 0; i < matches.size(); i++)
{ {
Widget match = (Widget) matches.get(i); Widget match = (Widget) matches.get(i);
Object data = null;
try {
data = match.getData();
}
catch (SWTException e){
// not sure why this occurs -logging it for now
// this is reported in bug 251625
SystemBasePlugin.logError("Exception in SystemView.add() with " + match); //$NON-NLS-1$
SystemBasePlugin.logError(e.getMessage());
}
if (data instanceof IAdaptable) // for bug 283793
{ if (match instanceof TreeItem && unexpandContainer){
ISystemViewElementAdapter madapter = (ISystemViewElementAdapter)((IAdaptable)data).getAdapter(ISystemViewElementAdapter.class); TreeItem titem = ((TreeItem)match);
if (madapter != null) if (titem.getExpanded()){
setExpanded(titem, false);
}
}
else {
Object data = null;
try {
data = match.getData();
}
catch (SWTException e){
// not sure why this occurs -logging it for now
// this is reported in bug 251625
SystemBasePlugin.logError("Exception in SystemView.add() with " + match); //$NON-NLS-1$
SystemBasePlugin.logError(e.getMessage());
}
if (data instanceof IAdaptable)
{ {
IHost mHost = madapter.getSubSystem(data).getHost(); ISystemViewElementAdapter madapter = (ISystemViewElementAdapter)((IAdaptable)data).getAdapter(ISystemViewElementAdapter.class);
if (mHost != parentHost) if (madapter != null)
{ {
invalidMatches.add(match); IHost mHost = madapter.getSubSystem(data).getHost();
if (mHost != parentHost)
{
invalidMatches.add(match);
}
} }
} }
} }
} }
if (unexpandContainer){
// brings back the + icon
refresh(parentElementOrTreePath);
return;
}
} }
if (invalidMatches.size() > 0) if (invalidMatches.size() > 0)