Author: vyemialyanchyk
Date: 2010-05-05 12:25:16 -0400 (Wed, 05 May 2010)
New Revision: 21913
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/CloseConfigAction.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/viewers/xpl/MTreeViewer.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5909 - fix
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/CloseConfigAction.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/CloseConfigAction.java 2010-05-05
16:17:45 UTC (rev 21912)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/CloseConfigAction.java 2010-05-05
16:25:16 UTC (rev 21913)
@@ -49,7 +49,7 @@
continue;
}
ConsoleConfiguration config = (ConsoleConfiguration) node;
- ((MTreeViewer)viewer).clearChildren(null);
+ ((MTreeViewer)viewer).clearChildren(config);
config.reset();
viewer.refresh(node);
}
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/viewers/xpl/MTreeViewer.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/viewers/xpl/MTreeViewer.java 2010-05-05
16:17:45 UTC (rev 21912)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/viewers/xpl/MTreeViewer.java 2010-05-05
16:25:16 UTC (rev 21913)
@@ -48,7 +48,18 @@
}
public void clearChildren(Object node) {
- Widget[] items = getChildren(node == null ? getTree() : (Widget)node);
+ Widget widget = null;
+ if (node instanceof Widget) {
+ widget = (Widget)node;
+ } else if (node == null) {
+ widget = getTree();
+ }
+ Widget[] items = null;
+ if (widget == null && node != null) {
+ items = internalFindItems(node);
+ } else {
+ items = getChildren(widget);
+ }
for (int j = 0; j < items.length; j++) {
clearChildren(items[j]);
if (items[j] instanceof TreeItem) {