From a8619fd16dfe50d658ee20d633a7c056f73dad32 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Fri, 12 Mar 2010 15:36:23 +0000 Subject: [PATCH] [288894] CANCEL has to be pressed 3 times in Userid/Password prompt window in Remote System Details view --- .../ui/view/SystemViewFilterReferenceAdapter.java | 5 ++++- .../UI/org/eclipse/rse/ui/view/SystemTableView.java | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java index 9c3b531a138..fbb6c191a88 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2008 IBM Corporation and others. + * Copyright (c) 2002, 2010 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 @@ -32,6 +32,7 @@ * David McKnight (IBM) - [244824] filter not refreshed if child is "empty list" or system message node * David McKnight (IBM) - [249245] not showing inappropriate popup actions for: Refresh, Show In Table, Go Into, etc. * David McKnight (IBM) - [254614] Promptable filter's shouldn't require supportsCommands on the subsystem to be false + * Noriaki Takatsu (IBM) - [288894] CANCEL has to be pressed 3 times in Userid/Password prompt window in Remote System Details view *******************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -289,6 +290,7 @@ public class SystemViewFilterReferenceAdapter */ public Object[] getChildren(IContextObject element, IProgressMonitor monitor) { Object[] children = getChildren(element.getModelObject(), monitor); + if (children == null) return null; ISubSystem subsystem = element.getSubSystem(); ISubSystemConfiguration configuration = subsystem.getSubSystemConfiguration(); Object adapter = Platform.getAdapterManager().getAdapter(configuration, ISubSystemConfigurationAdapter.class); @@ -507,6 +509,7 @@ public class SystemViewFilterReferenceAdapter children = new SystemMessageObject[1]; children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element); SystemBasePlugin.logError("Exception resolving filters' strings ", exc); //$NON-NLS-1$ + return null; } // message already issued return checkForEmptyList(children, element, true); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java index 4c50d59bb0a..8ebc2f44aa1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2002, 2009 IBM Corporation and others. All rights reserved. + * Copyright (c) 2002, 2010 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 http://www.eclipse.org/legal/epl-v10.html @@ -24,6 +24,7 @@ * David McKnight (IBM) - [187058] Incorrect Right Click Menu in Remote System Details View with no selection * David McKnight (IBM) - [260346] RSE view for jobs does not remember resized columns * Martin Oberhuber (Wind River) - [289533] NPE on "Show in Table" + * Noriaki Takatsu (IBM) - [288894] CANCEL has to be pressed 3 times in Userid/Password prompt window in Remote System Details view ********************************************************************************/ package org.eclipse.rse.ui.view; @@ -459,7 +460,9 @@ public class SystemTableView // reset the filter //setViewFilters(null); - super.inputChanged(newObject, oldObject); + if (_showColumns != false) { + super.inputChanged(newObject, oldObject); + } } else if (newObject == null) @@ -673,6 +676,7 @@ public class SystemTableView // if no children, don't update if (children == null || children.length == 0) { + _showColumns = false; return; }