mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

[288894] CANCEL has to be pressed 3 times in Userid/Password prompt window in Remote System Details view

Browse source
This commit is contained in:
David McKnight 2010-03-12 15:36:23 +00:00
parent 11ac4910d5
commit a8619fd16d
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java
View file

@ -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 * 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
@ -32,6 +32,7 @@
* David McKnight (IBM) - [244824] filter not refreshed if child is "empty list" or system message node * 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) - [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 * 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; package org.eclipse.rse.internal.ui.view;
@ -289,6 +290,7 @@ public class SystemViewFilterReferenceAdapter
*/ */
public Object[] getChildren(IContextObject element, IProgressMonitor monitor) { public Object[] getChildren(IContextObject element, IProgressMonitor monitor) {
Object[] children = getChildren(element.getModelObject(), monitor); Object[] children = getChildren(element.getModelObject(), monitor);
if (children == null) return null;
ISubSystem subsystem = element.getSubSystem(); ISubSystem subsystem = element.getSubSystem();
ISubSystemConfiguration configuration = subsystem.getSubSystemConfiguration(); ISubSystemConfiguration configuration = subsystem.getSubSystemConfiguration();
Object adapter = Platform.getAdapterManager().getAdapter(configuration, ISubSystemConfigurationAdapter.class); Object adapter = Platform.getAdapterManager().getAdapter(configuration, ISubSystemConfigurationAdapter.class);
@ -507,6 +509,7 @@ public class SystemViewFilterReferenceAdapter
children = new SystemMessageObject[1]; children = new SystemMessageObject[1];
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element); children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element);
SystemBasePlugin.logError("Exception resolving filters' strings ", exc); //$NON-NLS-1$ SystemBasePlugin.logError("Exception resolving filters' strings ", exc); //$NON-NLS-1$
return null;
} // message already issued } // message already issued
return checkForEmptyList(children, element, true); return checkForEmptyList(children, element, true);

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java
View file

@ -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 * 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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * 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) - [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 * David McKnight (IBM) - [260346] RSE view for jobs does not remember resized columns
* Martin Oberhuber (Wind River) - [289533] NPE on "Show in Table" * 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; package org.eclipse.rse.ui.view;
@ -459,7 +460,9 @@ public class SystemTableView
// reset the filter // reset the filter
//setViewFilters(null); //setViewFilters(null);
super.inputChanged(newObject, oldObject); if (_showColumns != false) {
super.inputChanged(newObject, oldObject);
}
} }
else if (newObject == null) else if (newObject == null)
@ -673,6 +676,7 @@ public class SystemTableView
// if no children, don't update // if no children, don't update
if (children == null || children.length == 0) if (children == null || children.length == 0)
{ {
_showColumns = false;
return; return;
} }