From 5c085bc55f4b41f7b5c44aced65aca6054f25e1b Mon Sep 17 00:00:00 2001
From: David Dykstal <david_dykstal@us.ibm.com>
Date: Mon, 5 Mar 2007 15:32:23 +0000
Subject: [PATCH] [cleanup] minor cleanup prep for refactoring

---
 .../rse/core/subsystems/IConnectorService.java     | 14 ++++++++------
 .../core/subsystems/AbstractConnectorService.java  |  4 +++-
 .../AbstractConnectorServiceManager.java           |  3 ---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorService.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorService.java
index 44a103764e0..306d6cf6758 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorService.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorService.java
@@ -21,19 +21,21 @@ import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.model.IRSEModelObject;
 
 /**
- * This is the interface implemented by ConnectorService (formerly System) objects.
+ * This is the interface implemented by AbstractConnectorService
+ * (formerly System) objects.
  * <p>
  * A connector service manages a live connection to a remote system, with
  * operations for connecting and disconnecting, and storing information
- * typically cached from a subsystem: user ID, password, port, etc.
+ * typically cached from a subsystem: credentials, port, etc.
  * <p>
- * The SubSystem interface includes a method, getConnectorService(), which returns an
- * instance of an object that implements this interface for that subsystem.
+ * The SubSystem interface includes a method, getConnectorService(),
+ * which returns an instance of an object that implements this interface
+ * for that subsystem.
  * <p>
  * A single connector service object can be unique to a subsystem instance, but
  * it can also be shared across multiple subsystems in a single host if those
- * subsystems share a physical connection to the remote system. This sharing is done via
- * subclasses of {@link org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager}
+ * subsystems share a physical connection to the remote system.
+ * This sharing is done using implementers of {@link IConnectorServiceManager} 
  * which are returned by another getter method in SubSystem.
  */
 public interface IConnectorService extends IRSEModelObject {
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java
index 636cfa188ec..8378731b578 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java
@@ -480,7 +480,9 @@ public abstract class AbstractConnectorService extends RSEModelObject implements
 		// dy:  March 24, 2003:  check if prompting is temporarily suppressed by a tool
 		// vendor, this should only be suppressed if the user cancelled a previous signon
 		// dialog (or some other good reason)
-		if (isSuppressSignonPrompt()) throw new InterruptedException();
+		if (isSuppressSignonPrompt()) {
+			throw new InterruptedException();
+		}
 
 		ISubSystem subsystem = getPrimarySubSystem();
 		IHost host = subsystem.getHost();
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java
index 39212553708..d9f42a67cef 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java
@@ -19,10 +19,7 @@ import java.util.Hashtable;
 import java.util.Set;
 
 import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.model.DummyHost;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.swt.widgets.Shell;
 
 
 /**