From a837fdda549289b7494c7f3814e52e449e70d118 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Mon, 5 Nov 2007 21:16:05 +0000 Subject: [PATCH] dstore - removing some warnings --- .../dstore/DStoreConnectorService.java | 2 +- .../dstore/util/ConnectionStatusListener.java | 3 --- .../dstore/util/StatusMonitor.java | 18 ++---------------- .../dstore/RexecDstoreServer.java | 2 +- .../dstore/DStoreServiceCommandShell.java | 2 -- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java index 55976f900b1..22aff847701 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java @@ -623,7 +623,7 @@ public class DStoreConnectorService extends StandardConnectorService implements SystemSignonInformation info = getSignonInformation(); if (info == null) { - System.out.println("password info = null!"); + System.out.println("password info = null!"); //$NON-NLS-1$ } int daemonPort = 0; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java index dd4aa6053b0..d527ebb4371 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java @@ -166,9 +166,6 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP } } - /** - * @see IDomainListener#getShell() - */ public Shell getShell() { return internalGetShell(); diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java index bb92f381c63..181ed2583fe 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java @@ -224,21 +224,7 @@ public class StatusMonitor implements IDomainListener, ICommunicationsListener return false; } - /** - * @see IDomainListener#getShell() - */ - public Shell getShell() - { - // dy: DomainNotifier (which calls this method) requires the shell not be disposed - //if (shell == null) { - if (_shell == null || _shell.isDisposed()) - { - FindShell findShell = new FindShell(); - Display.getDefault().syncExec(findShell); - _shell = findShell.shell; - } - return _shell; - } + /** * @see ICommunicationsListener#communicationsStateChange(CommunicationsEvent) @@ -393,7 +379,7 @@ public class StatusMonitor implements IDomainListener, ICommunicationsListener /** * Start diagnostic * - * @param diagnostic is the an implementation of ICommunicationsDiagnostic + * @param factory is the an implementation of ICommunicationsDiagnostic * @param quiet is the flag to indicate if user should be prompted * - true for no prompt * @return ICommunciationsDiagnostic class instance diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java index 88ad2432e7f..d878feb3baa 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java @@ -362,7 +362,7 @@ public class RexecDstoreServer implements IServerLauncher this.propertyInfo = propertyInfo; // set path... this.cwd = ((IRemoteServerLauncher)propertyInfo).getServerPath(); - char separatorChar = signonInfo.getSystemType().isWindows() ? '\\' : '/'; //$NON-NLS-1$ + char separatorChar = signonInfo.getSystemType().isWindows() ? '\\' : '/'; if (cwd.length() > 0 && cwd.charAt(cwd.length() - 1) != separatorChar) cwd += separatorChar; // set script... diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/DStoreServiceCommandShell.java b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/DStoreServiceCommandShell.java index acd474c6992..5f0fb6af482 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/DStoreServiceCommandShell.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/DStoreServiceCommandShell.java @@ -44,7 +44,6 @@ public class DStoreServiceCommandShell extends ServiceCommandShell { private DataElement _status; private DataStore _ds; - private String _name; private boolean _done = false; public CleanUpSpirited(DataElement status, String name) @@ -52,7 +51,6 @@ public class DStoreServiceCommandShell extends ServiceCommandShell _status = status; _ds = status.getDataStore(); _ds.getDomainNotifier().addDomainListener(this); - _name = name; } public void domainChanged(DomainEvent e)