mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-19 06:55:23 +02:00
Code Issues Wiki Activity

[334295] SystemViewForm dialogs don't display cancellable progress in the dialog

Browse source
This commit is contained in:
David McKnight 2011-03-01 17:08:40 +00:00
parent 1d15248e50
commit 1335f9a633
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFormLabelAndContentProvider.java
View file

@ -25,7 +25,6 @@ import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.rse.ui.SystemBasePlugin;
import org.eclipse.rse.ui.view.IContextObject; import org.eclipse.rse.ui.view.IContextObject;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
import org.eclipse.ui.internal.progress.ProgressMessages;
public class SystemViewFormLabelAndContentProvider extends public class SystemViewFormLabelAndContentProvider extends
SystemViewLabelAndContentProvider { SystemViewLabelAndContentProvider {
@ -57,7 +56,7 @@ public class SystemViewFormLabelAndContentProvider extends
public void run(IProgressMonitor monitor) public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException { 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); monitor.beginTask(taskName, IProgressMonitor.UNKNOWN);
if (fparent instanceof IContextObject){ if (fparent instanceof IContextObject){
_children = fadapter.getChildren((IContextObject)fparent, monitor); _children = fadapter.getChildren((IContextObject)fparent, monitor);
@ -71,17 +70,15 @@ public class SystemViewFormLabelAndContentProvider extends
public Object[] getChildren(){ public Object[] getChildren(){
return _children; return _children;
} }
}; }
MyRunnable runnable = new MyRunnable(); MyRunnable runnable = new MyRunnable();
try { try {
irc.run(true, true, runnable); irc.run(true, true, runnable);
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
// TODO Auto-generated catch block SystemBasePlugin.logError(e.getMessage());
e.printStackTrace();
} catch (InterruptedException e) { } catch (InterruptedException e) {
// TODO Auto-generated catch block SystemBasePlugin.logError(e.getMessage());
e.printStackTrace();
} }
return runnable.getChildren(); return runnable.getChildren();
} }

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java
View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * 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) - [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 * David McKnight (IBM) - [223103] [cleanup] fix broken externalized strings
* Xuan Chen (IBM) - [222263] Need to provide a PropertySet Adapter for System Team View * 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; 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_REMOTE_SCRATCHPAD;
public static String RESID_FETCHING; public static String RESID_FETCHING;
public static String RESID_FETCHING_CHILDREN_OF;
static { static {
// load message values from bundle file // load message values from bundle file

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties
View file

@ -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 # All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0 # are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at # 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) - [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 # David McKnight (IBM) - [223103] [cleanup] fix broken externalized strings
# Xuan Chen (IBM) - [222263] Need to provide a PropertySet Adapter for System Team View # 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 # NLS_MESSAGEFORMAT_VAR
@ -115,3 +116,4 @@ RESID_SCRATCHPAD=Scratchpad
RESID_REMOTE_SCRATCHPAD=Remote Scratchpad RESID_REMOTE_SCRATCHPAD=Remote Scratchpad
RESID_FETCHING = Fetching Remote Resources RESID_FETCHING = Fetching Remote Resources
RESID_FETCHING_CHILDREN_OF = Fetching children of {0}