### Eclipse Workspace Patch 1.0 #P org.eclipse.rse.examples.daytime Index: src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubsystemConfiguration.java =================================================================== RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubsystemConfiguration.java,v retrieving revision 1.2 diff -u -r1.2 DaytimeSubsystemConfiguration.java --- src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubsystemConfiguration.java 28 Jun 2006 03:19:39 -0000 1.2 +++ src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubsystemConfiguration.java 18 Jul 2006 11:47:17 -0000 @@ -58,9 +58,7 @@ return false; } public boolean supportsUserId() { - // TODO for now, we have to connect in order to pass the hostname to the service - // This should not be necessary in an ideal world - return true; + return false; } public boolean isFactoryFor(Class subSystemType) { return DaytimeSubSystem.class.equals(subSystemType); #P org.eclipse.rse.ui Index: subsystems/org/eclipse/rse/core/subsystems/SubSystem.java =================================================================== RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java,v retrieving revision 1.13 diff -u -r1.13 SubSystem.java --- subsystems/org/eclipse/rse/core/subsystems/SubSystem.java 14 Jul 2006 16:14:48 -0000 1.13 +++ subsystems/org/eclipse/rse/core/subsystems/SubSystem.java 18 Jul 2006 11:47:19 -0000 @@ -238,7 +238,7 @@ public void setSubSystemConfiguration(ISubSystemConfiguration ssf) { parentSubSystemFactory = ssf; - supportsConnecting = ssf.supportsUserId(); + supportsConnecting = ssf.supportsSubSystemConnect(); //System.out.println("subsystem supports connecting? " + supportsConnecting); } /** @@ -1663,7 +1663,7 @@ protected boolean implicitConnect(boolean isConnectOperation, IProgressMonitor mon, String msg, int totalWorkUnits) throws SystemMessageException, InvocationTargetException, InterruptedException { boolean didConnection = false; - if (doConnection && !isConnected())// caller wants to do connection first as part operation + if ( doConnection && !isConnected())// caller wants to do connection first as part operation { if (isOffline() || (supportsCaching() && getCacheManager().isRestoreFromMemento())) { @@ -2543,7 +2543,9 @@ if (runnableContext instanceof ProgressMonitorDialog) { ((ProgressMonitorDialog) runnableContext).setCancelable(true); } - getConnectorService().promptForPassword(shell, forcePrompt); // prompt for userid and password + if (getSubSystemConfiguration().supportsUserId()) { + getConnectorService().promptForPassword(shell, forcePrompt); // prompt for userid and password + } ConnectJob job = new ConnectJob(); scheduleJob(job, null, shell != null); IStatus status = job.getResult(); @@ -2567,7 +2569,7 @@ boolean ok = false; if (!supportsConnecting) return true; - + if (isOffline()) { // offline so don't bother prompting @@ -2579,6 +2581,13 @@ doConnection = true; // this gets handled later when it comes time to connect return true; } + else if (!getSubSystemConfiguration().supportsUserId()) + { + // subsystem needs no user id so dont bother prompting + doConnection = true; // this gets handled later when it comes time to connect + return true; + } + try { #P org.eclipse.rse.examples.tutorial Index: src/samples/subsystems/DeveloperSubSystemConfiguration.java =================================================================== RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfiguration.java,v retrieving revision 1.1 diff -u -r1.1 DeveloperSubSystemConfiguration.java --- src/samples/subsystems/DeveloperSubSystemConfiguration.java 13 Jul 2006 08:27:41 -0000 1.1 +++ src/samples/subsystems/DeveloperSubSystemConfiguration.java 18 Jul 2006 11:47:20 -0000 @@ -101,6 +101,13 @@ } /* (non-Javadoc) + * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsUserId() + */ + public boolean supportsUserId() { + return false; + } + + /* (non-Javadoc) * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchProperties(org.eclipse.rse.model.IHost) */ public boolean supportsServerLaunchProperties(IHost host) {