diff options
author | Andrew M. Finkbeiner | 2015-03-25 22:39:14 +0000 |
---|---|---|
committer | Andrew Finkbeiner | 2015-04-01 23:02:23 +0000 |
commit | dd4882f80ca8a3140b829dd1d04f4e8eb793a467 (patch) | |
tree | d6b3c4ecc2b72453fc790c2c921ad53c981c35a6 /plugins/org.eclipse.osee.ote.ui.test.manager | |
parent | 6bf2d821135ab0ae0afd78a2c4a167a4f4bd79b2 (diff) | |
download | org.eclipse.osee-dd4882f80ca8a3140b829dd1d04f4e8eb793a467.tar.gz org.eclipse.osee-dd4882f80ca8a3140b829dd1d04f4e8eb793a467.tar.xz org.eclipse.osee-dd4882f80ca8a3140b829dd1d04f4e8eb793a467.zip |
feature[ats_ATS62328]: Update connection logic
Added the oteendpoint for communication with client to server.
this is in preperation for removing rest/activemq from the default test
server so that we can reduce thread usage and dependencies. Also
added the ability to configure and connect to a server from the client
using EventMessages.
feature[ats_ATS107238]: Remove default rest server
Updated some logging and added some more command handlers. Also cleaned
up some server output.
feature[ATS_ATS122200]:
Add IO redirect
Change-Id: If5a39333c1e0362f2c36cffe9f2c3e142881beea
Diffstat (limited to 'plugins/org.eclipse.osee.ote.ui.test.manager')
4 files changed, 28 insertions, 7 deletions
diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditorInput.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditorInput.java index f16a52dc442..1bac0070f78 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditorInput.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditorInput.java @@ -12,10 +12,14 @@ package org.eclipse.osee.ote.ui.test.manager.core; import java.io.File; import java.io.InputStream; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IStorage; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.framework.ui.ws.AWorkspace; import org.eclipse.ui.IFileEditorInput; @@ -28,13 +32,23 @@ public class TestManagerEditorInput implements IFileEditorInput, IPersistableEle private final IFile iFile; public TestManagerEditorInput(File file) { - this(AWorkspace.fileToIFile(file)); + this(getIFile(file)); } public TestManagerEditorInput(IFile iFile) { super(); this.iFile = iFile; } + + private static IFile getIFile(File file){ + IFile ifile = AWorkspace.fileToIFile(file); + if(ifile == null){ + IWorkspace workspace= ResourcesPlugin.getWorkspace(); + IPath location= Path.fromOSString(file.getAbsolutePath()); + ifile= workspace.getRoot().getFileForLocation(location); + } + return ifile; + } /* * @see java.lang.Object#equals(java.lang.Object) @@ -102,6 +116,9 @@ public class TestManagerEditorInput implements IFileEditorInput, IPersistableEle */ @Override public String getName() { + if(iFile == null){ + return "TestManager"; + } return iFile.getName(); } diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditorInputFactory.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditorInputFactory.java index b8a4b81251d..6eefd9b1040 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditorInputFactory.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/core/TestManagerEditorInputFactory.java @@ -23,8 +23,12 @@ public class TestManagerEditorInputFactory implements IElementFactory { @Override public IAdaptable createElement(IMemento memento) { String path = memento.getString("path"); - File file = new File(path); - TestManagerEditorInput input = new TestManagerEditorInput(file); - return input; + if(path != null){ + File file = new File(path); + TestManagerEditorInput input = new TestManagerEditorInput(file); + return input; + } else { + return null; + } } } diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/util/ClassServerInst.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/util/ClassServerInst.java index 54204a98ffc..6eee0601b7e 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/util/ClassServerInst.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/util/ClassServerInst.java @@ -27,10 +27,10 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jdt.core.JavaCore; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.CorePreferences; -import org.eclipse.osee.framework.plugin.core.server.ClassServer; -import org.eclipse.osee.framework.plugin.core.server.PathResourceFinder; import org.eclipse.osee.framework.ui.ws.AJavaProject; import org.eclipse.osee.framework.ui.ws.AWorkspace; +import org.eclipse.osee.ote.classserver.ClassServer; +import org.eclipse.osee.ote.classserver.PathResourceFinder; import org.eclipse.osee.ote.runtimemanager.UserLibResourceFinder; public class ClassServerInst { diff --git a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/util/OTEBuilderResourceFinder.java b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/util/OTEBuilderResourceFinder.java index b1e43657af0..de094c5fd18 100644 --- a/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/util/OTEBuilderResourceFinder.java +++ b/plugins/org.eclipse.osee.ote.ui.test.manager/src/org/eclipse/osee/ote/ui/test/manager/util/OTEBuilderResourceFinder.java @@ -7,7 +7,7 @@ import java.util.logging.Level; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.plugin.core.server.ResourceFinder; +import org.eclipse.osee.ote.classserver.ResourceFinder; import org.eclipse.osee.ote.ui.builder.OTEPackagingBuilder; /** |