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

no synch queries

Browse source
This commit is contained in:
David McKnight 2006-12-11 22:03:24 +00:00
parent 33c8fcb206
commit a9dd185879
1 changed files with 13 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
View file

@ -1987,6 +1987,8 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* <b>You do not need to override this, as it does the progress monitor and error message * <b>You do not need to override this, as it does the progress monitor and error message
* displaying for you. Just override internalResolveFilterString.</b> * displaying for you. Just override internalResolveFilterString.</b>
* <p> * <p>
* This method should be avoided in favour of one that runs in a job.
*
* @param filterString filter pattern for objects to return. * @param filterString filter pattern for objects to return.
* @return the results of resolving the filter string. * @return the results of resolving the filter string.
*/ */
@ -1997,35 +1999,9 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
if (!isConnected()) if (!isConnected())
ok = promptForPassword(); ok = promptForPassword();
if (ok) if (ok)
{
Display display = Display.getCurrent();
if (display != null)
{ {
return internalResolveFilterString(new NullProgressMonitor(), filterString); return internalResolveFilterString(new NullProgressMonitor(), filterString);
} }
else
{
try
{
//dwd this.shell = shell; //FIXME remove this
ResolveAbsoluteJob job = new ResolveAbsoluteJob(filterString);
IStatus status = scheduleJob(job, null, shell != null);
if (status.isOK())
{
if (sortResults && (job.getOutputs()!=null))
return sortResolvedFilterStringObjects(job.getOutputs());
else
return job.getOutputs();
}
}
catch (InterruptedException exc)
{
if (shell == null) throw exc;
else showOperationCancelledMessage(shell);
}
}
}
else else
System.out.println("in SubSystemImpl.resolveFilterString: isConnected() returning false!"); //$NON-NLS-1$ System.out.println("in SubSystemImpl.resolveFilterString: isConnected() returning false!"); //$NON-NLS-1$
return null; return null;
@ -2042,6 +2018,8 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* After successful resolve, the sort method is called to sort the concatenated results before * After successful resolve, the sort method is called to sort the concatenated results before
* returning them. * returning them.
* *
* This method should be avoided in favour of one that runs in a job.
*
* @param filterStrings array of filter patterns for objects to return. * @param filterStrings array of filter patterns for objects to return.
* @return Array of objects that are the result of resolving all the filter strings * @return Array of objects that are the result of resolving all the filter strings
*/ */
@ -2061,37 +2039,10 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
if (ok) if (ok)
{
Display display = Display.getCurrent();
if (display != null)
{ {
return internalResolveFilterStrings(new NullProgressMonitor(), filterStrings); return internalResolveFilterStrings(new NullProgressMonitor(), filterStrings);
} }
else
{
try
{
//dwd this.shell = shell; //FIXME remove this
ResolveAbsolutesJob job = new ResolveAbsolutesJob(filterStrings[0], filterStrings);
IStatus status = scheduleJob(job, null, true);
if (status.isOK())
{
if (sortResults && (job.getOutputs()!=null))
return sortResolvedFilterStringObjects(job.getOutputs());
else
return job.getOutputs();
}
}
catch (InterruptedException exc)
{
if (shell == null) throw exc;
else showOperationCancelledMessage(shell);
}
}
}
else
System.out.println("in SubSystemImpl.resolveFilterString: isConnected() returning false!"); //$NON-NLS-1$
return null; return null;
} }
@ -2306,6 +2257,9 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* <b>You do not need to override this, as it does the progress monitor and error message * <b>You do not need to override this, as it does the progress monitor and error message
* displaying for you. Override internalResolveFilterString instead. </b> * displaying for you. Override internalResolveFilterString instead. </b>
* <p> * <p>
*
* This method should be avoided in favour of one that runs in a job.
*
* @param parent Object that is being expanded. * @param parent Object that is being expanded.
* @param filterString filter pattern for children of parent. Typically just "*". * @param filterString filter pattern for children of parent. Typically just "*".
*/ */
@ -2316,37 +2270,13 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
if (!isConnected()) if (!isConnected())
ok = promptForPassword(); ok = promptForPassword();
if (ok) if (ok)
{
Display display = Display.getCurrent();
if (display != null)
{ {
return internalResolveFilterString(new NullProgressMonitor(), parent, filterString); return internalResolveFilterString(new NullProgressMonitor(), parent, filterString);
} }
else else
{ {
try
{
//dwd this.shell = shell; //FIXME remove this
ResolveRelativeJob job = new ResolveRelativeJob(filterString, parent);
IStatus status = scheduleJob(job, null, true);
if (status.isOK())
{
if ((job.getOutputs()!=null) && (job.getOutputs().length>1))
return sortResolvedFilterStringObjects(job.getOutputs());
else return job.getOutputs();
}
}
catch (InterruptedException exc)
{
if (shell == null) throw exc;
else showOperationCancelledMessage(shell);
}
}
}
else
SystemBasePlugin.logDebugMessage(this.getClass().getName(), "in SubSystemImpl.resolveFilterString: isConnected() returning false!"); //$NON-NLS-1$ SystemBasePlugin.logDebugMessage(this.getClass().getName(), "in SubSystemImpl.resolveFilterString: isConnected() returning false!"); //$NON-NLS-1$
}
return null; return null;
} }