mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 09:15:38 +02:00
Code Issues Wiki Activity

[237970] Subsystem.connect( ) fails for substituting host name when isOffline( ) is true

Browse source
This commit is contained in:
David McKnight 2008-07-07 16:12:49 +00:00
parent 9bbc6bb137
commit f0dc80f98b
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
View file

@ -41,6 +41,7 @@
* David McKnight (IBM) - [233435] SubSystem.resolveFilterStrings(*) does not prompt for a connection when the subsystem is not connected * David McKnight (IBM) - [233435] SubSystem.resolveFilterStrings(*) does not prompt for a connection when the subsystem is not connected
* David Dykstal (IBM) - [233876] filters lost after restart * David Dykstal (IBM) - [233876] filters lost after restart
* David McKnight (IBM) - [238609] Substitution value missing for disconnect failed message * David McKnight (IBM) - [238609] Substitution value missing for disconnect failed message
* David McKnight (IBM) - [237970] Subsystem.connect( ) fails for substituting host name when isOffline( ) is true
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.core.subsystems; package org.eclipse.rse.core.subsystems;
@ -1799,7 +1800,7 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
{ {
// offline and no caching support so throw exception // offline and no caching support so throw exception
String msgTxt = NLS.bind(RSECoreMessages.MSG_OFFLINE_CANT_CONNECT,getHost().getAliasName()); String msgTxt = NLS.bind(RSECoreMessages.MSG_OFFLINE_CANT_CONNECT,getHost().getAliasName());
String msgDetails = RSECoreMessages.MSG_OFFLINE_CANT_CONNECT_DETAILS; String msgDetails = NLS.bind(RSECoreMessages.MSG_OFFLINE_CANT_CONNECT_DETAILS, getHost().getAliasName());
SystemMessage sMsg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, SystemMessage sMsg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID,
SystemResourceConstants.MSG_OFFLINE_CANT_CONNECT, SystemResourceConstants.MSG_OFFLINE_CANT_CONNECT,
IStatus.INFO, msgTxt, msgDetails); IStatus.INFO, msgTxt, msgDetails);
@ -2288,8 +2289,12 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
public Object[] resolveFilterString(Object parent, String filterString, IProgressMonitor monitor) public Object[] resolveFilterString(Object parent, String filterString, IProgressMonitor monitor)
throws Exception throws Exception
{ {
// for bug 233435, implicit connect if the connection is not connected
checkIsConnected(monitor); // for bug 237970, can't connect when we're in offline mode
if (!isOffline()){
// for bug 233435, implicit connect if the connection is not connected
checkIsConnected(monitor);
}
if (isConnected()) if (isConnected())
{ {
@ -2473,7 +2478,7 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
// yantzi: artemis 6.0, offline support // yantzi: artemis 6.0, offline support
if (isOffline()) { if (isOffline()) {
String msgTxt = NLS.bind(RSECoreMessages.MSG_OFFLINE_CANT_CONNECT, hostName); String msgTxt = NLS.bind(RSECoreMessages.MSG_OFFLINE_CANT_CONNECT, hostName);
String msgDetails = RSECoreMessages.MSG_OFFLINE_CANT_CONNECT_DETAILS; String msgDetails = NLS.bind(RSECoreMessages.MSG_OFFLINE_CANT_CONNECT_DETAILS, hostName);
SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID,
SystemResourceConstants.MSG_OFFLINE_CANT_CONNECT, SystemResourceConstants.MSG_OFFLINE_CANT_CONNECT,