diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFormLabelAndContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFormLabelAndContentProvider.java index c3bd0ac7151..69214290ed4 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFormLabelAndContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFormLabelAndContentProvider.java @@ -25,7 +25,6 @@ import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.rse.ui.view.IContextObject; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.ui.internal.progress.ProgressMessages; public class SystemViewFormLabelAndContentProvider extends SystemViewLabelAndContentProvider { @@ -57,7 +56,7 @@ public class SystemViewFormLabelAndContentProvider extends public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - String taskName = NLS.bind(ProgressMessages.DeferredTreeContentManager_FetchingName, fadapter.getAbsoluteName(felement)); + String taskName = NLS.bind(SystemViewResources.RESID_FETCHING_CHILDREN_OF, fadapter.getAbsoluteName(felement)); monitor.beginTask(taskName, IProgressMonitor.UNKNOWN); if (fparent instanceof IContextObject){ _children = fadapter.getChildren((IContextObject)fparent, monitor); @@ -71,17 +70,15 @@ public class SystemViewFormLabelAndContentProvider extends public Object[] getChildren(){ return _children; } - }; + } MyRunnable runnable = new MyRunnable(); try { irc.run(true, true, runnable); } catch (InvocationTargetException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + SystemBasePlugin.logError(e.getMessage()); } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + SystemBasePlugin.logError(e.getMessage()); } return runnable.getChildren(); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java index 37718f4c201..03b66070405 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2008 IBM Corporation and others. + * Copyright (c) 2002, 2011 IBM Corporation and others. * All rights reserved. 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 available at @@ -16,6 +16,7 @@ * David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible * David McKnight (IBM) - [223103] [cleanup] fix broken externalized strings * Xuan Chen (IBM) - [222263] Need to provide a PropertySet Adapter for System Team View + * David McKnight (IBM) - [334295] SystemViewForm dialogs don't display cancellable progress in the dialog *******************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -135,6 +136,7 @@ public class SystemViewResources extends NLS { public static String RESID_REMOTE_SCRATCHPAD; public static String RESID_FETCHING; + public static String RESID_FETCHING_CHILDREN_OF; static { // load message values from bundle file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties index f8babdf3dd0..18ddae24bfd 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2008 IBM Corporation and others. +# Copyright (c) 2000, 2011 IBM Corporation and others. # All rights reserved. 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 available at @@ -16,6 +16,7 @@ # David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible # David McKnight (IBM) - [223103] [cleanup] fix broken externalized strings # Xuan Chen (IBM) - [222263] Need to provide a PropertySet Adapter for System Team View +# David McKnight (IBM) - [334295] SystemViewForm dialogs don't display cancellable progress in the dialog ############################################################################### # NLS_MESSAGEFORMAT_VAR @@ -115,3 +116,4 @@ RESID_SCRATCHPAD=Scratchpad RESID_REMOTE_SCRATCHPAD=Remote Scratchpad RESID_FETCHING = Fetching Remote Resources +RESID_FETCHING_CHILDREN_OF = Fetching children of {0}