Commit 805d843c authored by Robert Smith's avatar Robert Smith
Browse files

Updated EAVP references



Updated references to EAVP classes to reflect their new names. 
Signed-off-by: Robert Smith's avatarRobert Smith <SmithRW@ornl.gov>
parent 27c6722b
......@@ -16,7 +16,7 @@ import static org.junit.Assert.assertTrue;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.ShapeMesh;
import org.eclipse.eavp.viz.modeling.Shape;
import org.eclipse.ice.client.widgets.ICEFormEditor;
import org.eclipse.ice.client.widgets.ICEGeometryPage;
import org.eclipse.ice.datastructures.form.GeometryComponent;
......@@ -44,9 +44,9 @@ public class ICEGeometryPageTester {
GeometryComponent geometryComponent = new GeometryComponent();
GeometryComponent otherGeometryComponent = new GeometryComponent();
geometryComponent.setGeometry(
new ShapeController(new ShapeMesh(), new BasicView()));
new ShapeController(new Shape(), new BasicView()));
geometryComponent.setGeometry(
new ShapeController(new ShapeMesh(), new BasicView()));
new ShapeController(new Shape(), new BasicView()));
// Get ICEGeometryPage to check accessor
ICEFormEditor ICEFormEditor = new ICEFormEditor();
......
......@@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.properties.MeshProperty;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.ShapeMesh;
import org.eclipse.eavp.viz.modeling.Shape;
import org.eclipse.eavp.viz.service.geometry.shapes.GeometryMeshProperty;
import org.eclipse.eavp.viz.service.geometry.shapes.OperatorType;
import org.eclipse.eavp.viz.service.geometry.shapes.ShapeType;
......@@ -51,7 +51,7 @@ public class ShapeTreeContentProviderTest {
ShapeTreeContentProvider shapeProvider = new ShapeTreeContentProvider();
// Create a shape
ShapeMesh geometryModel = new ShapeMesh();
Shape geometryModel = new Shape();
BasicView geometryView = new BasicView();
ShapeController geometryShape = new ShapeController(geometryModel,
geometryView);
......@@ -130,7 +130,7 @@ public class ShapeTreeContentProviderTest {
ShapeTreeContentProvider shapeProvider = new ShapeTreeContentProvider();
// Create a shape
ShapeMesh geometryModel = new ShapeMesh();
Shape geometryModel = new Shape();
BasicView geometryView = new BasicView();
ShapeController geometryShape = new ShapeController(geometryModel,
geometryView);
......@@ -208,7 +208,7 @@ public class ShapeTreeContentProviderTest {
ShapeTreeContentProvider shapeProvider = new ShapeTreeContentProvider();
ShapeMesh geometryModel = new ShapeMesh();
Shape geometryModel = new Shape();
geometryModel.setProperty(MeshProperty.TYPE, ShapeType.Sphere.toString());
BasicView geometryView = new BasicView();
ShapeController geometry = new ShapeController(geometryModel,
......
......@@ -18,7 +18,7 @@ import static org.junit.Assert.assertTrue;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.properties.MeshProperty;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.ShapeMesh;
import org.eclipse.eavp.viz.modeling.Shape;
import org.eclipse.eavp.viz.service.geometry.shapes.GeometryMeshProperty;
import org.eclipse.eavp.viz.service.geometry.shapes.OperatorType;
import org.eclipse.eavp.viz.service.geometry.shapes.ShapeType;
......@@ -67,7 +67,7 @@ public class ShapeTreeLabelProviderTest {
// Any input should produce a null return value
// Create a shape
ShapeMesh geometryModel = new ShapeMesh();
Shape geometryModel = new Shape();
BasicView geometryView = new BasicView();
ShapeController geometryShape = new ShapeController(geometryModel,
geometryView);
......@@ -98,7 +98,7 @@ public class ShapeTreeLabelProviderTest {
// Create some named shapes
// Create a shape
ShapeMesh geometryModel = new ShapeMesh();
Shape geometryModel = new Shape();
BasicView geometryView = new BasicView();
ShapeController geometryShape = new ShapeController(geometryModel,
geometryView);
......
......@@ -28,7 +28,7 @@ import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.base.IController;
import org.eclipse.eavp.viz.modeling.properties.MeshProperty;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.ShapeMesh;
import org.eclipse.eavp.viz.modeling.Shape;
import org.eclipse.ice.datastructures.ICEObject.Component;
import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.junit.Test;
......@@ -53,7 +53,7 @@ public class GeometryComponentTester {
public void checkAddShapes() {
// Create a shape
ShapeMesh geometryModel = new ShapeMesh();
Shape geometryModel = new Shape();
geometryModel.setProperty(MeshProperty.TYPE,
ShapeType.Sphere.toString());
BasicView geometryView = new BasicView();
......@@ -147,7 +147,7 @@ public class GeometryComponentTester {
public void checkNotifications() {
// Create a shape
ShapeMesh geometryModel = new ShapeMesh();
Shape geometryModel = new Shape();
geometryModel.setProperty(MeshProperty.TYPE,
ShapeType.Sphere.toString());
BasicView geometryView = new BasicView();
......@@ -257,7 +257,7 @@ public class GeometryComponentTester {
@Test
public void checkEquality() {
ShapeMesh geometryModel = new ShapeMesh();
Shape geometryModel = new Shape();
geometryModel.setProperty(MeshProperty.TYPE,
ShapeType.Sphere.toString());
BasicView geometryView = new BasicView();
......@@ -354,7 +354,7 @@ public class GeometryComponentTester {
public void checkCreation() {
// Create a shape
ShapeMesh geometryModel = new ShapeMesh();
Shape geometryModel = new Shape();
geometryModel.setProperty(MeshProperty.TYPE,
ShapeType.Sphere.toString());
BasicView geometryView = new BasicView();
......@@ -382,7 +382,7 @@ public class GeometryComponentTester {
public void checkCopying() {
// Create a shape
ShapeMesh geometryModel = new ShapeMesh();
Shape geometryModel = new Shape();
geometryModel.setProperty(MeshProperty.TYPE,
ShapeType.Sphere.toString());
BasicView geometryView = new BasicView();
......@@ -400,12 +400,12 @@ public class GeometryComponentTester {
geometry.setName("Geometry name");
// Set up GeometryComponent-specific stuff
ShapeMesh sphereModel = new ShapeMesh();
Shape sphereModel = new Shape();
sphereModel.setProperty(MeshProperty.TYPE, ShapeType.Sphere.toString());
BasicView sphereView = new BasicView();
ShapeController sphere1 = new ShapeController(sphereModel, sphereView);
ShapeMesh cubeModel = new ShapeMesh();
Shape cubeModel = new Shape();
cubeModel.setProperty(GeometryMeshProperty.OPERATOR,
OperatorType.Union.toString());
BasicView cubeView = new BasicView();
......
......@@ -21,18 +21,18 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.eavp.viz.service.mesh.datastructures.NekPolygonController;
import org.eclipse.eavp.viz.service.mesh.datastructures.NekPolygonMesh;
import org.eclipse.eavp.viz.service.mesh.datastructures.NekPolygon;
import org.eclipse.eavp.viz.modeling.base.BasicController;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.EdgeController;
import org.eclipse.eavp.viz.modeling.DetailedEdgeController;
import org.eclipse.eavp.viz.modeling.DetailedEdgeMesh;
import org.eclipse.eavp.viz.modeling.DetailedEdge;
import org.eclipse.eavp.viz.modeling.base.IController;
import org.eclipse.eavp.viz.modeling.LinearEdgeMesh;
import org.eclipse.eavp.viz.modeling.LinearEdge;
import org.eclipse.eavp.viz.modeling.properties.MeshCategory;
import org.eclipse.eavp.viz.modeling.properties.MeshProperty;
import org.eclipse.eavp.viz.modeling.VertexController;
import org.eclipse.eavp.viz.modeling.VertexMesh;
import org.eclipse.eavp.viz.modeling.Vertex;
import org.eclipse.ice.datastructures.form.MeshComponent;
import org.junit.Test;
......@@ -119,13 +119,13 @@ public class MeshComponentTester {
/* ---- Make a square of area 1 cornered on the origin. ---- */
// Set up the vertices.
vertices.add(new VertexController(new VertexMesh(0f, 0f, 0f),
vertices.add(new VertexController(new Vertex(0f, 0f, 0f),
new BasicView()));
vertices.add(new VertexController(new VertexMesh(1f, 0f, 0f),
vertices.add(new VertexController(new Vertex(1f, 0f, 0f),
new BasicView()));
vertices.add(new VertexController(new VertexMesh(1f, 0f, 1f),
vertices.add(new VertexController(new Vertex(1f, 0f, 1f),
new BasicView()));
vertices.add(new VertexController(new VertexMesh(0f, 0f, 1f),
vertices.add(new VertexController(new Vertex(0f, 0f, 1f),
new BasicView()));
for (int i = 0; i < 4; i++) {
allVertices.add(vertices.get(i));
......@@ -136,7 +136,7 @@ public class MeshComponentTester {
for (int i = 0; i < 4; i++) {
edges.add(
new EdgeController(
new LinearEdgeMesh(
new LinearEdge(
(VertexController) vertices.get(i),
(VertexController) vertices
.get((i + 1) % 4)),
......@@ -146,7 +146,7 @@ public class MeshComponentTester {
Integer.toString(allEdges.size()));
}
// Initialize the polygon.
polygon = new NekPolygonController(new NekPolygonMesh(),
polygon = new NekPolygonController(new NekPolygon(),
new BasicView());
for (IController edge : edges) {
polygon.addEntityToCategory(edge, MeshCategory.EDGES);
......@@ -181,9 +181,9 @@ public class MeshComponentTester {
vertices.set(0,
(IController) ((BasicController) vertices.get(3)).clone());
vertices.set(1, vertices.get(2));
vertices.set(2, new VertexController(new VertexMesh(1f, 0f, 2f),
vertices.set(2, new VertexController(new Vertex(1f, 0f, 2f),
new BasicView()));
vertices.set(3, new VertexController(new VertexMesh(0f, 0f, 2f),
vertices.set(3, new VertexController(new Vertex(0f, 0f, 2f),
new BasicView()));
for (int i = 2; i < 4; i++) {
allVertices.add(vertices.get(i));
......@@ -195,7 +195,7 @@ public class MeshComponentTester {
for (int i = 1; i < 4; i++) {
edges.set(i,
new EdgeController(
new LinearEdgeMesh(
new LinearEdge(
(VertexController) vertices.get(i),
(VertexController) vertices
.get((i + 1) % 4)),
......@@ -205,7 +205,7 @@ public class MeshComponentTester {
Integer.toString(allEdges.size()));
}
// Initialize the polygon.
polygon = new NekPolygonController(new NekPolygonMesh(),
polygon = new NekPolygonController(new NekPolygon(),
new BasicView());
for (IController edge : edges) {
polygon.addEntityToCategory(edge, MeshCategory.EDGES);
......@@ -235,11 +235,11 @@ public class MeshComponentTester {
/* ---- Add a new square with the same bottom-right vertex. ---- */
// Set up the vertices.
vertices.set(0, vertices.get(2));
vertices.set(1, new VertexController(new VertexMesh(2f, 0f, 2f),
vertices.set(1, new VertexController(new Vertex(2f, 0f, 2f),
new BasicView()));
vertices.set(2, new VertexController(new VertexMesh(2f, 0f, 3f),
vertices.set(2, new VertexController(new Vertex(2f, 0f, 3f),
new BasicView()));
vertices.set(3, new VertexController(new VertexMesh(1f, 0f, 3f),
vertices.set(3, new VertexController(new Vertex(1f, 0f, 3f),
new BasicView()));
for (int i = 1; i < 4; i++) {
allVertices.add(vertices.get(i));
......@@ -250,7 +250,7 @@ public class MeshComponentTester {
for (int i = 0; i < 4; i++) {
edges.set(i,
new EdgeController(
new LinearEdgeMesh(
new LinearEdge(
(VertexController) vertices.get(i),
(VertexController) vertices
.get((i + 1) % 4)),
......@@ -260,7 +260,7 @@ public class MeshComponentTester {
Integer.toString(allEdges.size()));
}
// Initialize the polygon.
polygon = new NekPolygonController(new NekPolygonMesh(),
polygon = new NekPolygonController(new NekPolygon(),
new BasicView());
for (IController edge : edges) {
polygon.addEntityToCategory(edge, MeshCategory.EDGES);
......@@ -289,13 +289,13 @@ public class MeshComponentTester {
/* ---- Add a disjoint polygon (attached to nothing). ---- */
// Set up the vertices.
vertices.set(0, new VertexController(new VertexMesh(10f, 0, 10f),
vertices.set(0, new VertexController(new Vertex(10f, 0, 10f),
new BasicView()));
vertices.set(1, new VertexController(new VertexMesh(11f, 0f, 10f),
vertices.set(1, new VertexController(new Vertex(11f, 0f, 10f),
new BasicView()));
vertices.set(2, new VertexController(new VertexMesh(11f, 0f, 11f),
vertices.set(2, new VertexController(new Vertex(11f, 0f, 11f),
new BasicView()));
vertices.set(3, new VertexController(new VertexMesh(10f, 0f, 11f),
vertices.set(3, new VertexController(new Vertex(10f, 0f, 11f),
new BasicView()));
for (int i = 0; i < 4; i++) {
allVertices.add(vertices.get(i));
......@@ -306,7 +306,7 @@ public class MeshComponentTester {
for (int i = 0; i < 4; i++) {
edges.set(i,
new EdgeController(
new LinearEdgeMesh(
new LinearEdge(
(VertexController) vertices.get(i),
(VertexController) vertices
.get((i + 1) % 4)),
......@@ -316,7 +316,7 @@ public class MeshComponentTester {
Integer.toString(allEdges.size()));
}
// Initialize the polygon.
polygon = new NekPolygonController(new NekPolygonMesh(),
polygon = new NekPolygonController(new NekPolygon(),
new BasicView());
for (IController edge : edges) {
polygon.addEntityToCategory(edge, MeshCategory.EDGES);
......@@ -508,11 +508,11 @@ public class MeshComponentTester {
// Create a simple polygon to add the the component.
ArrayList<VertexController> vertices = new ArrayList<VertexController>();
vertices.add(new VertexController(new VertexMesh(0f, 0f, 0f),
vertices.add(new VertexController(new Vertex(0f, 0f, 0f),
new BasicView()));
vertices.add(new VertexController(new VertexMesh(1f, 0f, 0f),
vertices.add(new VertexController(new Vertex(1f, 0f, 0f),
new BasicView()));
vertices.add(new VertexController(new VertexMesh(0f, 0f, 1f),
vertices.add(new VertexController(new Vertex(0f, 0f, 1f),
new BasicView()));
for (int i = 0; i < 3; i++) {
vertices.get(i).setProperty(MeshProperty.ID,
......@@ -522,13 +522,13 @@ public class MeshComponentTester {
for (int i = 0; i < 3; i++) {
edges.add(
new DetailedEdgeController(
new DetailedEdgeMesh(vertices.get(i),
new DetailedEdge(vertices.get(i),
vertices.get((i + 1) % 3)),
new BasicView()));
edges.get(i).setProperty(MeshProperty.ID, Integer.toString(i + 1));
}
NekPolygonController polygon = new NekPolygonController(
new NekPolygonMesh(), new BasicView());
new NekPolygon(), new BasicView());
for (IController edge : edges) {
polygon.addEntityToCategory(edge, MeshCategory.EDGES);
}
......@@ -548,18 +548,18 @@ public class MeshComponentTester {
// Set up the unequalObject.
unequalObject.setName("YAMC");
vertices.set(2, new VertexController(new VertexMesh(0f, 0f, 2f),
vertices.set(2, new VertexController(new Vertex(0f, 0f, 2f),
new BasicView()));
vertices.get(2).setProperty(MeshProperty.ID, "3");
for (int i = 1; i < 3; i++) {
edges.set(i,
new DetailedEdgeController(
new DetailedEdgeMesh(vertices.get(i),
new DetailedEdge(vertices.get(i),
vertices.get((i + 1) % 3)),
new BasicView()));
edges.get(i).setProperty(MeshProperty.ID, Integer.toString(i + 1));
}
polygon = new NekPolygonController(new NekPolygonMesh(),
polygon = new NekPolygonController(new NekPolygon(),
new BasicView());
for (IController edge : edges) {
polygon.addEntityToCategory(edge, MeshCategory.EDGES);
......@@ -613,11 +613,11 @@ public class MeshComponentTester {
// Create a simple polygon to add the the component.
ArrayList<VertexController> vertices = new ArrayList<VertexController>();
vertices.add(new VertexController(new VertexMesh(0f, 0f, 0f),
vertices.add(new VertexController(new Vertex(0f, 0f, 0f),
new BasicView()));
vertices.add(new VertexController(new VertexMesh(1f, 0f, 0f),
vertices.add(new VertexController(new Vertex(1f, 0f, 0f),
new BasicView()));
vertices.add(new VertexController(new VertexMesh(0f, 0f, 1f),
vertices.add(new VertexController(new Vertex(0f, 0f, 1f),
new BasicView()));
for (int i = 0; i < 3; i++) {
vertices.get(i).setProperty(MeshProperty.ID,
......@@ -627,13 +627,13 @@ public class MeshComponentTester {
for (int i = 0; i < 3; i++) {
edges.add(
new EdgeController(
new LinearEdgeMesh(vertices.get(i),
new LinearEdge(vertices.get(i),
vertices.get((i + 1) % 3)),
new BasicView()));
edges.get(i).setProperty(MeshProperty.ID, Integer.toString(i + 1));
}
NekPolygonController shape = new NekPolygonController(
new NekPolygonMesh(), new BasicView());
new NekPolygon(), new BasicView());
for (IController edge : edges) {
shape.addEntityToCategory(edge, MeshCategory.EDGES);
}
......@@ -641,20 +641,20 @@ public class MeshComponentTester {
vertices.set(0, vertices.get(1));
vertices.set(1, vertices.get(2));
vertices.set(2, new VertexController(new VertexMesh(1f, 0f, 1f),
vertices.set(2, new VertexController(new Vertex(1f, 0f, 1f),
new BasicView()));
vertices.get(2).setProperty(MeshProperty.ID, "4");
edges.set(0, edges.get(1));
for (int i = 1; i < 3; i++) {
edges.set(i,
new EdgeController(
new LinearEdgeMesh(vertices.get(i),
new LinearEdge(vertices.get(i),
vertices.get((i + 1) % 3)),
new BasicView()));
edges.get(i).setProperty(MeshProperty.ID, Integer.toString(i + 3));
}
NekPolygonController shape2 = new NekPolygonController(
new NekPolygonMesh(), new BasicView());
new NekPolygon(), new BasicView());
for (IController edge : edges) {
shape2.addEntityToCategory(edge, MeshCategory.EDGES);
}
......
......@@ -24,7 +24,7 @@ import org.eclipse.eavp.viz.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.eavp.viz.datastructures.VizObject.IManagedUpdateableListener;
import org.eclipse.eavp.viz.datastructures.VizObject.SubscriptionType;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.ShapeMesh;
import org.eclipse.eavp.viz.modeling.Shape;
import org.eclipse.eavp.viz.modeling.properties.MeshProperty;
import org.eclipse.eavp.viz.service.IVizService;
import org.eclipse.eavp.viz.service.geometry.persistence.PersistableShape;
......@@ -155,7 +155,7 @@ public class GeometryComponent extends ICEObject
*/
@XmlElement(name = "Geometry")
private PersistableShape getPersistableGeometry() {
return PersistableShape.compress((ShapeMesh) geometry.getModel());
return PersistableShape.compress((Shape) geometry.getModel());
}
/**
......
......@@ -17,7 +17,7 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.ShapeMesh;
import org.eclipse.eavp.viz.modeling.Shape;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.ice.datastructures.entry.IEntry;
import org.eclipse.ice.datastructures.entry.StringEntry;
......@@ -72,7 +72,7 @@ public class DemoModel extends Model {
geomComp.setDescription("A geometry");
geomComp.setContext("demo-geometry");
geomComp.setGeometry(
new ShapeController(new ShapeMesh(), new BasicView()));
new ShapeController(new Shape(), new BasicView()));
// Create a data component
DataComponent dataComp = new DataComponent();
......
......@@ -10,7 +10,7 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.ShapeMesh;
import org.eclipse.eavp.viz.modeling.Shape;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.ice.datastructures.ICEObject.Component;
import org.eclipse.ice.datastructures.form.*;
......@@ -128,7 +128,7 @@ public class VisualizationCompleteModel extends Model {
//Create the geometry component
ShapeController geometryRoot = new ShapeController(new
ShapeMesh(), new BasicView());
Shape(), new BasicView());
GeometryComponent geometryComponent = new
GeometryComponent();
geometryComponent.setGeometry(geometryRoot);
......
......@@ -20,7 +20,7 @@ import org.eclipse.ice.io.serializable.IWriter;
import org.eclipse.ice.item.model.Model;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.ShapeMesh;
import org.eclipse.eavp.viz.modeling.Shape;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.eclipse.ice.datastructures.form.MeshComponent;
......
......@@ -17,7 +17,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.eclipse.core.resources.IProject;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.ShapeMesh;
import org.eclipse.eavp.viz.modeling.Shape;
import org.eclipse.ice.datastructures.form.Form;
import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.eclipse.ice.item.Item;
......@@ -96,7 +96,7 @@ public class GeometryEditor extends Item {
GeometryComponent geometryComp = new GeometryComponent();
geometryComp.setGeometry(
new ShapeController(new ShapeMesh(), new BasicView()));
new ShapeController(new Shape(), new BasicView()));
geometryComp.setName("Geometry Data");
geometryComp.setId(1);
geometryComp.setDescription(getDescription());
......
......@@ -14,14 +14,14 @@ package org.eclipse.ice.nek5000.test;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.EdgeController;
import org.eclipse.eavp.viz.modeling.EdgeMesh;
import org.eclipse.eavp.viz.modeling.Edge;
import org.eclipse.eavp.viz.modeling.factory.IControllerProvider;
import org.eclipse.eavp.viz.modeling.factory.IControllerProviderFactory;
import org.eclipse.eavp.viz.modeling.base.IMesh;
import org.eclipse.eavp.viz.modeling.VertexController;
import org.eclipse.eavp.viz.modeling.VertexMesh;
import org.eclipse.eavp.viz.modeling.Vertex;
import org.eclipse.eavp.viz.service.mesh.datastructures.NekPolygonController;
import org.eclipse.eavp.viz.service.mesh.datastructures.NekPolygonMesh;
import org.eclipse.eavp.viz.service.mesh.datastructures.NekPolygon;
/**
* A factory which produces controllers with dummy views for meshes read from
......@@ -43,7 +43,7 @@ public class TestNekControllerFactory implements IControllerProviderFactory {
// If the model is an edge component, create an IControllerProvider that
// creates EdgeControllers
if (model instanceof EdgeMesh) {
if (model instanceof Edge) {
return new IControllerProvider<EdgeController>() {
@Override
......@@ -53,14 +53,14 @@ public class TestNekControllerFactory implements IControllerProviderFactory {
// both in a
// shape controller
BasicView view = new BasicView();
return new EdgeController((EdgeMesh) model, view);
return new EdgeController((Edge) model, view);
}
};
}
// If the model is an vertex component, create an IControllerProvider
// that creates VertexControllers
else if (model instanceof VertexMesh) {
else if (model instanceof Vertex) {
return new IControllerProvider<VertexController>() {
@Override
......@@ -70,14 +70,14 @@ public class TestNekControllerFactory implements IControllerProviderFactory {
// both in a
// shape controller
BasicView view = new BasicView();
return new VertexController((VertexMesh) model, view);
return new VertexController((Vertex) model, view);
}
};
}
// If the model is a face component, create an IControllerProvider that
// creates NekPolygonControllers
else if (model instanceof NekPolygonMesh) {
else if (model instanceof NekPolygon) {
return new IControllerProvider<NekPolygonController>() {
@Override
public NekPolygonController createController(IMesh model) {
......@@ -86,7 +86,7 @@ public class TestNekControllerFactory implements IControllerProviderFactory {
// both in a
// shape controller
BasicView view = new BasicView();
return new NekPolygonController((NekPolygonMesh) model,
return new NekPolygonController((NekPolygon) model,