Commit 0771b6f6 authored by Robert Smith's avatar Robert Smith
Browse files

Added jme3 service bundle



Adds viz.service.jme3 bundle, which contains many jme3 related classes
pulled out of the ICE-centered bundles. This bundle contains generic
resources for use with the geometry editor, mesh editor, and reactor
editor jme3 services.
Signed-off-by: Robert Smith's avatarRobert Smith <SmithRW@ornl.gov>
parent 9e37dc2f
......@@ -360,6 +360,7 @@
<module>../tests/org.eclipse.ice.viz.service.test</module>
<module>../src/org.eclipse.ice.viz.service.geometry</module>
<module>../tests/org.eclipse.ice.viz.service.geometry.test</module>
<module>../src/org.eclipse.ice.viz.service.jme3</module>
<module>../src/org.eclipse.ice.viz.service.visit</module>
<module>../tests/org.eclipse.ice.viz.service.visit.test</module>
<module>../src/org.eclipse.ice.xolotl</module>
......
......@@ -13,7 +13,6 @@ Import-Package: com.sun.jersey.api.client,
org.eclipse.core.runtime;version="3.4.0",
org.eclipse.equinox.app;version="1.1.0",
org.eclipse.ice.client.common,
org.eclipse.ice.client.widgets.geometry,
org.eclipse.ice.core.iCore,
org.eclipse.ice.datastructures.ICEObject,
org.eclipse.ice.datastructures.componentVisitor,
......@@ -22,6 +21,7 @@ Import-Package: com.sun.jersey.api.client,
org.eclipse.ice.iclient,
org.eclipse.ice.iclient.uiwidgets,
org.eclipse.ice.item,
org.eclipse.ice.viz.service.jme3.geometry,
org.eclipse.jface.action,
org.eclipse.jface.databinding.swt,
org.eclipse.jface.dialogs,
......
......@@ -118,6 +118,7 @@ Import-Package: com.jme3.animation,
org.eclipse.ice.datastructures.form.geometry,
org.eclipse.ice.reactor.plant,
org.eclipse.ice.viz.service.geometry,
org.eclipse.ice.viz.service.jme3.shapes,
org.eclipse.jface.databinding.swt,
org.eclipse.ui.views.properties.tabbed,
org.osgi.framework,
......
......@@ -19,8 +19,8 @@ import java.util.Map;
import org.eclipse.ice.client.widgets.geometry.ShapeTreeContentProvider.BlankShape;
import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.eclipse.ice.datastructures.form.geometry.ICEShape;
import org.eclipse.ice.viz.service.geometry.OperatorType;
import org.eclipse.ice.viz.service.geometry.ShapeType;
import org.eclipse.ice.viz.service.jme3.shapes.OperatorType;
import org.eclipse.ice.viz.service.jme3.shapes.ShapeType;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ITreeSelection;
......
......@@ -17,7 +17,7 @@ import java.util.ArrayList;
import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.eclipse.ice.datastructures.form.geometry.ICEShape;
import org.eclipse.ice.viz.service.geometry.ShapeType;
import org.eclipse.ice.viz.service.jme3.shapes.ShapeType;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ITreeSelection;
......
......@@ -17,8 +17,8 @@ import java.net.URL;
import org.eclipse.ice.datastructures.ICEObject.ICEObject;
import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.eclipse.ice.datastructures.form.geometry.ICEShape;
import org.eclipse.ice.viz.service.geometry.OperatorType;
import org.eclipse.ice.viz.service.geometry.Transformation;
import org.eclipse.ice.viz.service.jme3.shapes.OperatorType;
import org.eclipse.ice.viz.service.jme3.shapes.Transformation;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.resource.ImageDescriptor;
......
......@@ -20,9 +20,9 @@ import org.eclipse.ice.datastructures.ICEObject.IUpdateable;
import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener;
import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.eclipse.ice.datastructures.form.geometry.ICEShape;
import org.eclipse.ice.viz.service.geometry.OperatorType;
import org.eclipse.ice.viz.service.geometry.ShapeType;
import org.eclipse.ice.viz.service.geometry.Transformation;
import org.eclipse.ice.viz.service.jme3.shapes.OperatorType;
import org.eclipse.ice.viz.service.jme3.shapes.ShapeType;
import org.eclipse.ice.viz.service.jme3.shapes.Transformation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......
......@@ -14,9 +14,9 @@ package org.eclipse.ice.client.widgets.geometry;
import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener;
import org.eclipse.ice.datastructures.form.geometry.ICEShape;
import org.eclipse.ice.viz.service.geometry.OperatorType;
import org.eclipse.ice.viz.service.geometry.ShapeType;
import org.eclipse.ice.viz.service.geometry.Transformation;
import org.eclipse.ice.viz.service.jme3.shapes.OperatorType;
import org.eclipse.ice.viz.service.jme3.shapes.ShapeType;
import org.eclipse.ice.viz.service.jme3.shapes.Transformation;
import com.jme3.material.Material;
import com.jme3.math.Quaternion;
......
......@@ -17,8 +17,8 @@ import java.util.ArrayList;
import org.eclipse.ice.client.widgets.geometry.ShapeTreeContentProvider.BlankShape;
import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.eclipse.ice.datastructures.form.geometry.ICEShape;
import org.eclipse.ice.viz.service.geometry.OperatorType;
import org.eclipse.ice.viz.service.geometry.ShapeType;
import org.eclipse.ice.viz.service.jme3.shapes.OperatorType;
import org.eclipse.ice.viz.service.jme3.shapes.ShapeType;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.viewers.ISelectionChangedListener;
......
......@@ -13,7 +13,7 @@
package org.eclipse.ice.client.widgets.geometry;
import org.eclipse.ice.datastructures.form.geometry.ICEShape;
import org.eclipse.ice.viz.service.geometry.Transformation;
import org.eclipse.ice.viz.service.jme3.shapes.Transformation;
import org.eclipse.jface.databinding.swt.IWidgetValueProperty;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.swt.SWT;
......
......@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.ice.datastructures;bundle-version="2.0.0",
org.eclipse.core.runtime,
org.eclipse.nebula.widgets.nattable.core;bundle-version="1.3.0",
org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="1.3.0",
org.eclipse.remote.ui;bundle-version="2.0.0"
org.eclipse.remote.ui;bundle-version="2.0.0",
org.eclipse.swt
Import-Package: com.jme3.app,
org.apache.commons.io,
org.eclipse.core.commands.common,
......@@ -22,7 +23,6 @@ Import-Package: com.jme3.app,
org.eclipse.ice.client.common,
org.eclipse.ice.client.common.internal,
org.eclipse.ice.client.common.properties,
org.eclipse.ice.client.widgets.geometry,
org.eclipse.ice.client.widgets.jme,
org.eclipse.ice.client.widgets.mesh,
org.eclipse.ice.client.widgets.mesh.properties,
......@@ -31,6 +31,7 @@ Import-Package: com.jme3.app,
org.eclipse.ice.reactor,
org.eclipse.ice.viz.service,
org.eclipse.ice.viz.service.geometry,
org.eclipse.ice.viz.service.jme3.geometry,
org.eclipse.remote.core,
org.eclipse.ui.views.properties,
org.eclipse.ui.views.properties.tabbed,
......
......@@ -42,7 +42,6 @@ import org.eclipse.ice.iclient.uiwidgets.IProcessEventListener;
import org.eclipse.ice.iclient.uiwidgets.ISimpleResourceProvider;
import org.eclipse.ice.iclient.uiwidgets.IUpdateEventListener;
import org.eclipse.ice.viz.service.IVizServiceFactory;
import org.eclipse.ice.viz.service.geometry.Geometry;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
......
......@@ -12,9 +12,6 @@
*******************************************************************************/
package org.eclipse.ice.client.widgets;
import org.eclipse.ice.client.widgets.geometry.GeometryCompositeFactory;
import org.eclipse.ice.client.widgets.geometry.ShapeTreeView;
import org.eclipse.ice.client.widgets.geometry.TransformationView;
import org.eclipse.ice.datastructures.ICEObject.IUpdateable;
import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener;
import org.eclipse.ice.datastructures.form.GeometryComponent;
......@@ -27,6 +24,7 @@ import org.eclipse.ui.PartInitException;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.eclipse.ice.viz.service.jme3.ShapeTree;
/**
* <p>
......@@ -122,7 +120,7 @@ public class ICEGeometryPage extends ICEFormPage implements IUpdateableListener
ShapeTreeView shapeTreeView = (ShapeTreeView) getSite()
.getWorkbenchWindow().getActivePage()
.findView(ShapeTreeView.ID);
shapeTreeView.setGeometry(geometryComp);
shapeTreeView.setGeometry(geometryComp.getGeometry().getGeometry());
return;
}
......@@ -166,7 +164,7 @@ public class ICEGeometryPage extends ICEFormPage implements IUpdateableListener
Composite parent = pageForm.getBody();
// Use the GeometryCompositeFactory
GeometryCompositeFactory geomFactory = new GeometryCompositeFactory();
geomFactory.renderGeometryComposite(parent, geometryComp);
geomFactory.renderGeometryComposite(parent, geometryComp.getGeometry().getGeometry());
getFocus();
......
......@@ -17,7 +17,6 @@ import java.util.List;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.ice.client.common.ActionTree;
import org.eclipse.ice.client.widgets.geometry.TransformationView;
import org.eclipse.ice.client.widgets.jme.ViewFactory;
import org.eclipse.ice.client.widgets.mesh.IMeshSelectionListener;
import org.eclipse.ice.client.widgets.mesh.MeshAppState;
......@@ -36,6 +35,7 @@ import org.eclipse.ice.datastructures.form.mesh.Polygon;
import org.eclipse.ice.datastructures.form.mesh.PolynomialEdge;
import org.eclipse.ice.datastructures.form.mesh.Quad;
import org.eclipse.ice.datastructures.form.mesh.Vertex;
import org.eclipse.ice.viz.service.jme3.geometry.TransformationView;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.ToolBarManager;
......
......@@ -385,7 +385,7 @@ public class ICEResourcePage extends ICEFormPage implements ISelectionListener,
// Try to create a plot with the service. If one was created, it
// will need to go into the map of plots.
try {
plot = service.createPlot(resource.getPath());
plot = (IPlot) service.createPlot(resource.getPath());
if (plot != null) {
plots.put(getPlotKey(resource), plot);
break;
......
......@@ -27,6 +27,7 @@ Import-Package: ca.odell.glazedlists,
org.eclipse.emf.ecore.xmi.impl,
org.eclipse.emf.ecore.xmi.util,
org.eclipse.ice.viz.service.geometry,
org.eclipse.ice.viz.service.jme3.shapes,
org.eclipse.xsd,
org.osgi.framework;version="1.6.0",
org.slf4j;version="1.7.2"
......
......@@ -28,7 +28,6 @@ import org.eclipse.ice.datastructures.ICEObject.IUpdateable;
import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener;
import org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor;
import org.eclipse.ice.datastructures.form.geometry.ICEGeometry;
import org.eclipse.ice.viz.service.geometry.Geometry;
/**
* <p>
* Composite container for a Geometry along with any
......
......@@ -25,8 +25,8 @@ import javax.xml.bind.annotation.XmlTransient;
import org.eclipse.ice.datastructures.ICEObject.IUpdateable;
import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener;
import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.eclipse.ice.viz.service.geometry.Geometry;
import org.eclipse.ice.viz.service.geometry.IShape;
import org.eclipse.ice.viz.service.jme3.shapes.Geometry;
import org.eclipse.ice.viz.service.jme3.shapes.IShape;
/**
* This is a wrapper class around a Geometry object. It delegates almost all
......
......@@ -22,18 +22,18 @@ import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import org.eclipse.ice.viz.service.geometry.AbstractShape;
import org.eclipse.ice.viz.service.geometry.ComplexShape;
import org.eclipse.ice.viz.service.geometry.IShape;
import org.eclipse.ice.viz.service.geometry.OperatorType;
import org.eclipse.ice.viz.service.geometry.PrimitiveShape;
import org.eclipse.ice.viz.service.geometry.ShapeType;
import org.eclipse.ice.viz.service.geometry.Transformation;
import org.eclipse.ice.datastructures.ICEObject.Component;
import org.eclipse.ice.datastructures.ICEObject.ICEObject;
import org.eclipse.ice.datastructures.ICEObject.IUpdateable;
import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener;
import org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor;
import org.eclipse.ice.viz.service.jme3.shapes.AbstractShape;
import org.eclipse.ice.viz.service.jme3.shapes.ComplexShape;
import org.eclipse.ice.viz.service.jme3.shapes.IShape;
import org.eclipse.ice.viz.service.jme3.shapes.OperatorType;
import org.eclipse.ice.viz.service.jme3.shapes.PrimitiveShape;
import org.eclipse.ice.viz.service.jme3.shapes.ShapeType;
import org.eclipse.ice.viz.service.jme3.shapes.Transformation;
/**
* This is a wrapper class around an IShape object. It delegates almost all work
......@@ -454,32 +454,6 @@ public class ICEShape extends ICEObject implements Component, IUpdateable,
return null;
}
/**
* Mutator method for the wrapped shape's name.
*
* @param newName
* The string to set the wrapped shape's name to.
*/
public void setShapeName(String newName) {
shape.setName(newName);
// A change has been made, notify listeners
notifyListeners();
}
/**
* Mutator method for the wrapped shape's ID
*
* @param newID
* The integer to set the wrapped shape's ID to
*/
public void setShapeId(int newID) {
shape.setId(newID);
// A change has been made, notify listeners
notifyListeners();
}
/**
* Mutator method for the wrapped shape's ShapeType
*
......
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