Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen J. Aguilar2010-10-13 19:39:04 +0000
committerRyan D. Brooks2010-10-13 19:39:04 +0000
commit95c52b8f983f97e0d60b71e80d6002db0b27bca3 (patch)
treeb502d22046c75991afc82a6f4320b6bd0405b46d
parent2a31a1ebce91900e86b826b96ffcab6d4089367e (diff)
downloadorg.eclipse.osee-95c52b8f983f97e0d60b71e80d6002db0b27bca3.tar.gz
org.eclipse.osee-95c52b8f983f97e0d60b71e80d6002db0b27bca3.tar.xz
org.eclipse.osee-95c52b8f983f97e0d60b71e80d6002db0b27bca3.zip
refactor: Remove unused code
-rw-r--r--plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/Activator.java4
-rw-r--r--plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/SessionDelegate.java1
-rw-r--r--plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/ClientSession.java13
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/AbstractRemoteSession.java3
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/IRemoteUserSession.java4
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/IUserSession.java2
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java32
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironmentInterface.java3
8 files changed, 5 insertions, 57 deletions
diff --git a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/Activator.java b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/Activator.java
index 67b6b509a05..3cc40a4e4b3 100644
--- a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/Activator.java
+++ b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/Activator.java
@@ -11,17 +11,15 @@
package org.eclipse.osee.ote.service;
import java.util.logging.Level;
+
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.ote.service.core.ConnectionServiceTracker;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
public class Activator implements BundleActivator {
- private ServiceRegistration registration;
private ConnectionServiceTracker connectionServiceTracker;
- private MessagingGatewayBindTracker messagingGatewayTracker;
private ExportClassLoaderCreationTracker exportClassLoaderCreationTracker;
@Override
diff --git a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/SessionDelegate.java b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/SessionDelegate.java
index 816f3f1723d..b04ae744daf 100644
--- a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/SessionDelegate.java
+++ b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/SessionDelegate.java
@@ -40,5 +40,4 @@ public interface SessionDelegate {
long getFileDate(String path) throws Exception;
- String getFileVersion(String path) throws Exception;
}
diff --git a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/ClientSession.java b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/ClientSession.java
index 51428218f41..e2deea5b0da 100644
--- a/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/ClientSession.java
+++ b/plugins/org.eclipse.osee.ote.client/src/org/eclipse/osee/ote/service/core/ClientSession.java
@@ -15,6 +15,7 @@ import java.rmi.RemoteException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Level;
+
import org.eclipse.osee.connection.service.IServiceConnector;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -81,18 +82,6 @@ public class ClientSession extends AbstractRemoteSession {
}
@Override
- public String getFileVersion(String workspacePath) throws RemoteException {
- if (sessionDelegate != null) {
- try {
- return sessionDelegate.getFileVersion(workspacePath);
- } catch (Exception ex) {
- throw new RemoteException("failed to get the file version" + workspacePath, ex);
- }
- }
- throw new IllegalStateException("session delegate not set");
- }
-
- @Override
public boolean isAlive() throws RemoteException {
try {
if (lock.tryLock(TIMEOUT, TimeUnit.MINUTES)) {
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/AbstractRemoteSession.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/AbstractRemoteSession.java
index 5812387f1fd..40be86edae0 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/AbstractRemoteSession.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/AbstractRemoteSession.java
@@ -35,9 +35,6 @@ public abstract class AbstractRemoteSession implements IRemoteUserSession {
public abstract long getFileDate(String workspacePath) throws RemoteException;
@Override
- public abstract String getFileVersion(String workspacePath) throws RemoteException;
-
- @Override
public abstract boolean isAlive() throws RemoteException;
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/IRemoteUserSession.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/IRemoteUserSession.java
index 00a3b891e85..82f55f7c5b4 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/IRemoteUserSession.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/IRemoteUserSession.java
@@ -12,6 +12,7 @@ package org.eclipse.osee.ote.core;
import java.rmi.Remote;
import java.rmi.RemoteException;
+
import org.eclipse.osee.framework.messaging.Message;
import org.eclipse.osee.ote.core.framework.prompt.IPassFailPromptResponse;
import org.eclipse.osee.ote.core.framework.prompt.IResumeResponse;
@@ -34,9 +35,6 @@ public interface IRemoteUserSession extends Remote, IUserSession {
public long getFileDate(String workspacePath) throws RemoteException;
@Override
- public String getFileVersion(String workspacePath) throws RemoteException;
-
- @Override
public void initiatePassFailPrompt(IPassFailPromptResponse prompt) throws RemoteException;
@Override
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/IUserSession.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/IUserSession.java
index a5024ed2164..feb76a9ba84 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/IUserSession.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/IUserSession.java
@@ -30,8 +30,6 @@ public interface IUserSession {
public long getFileDate(String workspacePath) throws Exception;
- public String getFileVersion(String workspacePath) throws Exception;
-
public void initiateInformationalPrompt(String message) throws Exception;
public void initiatePassFailPrompt(IPassFailPromptResponse prompt) throws Exception;
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java
index 2bcf5ff28e8..4dc734a33fb 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java
@@ -37,6 +37,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.logging.Level;
+
import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.connection.service.IServiceConnector;
import org.eclipse.osee.connection.service.LocalConnector;
@@ -488,37 +489,6 @@ public abstract class TestEnvironment implements TestEnvironmentInterface, ITest
}
@Override
- public File getClientResource(String workspacePath) throws Exception, IOException {
- if (activeUser == null) {
- throw new IllegalStateException("No active user");
- }
- String version = activeUser.getFileVersion(workspacePath);
- File resource = getResourceFile(workspacePath, version);
- if (!resource.exists()) {
- byte[] bytes = activeUser.getFile(workspacePath);
- if (bytes != null) {
- Lib.writeBytesToFile(bytes, resource);
- }
- }
- return resource;
- }
-
- private File getResourceDir() {
- File file =
- new File(
- System.getProperty("java.io.tmpdir") + File.separator + System.getProperty("user.name") + File.separator + "oseeresources");
- file.mkdirs();
- return file;
- }
-
- private File getResourceFile(String workspacePath, String version) {
- String filename = workspacePath.replace("/", "_");
- int extension = filename.lastIndexOf('.');
- filename = filename.substring(0, extension - 1) + version.toUpperCase() + filename.substring(extension);
- return new File(getResourceDir(), filename);
- }
-
- @Override
public void setActiveUser(UserTestSessionKey key) {
activeUser = (IUserSession) users.get(key);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironmentInterface.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironmentInterface.java
index 8df436a4cc2..9a6f04e8722 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironmentInterface.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironmentInterface.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.concurrent.Callable;
+
import org.eclipse.osee.connection.service.IServiceConnector;
import org.eclipse.osee.ote.core.IUserSession;
import org.eclipse.osee.ote.core.OSEEPerson1_4;
@@ -99,8 +100,6 @@ public interface TestEnvironmentInterface {
public IUserSession getActiveUser();
- public File getClientResource(String workspacePath) throws Exception, IOException;
-
public void setActiveUser(UserTestSessionKey key);
public File getOutDir();

Back to the top