Commit 3df3f40d authored by Robert Smith's avatar Robert Smith

Fixed Declaritive Service bindings and updated EAVP references

Fixed the Declaritive Services so that bound methods are no longer
static for bug #347. 

Also updated package names for EAVP imports.
Signed-off-by: Robert Smith's avatarRobert Smith <smithrw@ornl.gov>
parent b17fcaf0
...@@ -32,7 +32,7 @@ Import-Package: ...@@ -32,7 +32,7 @@ Import-Package:
org.eclipse.e4.ui.model, org.eclipse.e4.ui.model,
org.eclipse.e4.ui.model.application, org.eclipse.e4.ui.model.application,
org.eclipse.e4.ui.model.application.ui, org.eclipse.e4.ui.model.application.ui,
org.eclipse.eavp.viz.datastructures, org.eclipse.eavp.viz.datastructures.ui,
org.eclipse.eavp.viz.datastructures.VizObject, org.eclipse.eavp.viz.datastructures.VizObject,
org.eclipse.eavp.viz.modeling, org.eclipse.eavp.viz.modeling,
org.eclipse.eavp.viz.modeling.base, org.eclipse.eavp.viz.modeling.base,
......
...@@ -39,7 +39,7 @@ public class VizServiceFactoryHolder { ...@@ -39,7 +39,7 @@ public class VizServiceFactoryHolder {
* @param input * @param input
* the VizServiceFactory to hold * the VizServiceFactory to hold
*/ */
public static void setVizServiceFactory(IVizServiceFactory input) { public void setVizServiceFactory(IVizServiceFactory input) {
VizServiceFactoryHolder.factory = input; VizServiceFactoryHolder.factory = input;
return; return;
...@@ -51,7 +51,7 @@ public class VizServiceFactoryHolder { ...@@ -51,7 +51,7 @@ public class VizServiceFactoryHolder {
* *
* @input A VizServiceFactory to remove. * @input A VizServiceFactory to remove.
*/ */
public static void unsetVizServiceFactory(IVizServiceFactory input) { public void unsetVizServiceFactory(IVizServiceFactory input) {
if (input == factory) { if (input == factory) {
factory = null; factory = null;
} }
......
...@@ -15,7 +15,7 @@ Import-Package: org.eclipse.core.resources, ...@@ -15,7 +15,7 @@ Import-Package: org.eclipse.core.resources,
org.eclipse.e4.core.di.annotations, org.eclipse.e4.core.di.annotations,
org.eclipse.e4.ui.model.application, org.eclipse.e4.ui.model.application,
org.eclipse.e4.ui.model.application.ui, org.eclipse.e4.ui.model.application.ui,
org.eclipse.eavp.viz.datastructures, org.eclipse.eavp.viz.datastructures.ui,
org.eclipse.eavp.viz.datastructures.VizObject, org.eclipse.eavp.viz.datastructures.VizObject,
org.eclipse.eavp.viz.modeling, org.eclipse.eavp.viz.modeling,
org.eclipse.eavp.viz.modeling.base, org.eclipse.eavp.viz.modeling.base,
......
...@@ -10,7 +10,7 @@ Import-Package: com.google.common.collect;version="10.0.1", ...@@ -10,7 +10,7 @@ Import-Package: com.google.common.collect;version="10.0.1",
com.spotify.docker.client, com.spotify.docker.client,
com.spotify.docker.client.messages, com.spotify.docker.client.messages,
org.apache.commons.io, org.apache.commons.io,
org.eclipse.eavp.viz.datastructures, org.eclipse.eavp.viz.datastructures.ui,
org.eclipse.eavp.viz.datastructures.VizObject, org.eclipse.eavp.viz.datastructures.VizObject,
org.eclipse.eavp.viz.modeling, org.eclipse.eavp.viz.modeling,
org.eclipse.eavp.viz.modeling.base, org.eclipse.eavp.viz.modeling.base,
......
...@@ -6,7 +6,7 @@ Bundle-Version: 2.2.0.qualifier ...@@ -6,7 +6,7 @@ Bundle-Version: 2.2.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.ice.datastructures Require-Bundle: org.eclipse.ice.datastructures
Import-Package: org.eclipse.core.resources, Import-Package: org.eclipse.core.resources,
org.eclipse.eavp.viz.datastructures, org.eclipse.eavp.viz.datastructures.ui,
org.eclipse.eavp.viz.datastructures.VizObject, org.eclipse.eavp.viz.datastructures.VizObject,
org.eclipse.eavp.viz.service.mesh.datastructures, org.eclipse.eavp.viz.service.mesh.datastructures,
org.eclipse.ice.item org.eclipse.ice.item
......
...@@ -43,7 +43,7 @@ public class VizServiceFactoryHolder { ...@@ -43,7 +43,7 @@ public class VizServiceFactoryHolder {
* @param input * @param input
* the VizServiceFactory to hold * the VizServiceFactory to hold
*/ */
public static void setVizServiceFactory(IVizServiceFactory input) { public void setVizServiceFactory(IVizServiceFactory input) {
VizServiceFactoryHolder.factory = input; VizServiceFactoryHolder.factory = input;
Logger staticLogger = LoggerFactory Logger staticLogger = LoggerFactory
.getLogger(VizServiceFactoryHolder.class); .getLogger(VizServiceFactoryHolder.class);
...@@ -65,7 +65,7 @@ public class VizServiceFactoryHolder { ...@@ -65,7 +65,7 @@ public class VizServiceFactoryHolder {
* *
* @input A VizServiceFactory to remove. * @input A VizServiceFactory to remove.
*/ */
public static void unsetVizServiceFactory(IVizServiceFactory input) { public void unsetVizServiceFactory(IVizServiceFactory input) {
if (input == factory) { if (input == factory) {
factory = null; factory = null;
} }
......
...@@ -24,6 +24,7 @@ import org.eclipse.eavp.viz.service.BasicVizServiceFactory; ...@@ -24,6 +24,7 @@ import org.eclipse.eavp.viz.service.BasicVizServiceFactory;
import org.eclipse.eavp.viz.service.IVizService; import org.eclipse.eavp.viz.service.IVizService;
import org.eclipse.eavp.viz.service.IVizServiceFactory; import org.eclipse.eavp.viz.service.IVizServiceFactory;
import org.eclipse.eavp.viz.service.csv.CSVVizService; import org.eclipse.eavp.viz.service.csv.CSVVizService;
import org.eclipse.ice.datastructures.internal.VizServiceFactoryHolder;
import org.eclipse.ice.datastructures.resource.ICEResource; import org.eclipse.ice.datastructures.resource.ICEResource;
import org.eclipse.ice.datastructures.resource.ResourceHandler; import org.eclipse.ice.datastructures.resource.ResourceHandler;
import org.eclipse.ice.datastructures.resource.VizResource; import org.eclipse.ice.datastructures.resource.VizResource;
...@@ -54,7 +55,7 @@ public class ResourceHandlerTester { ...@@ -54,7 +55,7 @@ public class ResourceHandlerTester {
// Set up a basic factory with a CSVVizService for the test // Set up a basic factory with a CSVVizService for the test
IVizServiceFactory factory = new TestVizServiceFactory(); IVizServiceFactory factory = new TestVizServiceFactory();
factory.register(new CSVVizService()); factory.register(new CSVVizService());
org.eclipse.ice.datastructures.internal.VizServiceFactoryHolder new VizServiceFactoryHolder()
.setVizServiceFactory(factory); .setVizServiceFactory(factory);
// First try get the resources with invalid file paths // First try get the resources with invalid file paths
......
...@@ -50,6 +50,7 @@ import org.eclipse.ice.datastructures.entry.IEntry; ...@@ -50,6 +50,7 @@ import org.eclipse.ice.datastructures.entry.IEntry;
import org.eclipse.ice.datastructures.form.DataComponent; import org.eclipse.ice.datastructures.form.DataComponent;
import org.eclipse.ice.datastructures.form.Form; import org.eclipse.ice.datastructures.form.Form;
import org.eclipse.ice.datastructures.form.FormStatus; import org.eclipse.ice.datastructures.form.FormStatus;
import org.eclipse.ice.datastructures.internal.VizServiceFactoryHolder;
import org.eclipse.ice.datastructures.jaxbclassprovider.ICEJAXBClassProvider; import org.eclipse.ice.datastructures.jaxbclassprovider.ICEJAXBClassProvider;
import org.eclipse.ice.datastructures.resource.ICEResource; import org.eclipse.ice.datastructures.resource.ICEResource;
import org.eclipse.ice.datastructures.resource.VizResource; import org.eclipse.ice.datastructures.resource.VizResource;
...@@ -980,7 +981,7 @@ public class ItemTester implements ItemListener { ...@@ -980,7 +981,7 @@ public class ItemTester implements ItemListener {
// Set up a basic factory with a CSVVizService for the test // Set up a basic factory with a CSVVizService for the test
IVizServiceFactory factory = new TestVizServiceFactory(); IVizServiceFactory factory = new TestVizServiceFactory();
factory.register(new CSVVizService()); factory.register(new CSVVizService());
org.eclipse.ice.datastructures.internal.VizServiceFactoryHolder new VizServiceFactoryHolder()
.setVizServiceFactory(factory); .setVizServiceFactory(factory);
// Setup the project // Setup the project
......
...@@ -17,7 +17,6 @@ import static org.junit.Assert.assertNotNull; ...@@ -17,7 +17,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import java.awt.Polygon;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
...@@ -38,11 +37,8 @@ import org.eclipse.core.runtime.Path; ...@@ -38,11 +37,8 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.eavp.viz.modeling.Edge; import org.eclipse.eavp.viz.modeling.Edge;
import org.eclipse.eavp.viz.modeling.EdgeController; import org.eclipse.eavp.viz.modeling.EdgeController;
import org.eclipse.eavp.viz.modeling.Face; import org.eclipse.eavp.viz.modeling.Face;
import org.eclipse.eavp.viz.modeling.FaceController;
import org.eclipse.eavp.viz.modeling.Vertex; import org.eclipse.eavp.viz.modeling.Vertex;
import org.eclipse.eavp.viz.modeling.VertexController; import org.eclipse.eavp.viz.modeling.VertexController;
import org.eclipse.eavp.viz.modeling.base.BasicController;
import org.eclipse.eavp.viz.modeling.base.BasicMesh;
import org.eclipse.eavp.viz.modeling.base.BasicView; import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.base.IController; import org.eclipse.eavp.viz.modeling.base.IController;
import org.eclipse.eavp.viz.modeling.base.IMesh; import org.eclipse.eavp.viz.modeling.base.IMesh;
...@@ -237,7 +233,7 @@ public class NekModelTester { ...@@ -237,7 +233,7 @@ public class NekModelTester {
IVizService service = new FakeVizService(); IVizService service = new FakeVizService();
IVizServiceFactory factory = new BasicVizServiceFactory(); IVizServiceFactory factory = new BasicVizServiceFactory();
factory.register(service); factory.register(service);
VizServiceFactoryHolder.setVizServiceFactory(factory); new VizServiceFactoryHolder().setVizServiceFactory(factory);
// Local Declarations // Local Declarations
NekModel model = new NekModel(projectSpace, NekModel model = new NekModel(projectSpace,
......
...@@ -8,5 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 ...@@ -8,5 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.junit;bundle-version="4.11.0" Require-Bundle: org.junit;bundle-version="4.11.0"
Bundle-Vendor: Oak Ridge National Laboratory Bundle-Vendor: Oak Ridge National Laboratory
Import-Package: ca.odell.glazedlists.gui, Import-Package: ca.odell.glazedlists.gui,
org.eclipse.eavp.viz.datastructures, org.eclipse.eavp.viz.datastructures.ui,
org.eclipse.eavp.viz.service.mesh.datastructures org.eclipse.eavp.viz.service.mesh.datastructures
...@@ -58,6 +58,9 @@ public class MaterialsDatabaseTester extends AbstractSWTTester { ...@@ -58,6 +58,9 @@ public class MaterialsDatabaseTester extends AbstractSWTTester {
// before ICE's UI has had time to properly update. // before ICE's UI has had time to properly update.
SWTBotPreferences.PLAYBACK_DELAY = 50; SWTBotPreferences.PLAYBACK_DELAY = 50;
//Close the welcome view
bot.viewByTitle("Welcome").close();
// Open the ICE perspective // Open the ICE perspective
bot.menu("Window").menu("Perspective").menu("Open Perspective") bot.menu("Window").menu("Perspective").menu("Open Perspective")
.menu("Other...").click(); .menu("Other...").click();
...@@ -363,7 +366,7 @@ public class MaterialsDatabaseTester extends AbstractSWTTester { ...@@ -363,7 +366,7 @@ public class MaterialsDatabaseTester extends AbstractSWTTester {
// Search for the custom material and open it // Search for the custom material and open it
bot.text(1).typeText("Custom"); bot.text(1).typeText("Custom");
bot.tree().select(0); bot.tree().select(5);
// Check the property name for the first data row. // Check the property name for the first data row.
cellName = (String) realTable.getDataValueByPosition(1, 1); cellName = (String) realTable.getDataValueByPosition(1, 1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment