Commit 1e3a6376 authored by arbennett's avatar arbennett
Browse files

Merge remote-tracking branch 'origin/next' into andrew/projectgenerator

parents 371b210d f6637992
......@@ -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);
......
......@@ -15,17 +15,18 @@ package org.eclipse.ice.client.widgets;
import org.eclipse.eavp.viz.service.IVizCanvas;
import org.eclipse.eavp.viz.service.IVizService;
import org.eclipse.eavp.viz.service.IVizServiceFactory;
import org.eclipse.eavp.viz.service.geometry.widgets.ShapeTreeView;
import org.eclipse.eavp.viz.service.geometry.widgets.TransformationView;
import org.eclipse.ice.datastructures.ICEObject.IUpdateable;
import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener;
import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.eclipse.eavp.viz.service.geometry.widgets.ShapeTreeView;
import org.eclipse.eavp.viz.service.geometry.widgets.TransformationView;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.widgets.ScrolledForm;
......@@ -117,7 +118,19 @@ public class ICEGeometryPage extends ICEFormPage
* @param geometryComponent
*/
public void setGeometry(GeometryComponent geometryComponent) {
// Unregister from the old component
if (geometryComp != null) {
geometryComp.unregister(this);
}
// Set the component
geometryComp = geometryComponent;
// Register with the new component
if (geometryComp != null) {
geometryComp.register(this);
}
}
/**
......@@ -179,7 +192,8 @@ public class ICEGeometryPage extends ICEFormPage
IVizServiceFactory factory = editor.getVizServiceFactory();
service = factory.get("ICE Geometry Editor");
((ShapeTreeView) getSite().getWorkbenchWindow().getActivePage()
.findView(ShapeTreeView.ID)).setFactory(service.getFactory());
.findView(ShapeTreeView.ID)).setFactory(service.getControllerProviderFactory());
geometryComp.setService(service);
// Create and draw geometry canvas
try {
......@@ -207,7 +221,14 @@ public class ICEGeometryPage extends ICEFormPage
*/
@Override
public void update(IUpdateable component) {
dirty = true;
// If the geometry was updated, the editor is now dirty
PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
@Override
public void run() {
editor.setDirty(true);
};
});
}
@Override
......
......@@ -218,7 +218,7 @@ public class MeshElementTreeViewPropertySource extends PropertySource {
// Get the vertex's location
if (ID_LOCATION.equals(id)) {
double[] loc = vertex.getLocation();
double[] loc = vertex.getTranslation();
for (int i = 0; i < loc.length; i++) {
propertySet.add(((Double) loc[i]).toString());
}
......
......@@ -104,14 +104,14 @@ public class FileEntryTester {
FileEntry entry = new FileEntry();
entry.setProject(project);
// We have 13 files in itemData right now
// We have 7 files in itemData right now
// MAKE SURE WE UPDATE THIS IF IT CHANGES
assertEquals(13, entry.getAllowedValues().size());
assertEquals(7, entry.getAllowedValues().size());
// Now try it where we specify the file extension
FileEntry yamlFiles = new FileEntry("yaml");
yamlFiles.setProject(project);
assertEquals(3, yamlFiles.getAllowedValues().size());
assertEquals(1, yamlFiles.getAllowedValues().size());
// Check that if we add a file and update,
// the allowed values change to record that
......@@ -123,7 +123,7 @@ public class FileEntryTester {
fail();
}
assertEquals(14, entry.getAllowedValues().size());
assertEquals(8, entry.getAllowedValues().size());
try {
file.delete(true, null);
......@@ -143,7 +143,7 @@ public class FileEntryTester {
// so set the expected path.
String separator = System.getProperty("file.separator");
String actualPath = System.getProperty("user.home") + separator + "ICETests"
+ separator + "itemData" + separator + "bison.yaml";
+ separator + "itemData" + separator + "moose_test.yaml";
// Create a FileEntry over yaml files.
FileEntry entry = new FileEntry("yaml");
......@@ -153,7 +153,7 @@ public class FileEntryTester {
assertFalse(entry.setValue("hello.yaml"));
// Set the allowed value.
assertTrue(entry.setValue("bison.yaml"));
assertTrue(entry.setValue("moose_test.yaml"));
// Make sure the IFile was set correctly.
assertEquals(actualPath, entry.getAbsoluteFilePath());
......
......@@ -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);
}
......
......@@ -25,6 +25,7 @@ Import-Package: ca.odell.glazedlists,
org.eclipse.eavp.viz.modeling.base,
org.eclipse.eavp.viz.modeling.properties,
org.eclipse.eavp.viz.service,
org.eclipse.eavp.viz.service.geometry.persistence,
org.eclipse.eavp.viz.service.mesh.datastructures,
org.eclipse.emf.common,
org.eclipse.emf.common.util,
......
......@@ -16,8 +16,11 @@ import java.util.ArrayList;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlTransient;
import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.eclipse.ice.datastructures.form.MeshComponent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -50,6 +53,7 @@ import org.slf4j.LoggerFactory;
* @author Jay Jay Billings
*/
@XmlRootElement(name = "ICEObject")
@XmlSeeAlso({GeometryComponent.class,MeshComponent.class})