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

Fix bug 158766: content assist works 1st time only

Browse source
This commit is contained in:
Martin Oberhuber 2006-10-28 23:02:07 +00:00
parent 202fd2e91d
commit f9da4c6a1a
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandEntryContentAssistProcessor.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2006 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,7 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - fix 158766: content assist works 1st time only
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.shells.ui.view; package org.eclipse.rse.shells.ui.view;
@ -542,27 +542,28 @@ public class CommandEntryContentAssistProcessor implements IContentAssistProcess
{ {
Object[] fileList = null; Object[] fileList = null;
String filterString = currentText + "*"; //$NON-NLS-1$
if (workingDirectory.hasContents(RemoteChildrenContentsType.getInstance()) && !workingDirectory.isStale()) if (workingDirectory.hasContents(RemoteChildrenContentsType.getInstance()) && !workingDirectory.isStale())
{ {
if (flag == FILES_ONLY) if (flag == FILES_ONLY)
{ {
fileList = workingDirectory.getContents(RemoteFileChildrenContentsType.getInstance()); fileList = workingDirectory.getContents(RemoteFileChildrenContentsType.getInstance(), filterString);
} }
else if (flag == FOLDERS_ONLY) else if (flag == FOLDERS_ONLY)
{ {
fileList = workingDirectory.getContents(RemoteFolderChildrenContentsType.getInstance()); fileList = workingDirectory.getContents(RemoteFolderChildrenContentsType.getInstance(), filterString);
} }
else else
{ {
fileList = workingDirectory.getContents(RemoteChildrenContentsType.getInstance()); fileList = workingDirectory.getContents(RemoteChildrenContentsType.getInstance(), filterString);
} }
} }
else if (fileList==null || fileList.length==0)
{ {
try try
{ {
fileList = workingDirectory.getParentRemoteFileSubSystem().listFoldersAndFiles(workingDirectory, currentText + "*", null); fileList = workingDirectory.getParentRemoteFileSubSystem().listFoldersAndFiles(workingDirectory, filterString, null);
} }
catch (SystemMessageException e) catch (SystemMessageException e)
{ {