From f3510bfea4ace8db6f23f1de0e92695d84fe9443 Mon Sep 17 00:00:00 2001 From: David Dykstal Date: Thu, 21 Sep 2006 16:59:52 +0000 Subject: [PATCH] Bug 153255 - replaced the Policy.bind that was being used with a constant string from SystemViewResources. --- .../org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java | 7 ++++--- .../UI/org/eclipse/rse/ui/view/SystemViewResources.java | 2 ++ .../org/eclipse/rse/ui/view/SystemViewResources.properties | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java index fcb26761472..9d6a6e011ce 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java @@ -1757,11 +1757,12 @@ public abstract class AbstractSystemViewAdapter public void fetchDeferredChildren(Object o, IElementCollector collector, IProgressMonitor monitor) { SystemFetchOperation operation = null; + monitor = Policy.monitorFor(monitor); + String taskName = SystemViewResources.RESID_FETCHING; + monitor.beginTask(taskName, 100); + operation = getSystemFetchOperation(o, collector); try { - monitor = Policy.monitorFor(monitor); - monitor.beginTask(Policy.bind("RemoteFolderElement.fetchingRemoteChildren", getLabel(o)), 100); //$NON-NLS-1$ - operation = getSystemFetchOperation(o, collector); operation.run(Policy.subMonitorFor(monitor, 100)); } catch (InvocationTargetException e) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.java index d4fe708f46c..41e7b5ee62a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.java @@ -233,6 +233,8 @@ public class SystemViewResources extends NLS { public static String RESID_SCRATCHPAD; public static String RESID_REMOTE_SCRATCHPAD; + + public static String RESID_FETCHING; static { // load message values from bundle file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.properties index f46d4288a81..f24bdc638ac 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.properties +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.properties @@ -201,4 +201,6 @@ RESID_PROPERTY_LINKINGACTION_TOOLTIP = Link with Editor RESID_SCRATCHPAD=Scratchpad -RESID_REMOTE_SCRATCHPAD=Remote Scratchpad \ No newline at end of file +RESID_REMOTE_SCRATCHPAD=Remote Scratchpad + +RESID_FETCHING = Fetching Remote Resources \ No newline at end of file