diff options
author | afinkbein | 2010-07-16 21:22:47 +0000 |
---|---|---|
committer | afinkbein | 2010-07-16 21:22:47 +0000 |
commit | aeeb3f68fe4b9d0da7fa7c4fbcace01b450671bb (patch) | |
tree | d1dda1778855fe789218f3886e57607d264b99bb | |
parent | fbee22edb00faf0a54d584f6b01871abd3a4a4a7 (diff) | |
download | org.eclipse.osee-aeeb3f68fe4b9d0da7fa7c4fbcace01b450671bb.tar.gz org.eclipse.osee-aeeb3f68fe4b9d0da7fa7c4fbcace01b450671bb.tar.xz org.eclipse.osee-aeeb3f68fe4b9d0da7fa7c4fbcace01b450671bb.zip |
cleanup of api, and fixed the disconnect reconnect when a server is killed from underneath a client
17 files changed, 35 insertions, 47 deletions
diff --git a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageSubscriptionService.java b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageSubscriptionService.java index 20a014435bc..099ea6f1b65 100644 --- a/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageSubscriptionService.java +++ b/plugins/org.eclipse.osee.ote.client.msg/src/org/eclipse/osee/ote/client/msg/core/internal/MessageSubscriptionService.java @@ -24,7 +24,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.logging.Level; - import org.eclipse.osee.connection.service.IServiceConnector; import org.eclipse.osee.framework.jdk.core.util.network.PortUtil; import org.eclipse.osee.framework.logging.OseeLog; @@ -33,7 +32,6 @@ import org.eclipse.osee.ote.client.msg.core.IMessageDbFactory; import org.eclipse.osee.ote.client.msg.core.IMessageSubscription; import org.eclipse.osee.ote.client.msg.core.db.AbstractMessageDataBase; import org.eclipse.osee.ote.core.environment.UserTestSessionKey; -import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment; import org.eclipse.osee.ote.message.commands.RecordCommand; import org.eclipse.osee.ote.message.commands.RecordCommand.MessageRecordDetails; import org.eclipse.osee.ote.message.enums.DataType; @@ -126,7 +124,7 @@ public class MessageSubscriptionService implements IOteMessageService, IMessageD } @Override - public synchronized void onConnectionLost(IServiceConnector connector, IHostTestEnvironment testHost) { + public synchronized void onConnectionLost(IServiceConnector connector) { OseeLog.log(Activator.class, Level.INFO, "connection lost: ote client message service halted"); shutdownDispatcher(); msgDatabase.detachService(null); diff --git a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/ITestConnectionListener.java b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/ITestConnectionListener.java index e5347ccd688..f0bc54a4d87 100644 --- a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/ITestConnectionListener.java +++ b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/ITestConnectionListener.java @@ -11,7 +11,6 @@ package org.eclipse.osee.ote.service; import org.eclipse.osee.connection.service.IServiceConnector; -import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment; /** * @author Ken J. Aguilar @@ -27,7 +26,7 @@ public interface ITestConnectionListener { * @param connector * @param testHost */ - void onConnectionLost(IServiceConnector connector, IHostTestEnvironment testHost); + void onConnectionLost(IServiceConnector connector); /** * this method is called when a disconnect request is initiated by the client. The connector and the service are diff --git a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/JmsToJiniBridgeConnector.java b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/JmsToJiniBridgeConnector.java index 9ecc6dcb4bf..569162a012f 100644 --- a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/JmsToJiniBridgeConnector.java +++ b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/JmsToJiniBridgeConnector.java @@ -15,12 +15,10 @@ import java.rmi.server.ExportException; import java.util.HashMap;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-
import net.jini.export.Exporter;
import net.jini.jeri.BasicILFactory;
import net.jini.jeri.BasicJeriExporter;
import net.jini.jeri.tcp.TcpServerEndpoint;
-
import org.eclipse.osee.connection.service.IServiceConnector;
import org.eclipse.osee.connection.service.IServicePropertyChangeListener;
import org.eclipse.osee.framework.jdk.core.util.EnhancedProperties;
@@ -126,7 +124,15 @@ public class JmsToJiniBridgeConnector implements IServiceConnector { @Override
public boolean ping() {
- return true;
+ if(getService() != null && getService() instanceof IHostTestEnvironment){
+ try{
+ ((IHostTestEnvironment)getService()).getProperties();
+ return true;
+ } catch (Throwable th){
+ return false;
+ }
+ }
+ return false;
}
@Override
diff --git a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/ListenerNotifier.java b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/ListenerNotifier.java index 60e928c4e70..69334c7097c 100644 --- a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/ListenerNotifier.java +++ b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/ListenerNotifier.java @@ -14,10 +14,8 @@ import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.logging.Level; - import org.eclipse.osee.connection.service.IServiceConnector; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment; import org.eclipse.osee.ote.service.Activator; import org.eclipse.osee.ote.service.ConnectionEvent; import org.eclipse.osee.ote.service.IMessageDictionary; @@ -83,15 +81,14 @@ class ListenerNotifier { }
}
- void notifyConnectionLost(final IServiceConnector connector,
- final IHostTestEnvironment testHost) {
+ void notifyConnectionLost(final IServiceConnector connector) {
executor.submit(new Runnable() {
@Override
public void run() {
for (ITestConnectionListener listener : testConnectionListeners) {
try {
- listener.onConnectionLost(connector, testHost);
+ listener.onConnectionLost(connector);
} catch (Exception ex) {
OseeLog
.log(
diff --git a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/TestClientServiceImpl.java b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/TestClientServiceImpl.java index fd119cc78c9..dfc17eb8e2a 100644 --- a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/TestClientServiceImpl.java +++ b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/TestClientServiceImpl.java @@ -147,6 +147,7 @@ public class TestClientServiceImpl implements IOteClientService, IConnectorListe } } } catch (RemoteException ex) { + ex.printStackTrace(); } return null; } @@ -165,12 +166,11 @@ public class TestClientServiceImpl implements IOteClientService, IConnectorListe ITestEnvironment envirnonment = testConnection.getConnectEnvironment(); if (!testConnection.getServiceConnector().ping()) { - listenerNotifier.notifyConnectionLost(testConnection.getServiceConnector(), - testConnection.getConnectedTestHost()); + listenerNotifier.notifyConnectionLost(testConnection.getServiceConnector()); testConnection = null; } else { ConnectionEvent event = - new ConnectionEvent(this.getConnectedHost(), getConnector(testConnection.getConnectedTestHost()), envirnonment, + new ConnectionEvent(this.getConnectedHost(), testConnection.getConnectedTestHost(), envirnonment, testConnection.getSessionKey()); listenerNotifier.notifyDisconnect(event); try { @@ -378,7 +378,7 @@ public class TestClientServiceImpl implements IOteClientService, IConnectorListe @Override public synchronized IHostTestEnvironment getConnectedHost() throws IllegalStateException { checkState(); - return testConnection == null ? null : testConnection.getConnectedTestHost(); + return testConnection == null ? null : (IHostTestEnvironment)testConnection.getConnectedTestHost().getService(); } @@ -484,7 +484,7 @@ public class TestClientServiceImpl implements IOteClientService, IConnectorListe IHostTestEnvironment connectedHost = getConnectedHost(); if (connectedHost != null && connectedHost.equals(env)) { testConnection = null; - listenerNotifier.notifyConnectionLost(connector, env); + listenerNotifier.notifyConnectionLost(connector); } } } diff --git a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/TestHostConnection.java b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/TestHostConnection.java index d37de17eeda..cbc74f542ff 100644 --- a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/TestHostConnection.java +++ b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/TestHostConnection.java @@ -11,7 +11,6 @@ package org.eclipse.osee.ote.service.core;
import java.rmi.RemoteException; - import org.eclipse.osee.connection.service.IServiceConnector; import org.eclipse.osee.ote.core.environment.UserTestSessionKey; import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment; @@ -54,8 +53,8 @@ class TestHostConnection { /**
* @return the connectedTestHost
*/
- public IHostTestEnvironment getConnectedTestHost() {
- return (IHostTestEnvironment) serviceConnector.getService();
+ public IServiceConnector getConnectedTestHost() {
+ return serviceConnector;
}
/**
diff --git a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/WatchView.java b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/WatchView.java index 5daf3a0a6cc..28f73b0a857 100644 --- a/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/WatchView.java +++ b/plugins/org.eclipse.osee.ote.ui.message/src/org/eclipse/osee/ote/ui/message/watch/WatchView.java @@ -60,7 +60,6 @@ import org.eclipse.osee.framework.ui.plugin.OseeUiActivator; import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.osee.framework.ui.swt.Widgets;
import org.eclipse.osee.ote.client.msg.IOteMessageService;
-import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment;
import org.eclipse.osee.ote.message.interfaces.ITestEnvironmentMessageSystem;
import org.eclipse.osee.ote.message.tool.IUdpTransferListener;
import org.eclipse.osee.ote.message.tool.TransferConfig;
@@ -979,7 +978,7 @@ public final class WatchView extends ViewPart implements IActionable, IMessageDi }
@Override
- public void onConnectionLost(IServiceConnector connector, IHostTestEnvironment testHost) {
+ public void onConnectionLost(IServiceConnector connector) {
}
@Override
diff --git a/plugins/org.eclipse.osee.ote.ui.mux/src/org/eclipse/osee/ote/ui/mux/view/MuxView.java b/plugins/org.eclipse.osee.ote.ui.mux/src/org/eclipse/osee/ote/ui/mux/view/MuxView.java index 4eb5cf7ad4c..42813d05915 100644 --- a/plugins/org.eclipse.osee.ote.ui.mux/src/org/eclipse/osee/ote/ui/mux/view/MuxView.java +++ b/plugins/org.eclipse.osee.ote.ui.mux/src/org/eclipse/osee/ote/ui/mux/view/MuxView.java @@ -29,7 +29,6 @@ import org.eclipse.osee.connection.service.IServiceConnector; import org.eclipse.osee.framework.jdk.core.util.network.PortUtil; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.swt.PeriodicDisplayTask; -import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment; import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironment; import org.eclipse.osee.ote.message.IInstrumentationRegistrationListener; import org.eclipse.osee.ote.message.instrumentation.IOInstrumentation; @@ -817,7 +816,7 @@ public class MuxView extends ViewPart implements ITestConnectionListener, IInstr } @Override - public void onConnectionLost(IServiceConnector connector, IHostTestEnvironment testHost) { + public void onConnectionLost(IServiceConnector connector) { handleConnectionLostStatus(); } diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/connection/ScriptManager.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/connection/ScriptManager.java index 3d805449558..d41059dfbe8 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/connection/ScriptManager.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/connection/ScriptManager.java @@ -25,7 +25,6 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.ote.core.environment.UserTestSessionKey; -import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment; import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironment; import org.eclipse.osee.ote.core.environment.status.IServiceStatusListener; import org.eclipse.osee.ote.core.environment.status.TestComplete; @@ -118,12 +117,12 @@ public abstract class ScriptManager implements Runnable { event.getEnvironment().removeStatusListener((IServiceStatusListener) event.getConnector().findExport(statusListenerImpl)); return false; } catch (RemoteException e) { - TestManagerPlugin.log(Level.SEVERE, "problems removing listener", e); + TestManagerPlugin.log(Level.INFO, "problems removing listener", e); return true; } }
- public boolean onConnectionLost(IHostTestEnvironment testHost) { + public boolean onConnectionLost() { connectedEnv = null; sessionKey = null; guidToScriptTask.clear(); diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/PageManager.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/PageManager.java index 8dd64e1c7ad..6e034fc25ad 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/PageManager.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/PageManager.java @@ -13,7 +13,6 @@ package org.eclipse.osee.ote.ui.test.manager.core; import java.util.ArrayList;
import java.util.List;
import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment;
import org.eclipse.osee.ote.service.ConnectionEvent;
import org.eclipse.osee.ote.ui.test.manager.ITestManagerFactory;
import org.eclipse.osee.ote.ui.test.manager.pages.AdvancedPage;
@@ -173,10 +172,10 @@ public class PageManager { return problemEncountered;
}
- public boolean onConnectionLost(IHostTestEnvironment testHost) {
+ public boolean onConnectionLost() {
boolean problemEncountered = false;
for (TestManagerPage page : pages) {
- problemEncountered |= page.onConnectionLost(testHost);
+ problemEncountered |= page.onConnectionLost();
}
return problemEncountered;
}
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditor.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditor.java index 553469d8ae5..db7d45161c7 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditor.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditor.java @@ -517,10 +517,10 @@ public abstract class TestManagerEditor extends MultiPageEditorPart implements I }
@Override
- public void onConnectionLost(IServiceConnector connector, IHostTestEnvironment testHost) {
+ public void onConnectionLost(IServiceConnector connector) {
connectedEnv = null;
connector = null;
- boolean problemEncountered = pageManager.onConnectionLost(testHost);
+ boolean problemEncountered = pageManager.onConnectionLost();
if (problemEncountered) {
Display.getDefault().asyncExec(new Runnable() {
@Override
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/AdvancedPage.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/AdvancedPage.java index 64fc8f9a9aa..d8518816632 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/AdvancedPage.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/AdvancedPage.java @@ -20,7 +20,6 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
import org.eclipse.osee.framework.ui.plugin.widgets.IPropertyStoreBasedControl;
import org.eclipse.osee.framework.ui.plugin.widgets.PropertyStoreControlContributions;
-import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment;
import org.eclipse.osee.ote.service.ConnectionEvent;
import org.eclipse.osee.ote.ui.test.manager.core.TestManagerEditor;
import org.eclipse.osee.ote.ui.test.manager.internal.TestManagerPlugin;
@@ -160,7 +159,7 @@ public class AdvancedPage extends TestManagerPage { }
@Override
- public boolean onConnectionLost(IHostTestEnvironment testHost) {
+ public boolean onConnectionLost() {
return false;
}
}
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/HostPage.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/HostPage.java index f6f809e833d..ed53512bdc2 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/HostPage.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/HostPage.java @@ -10,7 +10,6 @@ *******************************************************************************/
package org.eclipse.osee.ote.ui.test.manager.pages;
-import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment;
import org.eclipse.osee.ote.service.ConnectionEvent;
import org.eclipse.osee.ote.ui.test.manager.core.TestManagerEditor;
import org.eclipse.osee.ote.ui.test.manager.internal.TestManagerPlugin;
@@ -86,7 +85,7 @@ public class HostPage extends TestManagerPage { }
@Override
- public boolean onConnectionLost(IHostTestEnvironment testHost) {
+ public boolean onConnectionLost() {
return false;
}
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/OverviewPage.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/OverviewPage.java index 33d4d2c8e85..61775ce3c45 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/OverviewPage.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/OverviewPage.java @@ -14,7 +14,6 @@ import java.util.HashMap; import java.util.Map;
import org.eclipse.osee.framework.plugin.core.IActionable;
import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
-import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment;
import org.eclipse.osee.ote.service.ConnectionEvent;
import org.eclipse.osee.ote.ui.test.manager.core.TestManagerEditor;
import org.eclipse.osee.ote.ui.test.manager.internal.TestManagerPlugin;
@@ -165,7 +164,7 @@ public class OverviewPage extends TestManagerPage implements IActionable { }
@Override
- public boolean onConnectionLost(IHostTestEnvironment testHost) {
+ public boolean onConnectionLost() {
return false;
}
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/ScriptPage.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/ScriptPage.java index 0e0e74ca3ab..c41a48b1750 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/ScriptPage.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/ScriptPage.java @@ -20,7 +20,6 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment;
import org.eclipse.osee.ote.service.ConnectionEvent;
import org.eclipse.osee.ote.ui.test.manager.OteTestManagerImage;
import org.eclipse.osee.ote.ui.test.manager.configuration.LoadWidget;
@@ -442,8 +441,8 @@ public abstract class ScriptPage extends TestManagerPage { }
@Override
- public boolean onConnectionLost(IHostTestEnvironment testHost) {
- boolean result = getScriptManager().onConnectionLost(testHost);
+ public boolean onConnectionLost() {
+ boolean result = getScriptManager().onConnectionLost();
Display.getDefault().asyncExec(new Runnable() {
@Override
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/TestManagerPage.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/TestManagerPage.java index 4eef33fee40..d54b870140d 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/TestManagerPage.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/pages/TestManagerPage.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.ote.ui.test.manager.pages; -import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment; import org.eclipse.osee.ote.service.ConnectionEvent; import org.eclipse.osee.ote.ui.test.manager.core.TestManagerEditor; import org.eclipse.swt.SWT; @@ -82,7 +81,7 @@ public abstract class TestManagerPage extends ScrolledComposite { public abstract boolean onDisconnect(ConnectionEvent event); - public abstract boolean onConnectionLost(IHostTestEnvironment testHost); + public abstract boolean onConnectionLost(); @Override public void dispose() { diff --git a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/OteRemoteConsole.java b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/OteRemoteConsole.java index e4198347b19..9a2972c25cb 100644 --- a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/OteRemoteConsole.java +++ b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/OteRemoteConsole.java @@ -12,11 +12,9 @@ package org.eclipse.osee.ote.ui; import java.rmi.RemoteException; import java.util.logging.Level; - import org.eclipse.osee.connection.service.IServiceConnector; import org.eclipse.osee.framework.jdk.core.util.IConsoleInputListener; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment; import org.eclipse.osee.ote.core.environment.interfaces.IRemoteCommandConsole; import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironment; import org.eclipse.osee.ote.service.ConnectionEvent; @@ -68,7 +66,7 @@ public class OteRemoteConsole implements IConsoleInputListener, ITestConnectionL } @Override - public void onConnectionLost(IServiceConnector connector, IHostTestEnvironment testHost) { + public void onConnectionLost(IServiceConnector connector) { if (isOteConsoleServiceAvailable()) { getOteConsole().removeInputListener(this); } else { |