From 916b0db285ed4e7fbe7d62921ab23ecf2f78e97e Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Fri, 7 Jul 2006 09:46:00 +0000 Subject: [PATCH] Organize imports to create separate group for RSE --- .../rse/examples/daytime/Activator.java | 3 ++- .../DaytimeConnectorService.java | 1 + .../daytime/model/DaytimeAdapterFactory.java | 3 ++- .../daytime/model/DaytimeResourceAdapter.java | 5 ++-- .../daytime/service/DaytimeService.java | 1 + .../daytime/subsystems/DaytimeSubSystem.java | 1 + .../ssh/SshConnectorService.java | 25 ++++++++++--------- .../services/ssh/files/SftpFileService.java | 15 +++++------ .../rse/services/ssh/shell/SshHostShell.java | 6 ++--- .../services/ssh/shell/SshShellService.java | 1 + 10 files changed, 35 insertions(+), 26 deletions(-) diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/Activator.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/Activator.java index d084f0a70d4..9d614479fd9 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/Activator.java +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/Activator.java @@ -18,10 +18,11 @@ package org.eclipse.rse.examples.daytime; import org.eclipse.core.runtime.IAdapterManager; import org.eclipse.core.runtime.Platform; +import org.osgi.framework.BundleContext; + import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.examples.daytime.model.DaytimeAdapterFactory; import org.eclipse.rse.examples.daytime.model.DaytimeResource; -import org.osgi.framework.BundleContext; /** * The main plugin class to be used in the desktop. diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/connectorservice/DaytimeConnectorService.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/connectorservice/DaytimeConnectorService.java index 868cf7567ec..bc869ae68ac 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/connectorservice/DaytimeConnectorService.java +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/connectorservice/DaytimeConnectorService.java @@ -20,6 +20,7 @@ import java.net.ConnectException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osgi.util.NLS; + import org.eclipse.rse.core.subsystems.AbstractConnectorService; import org.eclipse.rse.examples.daytime.DaytimeResources; import org.eclipse.rse.examples.daytime.service.DaytimeService; diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeAdapterFactory.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeAdapterFactory.java index 3f1ce2e4d15..8fea02647d3 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeAdapterFactory.java +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeAdapterFactory.java @@ -17,9 +17,10 @@ package org.eclipse.rse.examples.daytime.model; import org.eclipse.core.runtime.IAdapterFactory; +import org.eclipse.ui.views.properties.IPropertySource; + import org.eclipse.rse.ui.view.AbstractSystemRemoteAdapterFactory; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; -import org.eclipse.ui.views.properties.IPropertySource; /** * This factory maps requests for an adapter object from a given remote object. diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java index 617e53ae2eb..31801b00e11 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java @@ -18,6 +18,9 @@ package org.eclipse.rse.examples.daytime.model; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.views.properties.IPropertyDescriptor; + import org.eclipse.rse.examples.daytime.Activator; import org.eclipse.rse.examples.daytime.DaytimeResources; import org.eclipse.rse.examples.daytime.service.IDaytimeService; @@ -25,8 +28,6 @@ import org.eclipse.rse.examples.daytime.subsystems.DaytimeSubSystem; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.view.AbstractSystemViewAdapter; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.views.properties.IPropertyDescriptor; /** * The DaytimeResourceAdapter fulfills the interface required by the Remote Systems diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/service/DaytimeService.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/service/DaytimeService.java index f5f62d41d69..216361dbbce 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/service/DaytimeService.java +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/service/DaytimeService.java @@ -18,6 +18,7 @@ import java.net.Socket; import java.net.UnknownHostException; import org.eclipse.core.runtime.IProgressMonitor; + import org.eclipse.rse.examples.daytime.DaytimeResources; import org.eclipse.rse.services.clientserver.messages.SystemMessage; diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystem.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystem.java index 63bc3dc93ff..43e9206f455 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystem.java +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystem.java @@ -12,6 +12,7 @@ package org.eclipse.rse.examples.daytime.subsystems; import org.eclipse.core.runtime.IProgressMonitor; + import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.SubSystem; import org.eclipse.rse.examples.daytime.model.DaytimeResource; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorService.java index 8d47ee08813..8d730782d09 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/SshConnectorService.java @@ -28,18 +28,6 @@ import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.window.Window; -import org.eclipse.rse.core.SystemBasePlugin; -import org.eclipse.rse.core.subsystems.AbstractConnectorService; -import org.eclipse.rse.core.subsystems.CommunicationsEvent; -import org.eclipse.rse.core.subsystems.IConnectorService; -import org.eclipse.rse.core.subsystems.SubSystemConfiguration; -import org.eclipse.rse.model.IHost; -import org.eclipse.rse.model.ISystemRegistry; -import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.services.ssh.ISshSessionProvider; -import org.eclipse.rse.ui.ISystemMessages; -import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.rse.ui.messages.SystemMessageDialog; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; @@ -61,6 +49,19 @@ import com.jcraft.jsch.SocketFactory; import com.jcraft.jsch.UIKeyboardInteractive; import com.jcraft.jsch.UserInfo; +import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.subsystems.AbstractConnectorService; +import org.eclipse.rse.core.subsystems.CommunicationsEvent; +import org.eclipse.rse.core.subsystems.IConnectorService; +import org.eclipse.rse.core.subsystems.SubSystemConfiguration; +import org.eclipse.rse.model.IHost; +import org.eclipse.rse.model.ISystemRegistry; +import org.eclipse.rse.services.clientserver.messages.SystemMessage; +import org.eclipse.rse.services.ssh.ISshSessionProvider; +import org.eclipse.rse.ui.ISystemMessages; +import org.eclipse.rse.ui.RSEUIPlugin; +import org.eclipse.rse.ui.messages.SystemMessageDialog; + /** * Create SSH connections. */ diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java index a516212357e..dc29d5bc816 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java @@ -25,6 +25,14 @@ import java.util.regex.Pattern; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; + +import com.jcraft.jsch.Channel; +import com.jcraft.jsch.ChannelExec; +import com.jcraft.jsch.ChannelSftp; +import com.jcraft.jsch.Session; +import com.jcraft.jsch.SftpATTRS; +import com.jcraft.jsch.SftpProgressMonitor; + import org.eclipse.rse.services.clientserver.NamePatternMatcher; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.files.AbstractFileService; @@ -35,13 +43,6 @@ import org.eclipse.rse.services.ssh.ISshService; import org.eclipse.rse.services.ssh.ISshSessionProvider; import org.eclipse.rse.services.ssh.SshServiceResources; -import com.jcraft.jsch.Channel; -import com.jcraft.jsch.ChannelExec; -import com.jcraft.jsch.ChannelSftp; -import com.jcraft.jsch.Session; -import com.jcraft.jsch.SftpATTRS; -import com.jcraft.jsch.SftpProgressMonitor; - public class SftpFileService extends AbstractFileService implements IFileService, ISshService { //private SshConnectorService fConnector; diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java index b2466dce0c4..5478f6361f2 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java @@ -20,13 +20,13 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.PrintWriter; +import com.jcraft.jsch.Channel; +import com.jcraft.jsch.Session; + import org.eclipse.rse.services.shells.AbstractHostShell; import org.eclipse.rse.services.shells.IHostShellOutputReader; import org.eclipse.rse.services.ssh.ISshSessionProvider; -import com.jcraft.jsch.Channel; -import com.jcraft.jsch.Session; - /** * A Shell subsystem for SSH. */ diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshShellService.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshShellService.java index f1ff0ddb9ff..bf6137aa71e 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshShellService.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshShellService.java @@ -17,6 +17,7 @@ package org.eclipse.rse.services.ssh.shell; import org.eclipse.core.runtime.IProgressMonitor; + import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IShellService;