View | Details | Raw Unified | Return to bug 195543
Collapse All | Expand All

(-)UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java (-4 / +12 lines)
Lines 14-19 Link Here
14
 * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
14
 * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
15
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
15
 * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
16
 * Kevin Doyle (IBM) - [182403] Double Click on an object that can be expanded
16
 * Kevin Doyle (IBM) - [182403] Double Click on an object that can be expanded
17
 * Kevin Doyle (IBM) - [195543] Double Clicking expands wrong folder when duplicate elements shown
17
 ********************************************************************************/
18
 ********************************************************************************/
18
19
19
package org.eclipse.rse.internal.ui.view.scratchpad;
20
package org.eclipse.rse.internal.ui.view.scratchpad;
Lines 28-34 Link Here
28
import org.eclipse.jface.viewers.ISelection;
29
import org.eclipse.jface.viewers.ISelection;
29
import org.eclipse.jface.viewers.ISelectionChangedListener;
30
import org.eclipse.jface.viewers.ISelectionChangedListener;
30
import org.eclipse.jface.viewers.IStructuredSelection;
31
import org.eclipse.jface.viewers.IStructuredSelection;
32
import org.eclipse.jface.viewers.ITreeSelection;
31
import org.eclipse.jface.viewers.SelectionChangedEvent;
33
import org.eclipse.jface.viewers.SelectionChangedEvent;
34
import org.eclipse.jface.viewers.TreePath;
32
import org.eclipse.jface.viewers.Viewer;
35
import org.eclipse.jface.viewers.Viewer;
33
import org.eclipse.rse.core.RSECorePlugin;
36
import org.eclipse.rse.core.RSECorePlugin;
34
import org.eclipse.rse.core.events.ISystemResourceChangeEvent;
37
import org.eclipse.rse.core.events.ISystemResourceChangeEvent;
Lines 176-182 Link Here
176
179
177
	private void handleDoubleClick(DoubleClickEvent event)
180
	private void handleDoubleClick(DoubleClickEvent event)
178
	{
181
	{
179
		IStructuredSelection s = (IStructuredSelection) event.getSelection();
182
		ITreeSelection s = (ITreeSelection) event.getSelection();
180
		Object element = s.getFirstElement();
183
		Object element = s.getFirstElement();
181
		
184
		
182
		if (element == null)
185
		if (element == null)
Lines 188-200 Link Here
188
		{
191
		{
189
			if (adapter.hasChildren((IAdaptable)element))
192
			if (adapter.hasChildren((IAdaptable)element))
190
			{
193
			{
191
				if (_viewer.getExpandedState(element))
194
				// Get the path for the element and use it for setting expanded state,
195
				// so the proper TreeItem is expanded/collapsed
196
				TreePath[] paths = s.getPathsFor(element);
197
				if (paths == null || paths.length == 0 || paths[0] == null) return;
198
				TreePath elementPath = paths[0];
199
				if (_viewer.getExpandedState(elementPath))
192
				{
200
				{
193
					_viewer.collapseToLevel(element, 1);
201
					_viewer.collapseToLevel(elementPath, 1);
194
				}
202
				}
195
				else
203
				else
196
				{
204
				{
197
					_viewer.expandToLevel(element, 1);
205
					_viewer.expandToLevel(elementPath, 1);
198
				}
206
				}
199
			}
207
			}
200
			else
208
			else

Return to bug 195543