Commit 026034c6 authored by Robert Smith's avatar Robert Smith
Browse files

Integrated JavaFX with OSGi



Modified the core OSGi launch to properly load JavaFX classes.
Signed-off-by: Robert Smith's avatarRobert Smith <SmithRW@ornl.gov>
parent 902b0174
......@@ -17,7 +17,7 @@
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.osgi.service.http.port=8080 -Dice.projectLocation=/home/bkj/ICEFiles -Dcom.sun.jersey.config.property.packages=org.eclipse.ice.core.iCore -Dosgi.framework.extensions=org.eclipse.fx.osgi;"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.osgi.service.http.port=8080 -Dice.projectLocation=/home/bkj/ICEFiles -Dcom.sun.jersey.config.property.packages=org.eclipse.ice.core.iCore -Dorg.osgi.framework.bundle.parent=ext;"/>
<stringAttribute key="pde.version" value="3.3"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="target_bundles" value="com.sun.jersey.jersey-servlet@default:default,org.eclipse.core.expressions@default:default,org.apache.lucene.core@default:default,org.apache.commons.codec@default:default,org.hamcrest.core@default:default,com.sun.jersey.jersey-core@default:default,org.apache.jasper@default:default,org.apache.lucene.highlighter@default:default,org.eclipse.core.commands@default:default,javax.ws.rs.jsr311-api@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.contenttype@default:default,org.eclipse.osgi@-1:true,javax.activation@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.resources@default:default,org.apache.lucene.snowball@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,com.sun.jersey.jersey-json@default:default,org.eclipse.equinox.weaving.hook@default:false,org.junit*4.8.2.v4_8_2_v20110321-1705@default:default,jackson-mapper-asl@default:default,org.eclipse.ui@default:default,org.eclipse.core.databinding.observable@default:default,com.sun.jersey.jersey-client@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.databinding@default:default,jackson-xc@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.variables@default:default,javax.xml.stream@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.ant.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.forms@default:default,org.eclipse.swt@default:default,javax.xml.bind@default:default,org.eclipse.equinox.app@default:default,org.codehaus.jettison.jettison@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.apache.lucene.spellchecker@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.util@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,com.jcraft.jsch@default:default,org.objectweb.asm@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.eclipse.equinox.preferences@default:default,org.apache.ant@default:default,org.eclipse.jface.databinding@default:default,javax.servlet.jsp@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.http.jetty@default:default,org.apache.lucene.queries@default:default,javax.mail@default:default,org.eclipse.jface@default:default,org.eclipse.ui.intro@default:default,commonj.sdo@default:default,javax.persistence@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.platform@default:default,org.apache.lucene@default:default,org.eclipse.equinox.http.servletbridge@default:default,org.mortbay.jetty.util@default:default,javax.transaction@default:false,jackson-core-asl@default:default,com.sun.jersey.jersey-server@default:default,com.ibm.icu@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.help.base@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,jackson-jaxrs@default:default,org.eclipse.core.jobs@default:default,org.eclipse.help@default:default,javax.xml@default:default,osgi.enterprise@default:default,org.apache.lucene.misc@default:default,org.eclipse.swt.gtk.linux.x86_64*3.7.2.v3740f@default:false,org.eclipse.core.runtime@default:true,org.apache.commons.el@default:default,org.apache.lucene.memory@default:default,javax.servlet@default:default,org.eclipse.swt.gtk.linux.x86_64*3.7.1.v3738a@default:false"/>
......
......@@ -23,7 +23,7 @@ import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateableListener;
import org.eclipse.ice.viz.service.datastructures.VizObject.IVizUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.IVizUpdateableListener;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
/**
* <p>
......@@ -143,14 +143,14 @@ public class TestComponentListener implements IManagedUpdateableListener, IUpdat
* @see org.eclipse.ice.viz.service.datastructures.VizObject.IManagedVizUpdateableListener#getSubscriptions(org.eclipse.ice.viz.service.datastructures.VizObject.IManagedVizUpdateable)
*/
@Override
public ArrayList<UpdateableSubscriptionType> getSubscriptions(IManagedUpdateable source) {
ArrayList<UpdateableSubscriptionType> types = new ArrayList<UpdateableSubscriptionType>();
types.add(UpdateableSubscriptionType.ALL);
public ArrayList<SubscriptionType> getSubscriptions(IManagedUpdateable source) {
ArrayList<SubscriptionType> types = new ArrayList<SubscriptionType>();
types.add(SubscriptionType.ALL);
return types;
}
@Override
public void update(IManagedUpdateable component, UpdateableSubscriptionType[] type) {
public void update(IManagedUpdateable component, SubscriptionType[] type) {
// Update the flag
wasNotified.set(true);
......
......@@ -26,7 +26,7 @@ import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener;
import org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateableListener;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.viz.service.modeling.ShapeController;
/**
......@@ -363,7 +363,7 @@ public class GeometryComponent extends ICEObject implements Component,
*/
@Override
public void update(IManagedUpdateable component,
UpdateableSubscriptionType[] type) {
SubscriptionType[] type) {
notifyListeners();
......@@ -377,12 +377,12 @@ public class GeometryComponent extends ICEObject implements Component,
* service.datastructures.VizObject.IVizUpdateable)
*/
@Override
public ArrayList<UpdateableSubscriptionType> getSubscriptions(
public ArrayList<SubscriptionType> getSubscriptions(
IManagedUpdateable source) {
// Register for all event types
ArrayList<UpdateableSubscriptionType> types = new ArrayList<UpdateableSubscriptionType>();
types.add(UpdateableSubscriptionType.ALL);
ArrayList<SubscriptionType> types = new ArrayList<SubscriptionType>();
types.add(SubscriptionType.ALL);
return types;
}
}
\ No newline at end of file
......@@ -24,7 +24,7 @@ import org.eclipse.ice.datastructures.ICEObject.ICEObject;
import org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateableListener;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.ice.viz.service.modeling.AbstractMesh;
......@@ -329,12 +329,12 @@ public class MeshComponent extends ICEObject
*/
@Override
public void update(IManagedUpdateable component,
UpdateableSubscriptionType[] types) {
SubscriptionType[] types) {
// Only pass on updates for the root part's list of children changing,
// in order to refresh the tree view of components.
for (UpdateableSubscriptionType type : types) {
if (type == UpdateableSubscriptionType.CHILD) {
for (SubscriptionType type : types) {
if (type == SubscriptionType.CHILD) {
notifyListeners();
}
}
......@@ -349,12 +349,12 @@ public class MeshComponent extends ICEObject
* service.datastructures.VizObject.IVizUpdateable)
*/
@Override
public ArrayList<UpdateableSubscriptionType> getSubscriptions(
public ArrayList<SubscriptionType> getSubscriptions(
IManagedUpdateable source) {
// Register for all event types
ArrayList<UpdateableSubscriptionType> types = new ArrayList<UpdateableSubscriptionType>();
types.add(UpdateableSubscriptionType.ALL);
ArrayList<SubscriptionType> types = new ArrayList<SubscriptionType>();
types.add(SubscriptionType.ALL);
return types;
}
......
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
......@@ -13,7 +13,7 @@ package org.eclipse.ice.viz.service.geometry.reactor;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.ice.viz.service.modeling.TubeMesh;
import org.slf4j.Logger;
......@@ -153,8 +153,8 @@ public class PipeMesh extends TubeMesh {
entities.put(category, catList);
// Notify listeners of the new child
UpdateableSubscriptionType[] eventTypes = {
UpdateableSubscriptionType.CHILD };
SubscriptionType[] eventTypes = {
SubscriptionType.CHILD };
updateManager.notifyListeners(eventTypes);
}
......
......@@ -14,7 +14,7 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.viz.service.geometry.shapes.OperatorType;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.ice.viz.service.modeling.AbstractView;
......@@ -254,7 +254,7 @@ public class FXShapeController extends ShapeController
*/
@Override
public void update(IManagedUpdateable component,
UpdateableSubscriptionType[] type) {
SubscriptionType[] type) {
// If the view updated, recursively refresh all children and propagate
// the update to own listeners
......@@ -310,26 +310,26 @@ public class FXShapeController extends ShapeController
* service.datastructures.VizObject.IVizUpdateable)
*/
@Override
public ArrayList<UpdateableSubscriptionType> getSubscriptions(
public ArrayList<SubscriptionType> getSubscriptions(
IManagedUpdateable source) {
// Create a list of events to subscribe to
ArrayList<UpdateableSubscriptionType> types = new ArrayList<UpdateableSubscriptionType>();
ArrayList<SubscriptionType> types = new ArrayList<SubscriptionType>();
// Listen only to new child events from the model
if (source == model) {
types.add(UpdateableSubscriptionType.CHILD);
types.add(UpdateableSubscriptionType.SELECTION);
types.add(SubscriptionType.CHILD);
types.add(SubscriptionType.SELECTION);
}
// Listen only to transformation events from the view
else if (source == view) {
types.add(UpdateableSubscriptionType.TRANSFORMATION);
types.add(SubscriptionType.TRANSFORMATION);
}
// For other objects, register for everything
else {
types.add(UpdateableSubscriptionType.ALL);
types.add(SubscriptionType.ALL);
}
return types;
}
......
......@@ -11,7 +11,7 @@
package org.eclipse.ice.viz.service.javafx.geometry.datatypes;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.viz.service.geometry.shapes.ShapeType;
import org.eclipse.ice.viz.service.javafx.canvas.TransformGizmo;
import org.eclipse.ice.viz.service.javafx.internal.Util;
......@@ -408,7 +408,7 @@ public class FXShapeView extends AbstractView implements IWireFramePart {
@Override
public void update(IManagedUpdateable component,
UpdateableSubscriptionType[] type) {
SubscriptionType[] type) {
// If the transformation updated, update the JavaFX transformation
if (component == transformation) {
......@@ -441,8 +441,8 @@ public class FXShapeView extends AbstractView implements IWireFramePart {
}
// Notify listeners of the change
UpdateableSubscriptionType[] eventTypes = {
UpdateableSubscriptionType.WIREFRAME };
SubscriptionType[] eventTypes = {
SubscriptionType.WIREFRAME };
updateManager.notifyListeners(eventTypes);
}
......
......@@ -11,7 +11,7 @@
package org.eclipse.ice.viz.service.javafx.geometry.plant;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.viz.service.geometry.reactor.HeatExchangerController;
import org.eclipse.ice.viz.service.geometry.reactor.HeatExchangerMesh;
import org.eclipse.ice.viz.service.modeling.AbstractView;
......@@ -56,14 +56,14 @@ public class FXHeatExchangerController extends HeatExchangerController {
*/
@Override
public void update(IManagedUpdateable component,
UpdateableSubscriptionType[] type) {
SubscriptionType[] type) {
// Queue any messages from the view refresh
updateManager.enqueue();
// Refresh the view, ignoring wireframe events from anything except this
// object's view
if (type[0] != UpdateableSubscriptionType.WIREFRAME
if (type[0] != SubscriptionType.WIREFRAME
|| component == view) {
view.refresh(model);
}
......
......@@ -12,7 +12,7 @@ package org.eclipse.ice.viz.service.javafx.geometry.plant;
import java.util.List;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.viz.service.geometry.reactor.Extrema;
import org.eclipse.ice.viz.service.geometry.reactor.HeatExchangerMesh;
import org.eclipse.ice.viz.service.geometry.reactor.JunctionController;
......@@ -447,8 +447,8 @@ public class FXHeatExchangerView extends AbstractView
}
// Notify listeners of the change
UpdateableSubscriptionType[] eventTypes = {
UpdateableSubscriptionType.WIREFRAME };
SubscriptionType[] eventTypes = {
SubscriptionType.WIREFRAME };
updateManager.notifyListeners(eventTypes);
}
......
......@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.ice.viz.service.javafx.geometry.plant;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.viz.service.geometry.reactor.ReactorController;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.ice.viz.service.modeling.AbstractMesh;
......@@ -70,8 +70,8 @@ public class FXPlantViewRootController extends AbstractController
}
// Fire update for the added child
UpdateableSubscriptionType[] eventTypes = new UpdateableSubscriptionType[] {
UpdateableSubscriptionType.CHILD };
SubscriptionType[] eventTypes = new SubscriptionType[] {
SubscriptionType.CHILD };
updateManager.notifyListeners(eventTypes);
}
......@@ -90,8 +90,8 @@ public class FXPlantViewRootController extends AbstractController
}
// Fire update for the added child
UpdateableSubscriptionType[] eventTypes = new UpdateableSubscriptionType[] {
UpdateableSubscriptionType.CHILD };
SubscriptionType[] eventTypes = new SubscriptionType[] {
SubscriptionType.CHILD };
updateManager.notifyListeners(eventTypes);
}
......
......@@ -11,7 +11,7 @@
package org.eclipse.ice.viz.service.javafx.mesh.datatypes;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.viz.service.javafx.internal.Util;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.ice.viz.service.modeling.AbstractMesh;
......@@ -214,7 +214,7 @@ public class FXLinearEdgeView extends AbstractView {
@Override
public void update(IManagedUpdateable component,
UpdateableSubscriptionType[] type) {
SubscriptionType[] type) {
// If the transformation updated, update the JavaFX transformation
if (component == transformation) {
......
......@@ -11,7 +11,7 @@
package org.eclipse.ice.viz.service.javafx.mesh.datatypes;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.ice.viz.service.modeling.AbstractView;
import org.eclipse.ice.viz.service.modeling.VertexController;
......@@ -56,7 +56,7 @@ public class FXVertexController extends VertexController {
*/
@Override
public void update(IManagedUpdateable component,
UpdateableSubscriptionType[] types) {
SubscriptionType[] types) {
// Queue any messages from the view refresh
updateManager.enqueue();
......@@ -66,9 +66,9 @@ public class FXVertexController extends VertexController {
if (component == model) {
// Only property or selection changes will change the view
for (UpdateableSubscriptionType type : types) {
if (type == UpdateableSubscriptionType.PROPERTY
|| type == UpdateableSubscriptionType.SELECTION) {
for (SubscriptionType type : types) {
if (type == SubscriptionType.PROPERTY
|| type == SubscriptionType.SELECTION) {
view.refresh(model);
break;
}
......
......@@ -11,7 +11,7 @@
package org.eclipse.ice.viz.service.javafx.mesh.datatypes;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.viz.service.javafx.internal.Util;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.ice.viz.service.modeling.AbstractMesh;
......@@ -189,7 +189,7 @@ public class FXVertexView extends AbstractView {
*/
@Override
public void update(IManagedUpdateable component,
UpdateableSubscriptionType[] type) {
SubscriptionType[] type) {
// If the transformation updated, update the JavaFX transformation
if (component == transformation) {
......
......@@ -15,7 +15,7 @@ import java.util.List;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateableListener;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.viz.service.javafx.internal.Util;
import org.eclipse.ice.viz.service.javafx.scene.model.IAttachment;
import org.eclipse.ice.viz.service.javafx.scene.model.INode;
......@@ -145,7 +145,7 @@ public class FXAttachment extends AbstractAttachment {
geom.register(new IManagedUpdateableListener() {
@Override
public void update(IManagedUpdateable component,
UpdateableSubscriptionType[] type) {
SubscriptionType[] type) {
javafx.application.Platform.runLater(new Runnable() {
@Override
......@@ -158,12 +158,12 @@ public class FXAttachment extends AbstractAttachment {
}
@Override
public ArrayList<UpdateableSubscriptionType> getSubscriptions(
public ArrayList<SubscriptionType> getSubscriptions(
IManagedUpdateable source) {
// Register to receive all updates
ArrayList<UpdateableSubscriptionType> types = new ArrayList<UpdateableSubscriptionType>();
types.add(UpdateableSubscriptionType.ALL);
ArrayList<SubscriptionType> types = new ArrayList<SubscriptionType>();
types.add(SubscriptionType.ALL);
return types;
}
});
......
......@@ -22,7 +22,7 @@ import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateableListener;
import org.eclipse.ice.viz.service.datastructures.VizObject.IVizUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.IVizUpdateableListener;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
/**
* <p>
......@@ -123,18 +123,18 @@ public class TestComponentListener
}
@Override
public ArrayList<UpdateableSubscriptionType> getSubscriptions(
public ArrayList<SubscriptionType> getSubscriptions(
IManagedUpdateable source) {
// Get all events
ArrayList<UpdateableSubscriptionType> subs = new ArrayList<UpdateableSubscriptionType>();
subs.add(UpdateableSubscriptionType.ALL);
ArrayList<SubscriptionType> subs = new ArrayList<SubscriptionType>();
subs.add(SubscriptionType.ALL);
return subs;
}
@Override
public void update(IManagedUpdateable component,
UpdateableSubscriptionType[] type) {
SubscriptionType[] type) {
// Set the flag
wasNotified.set(true);
......
......@@ -18,7 +18,7 @@ import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.viz.service.modeling.AbstractView;
import org.eclipse.ice.viz.service.modeling.EdgeController;
import org.eclipse.ice.viz.service.modeling.EdgeMesh;
......@@ -101,7 +101,7 @@ public class TestEdge extends EdgeController {
*/
@Override
public void update(IManagedUpdateable component,
UpdateableSubscriptionType[] type) {
SubscriptionType[] type) {
// Call the super's update method and update the flag.
super.update(component, type);
......
......@@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlElementWrapper;
import org.eclipse.ice.viz.service.datastructures.VizObject.IVizUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.IVizUpdateableListener;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.ice.viz.service.modeling.AbstractView;
import org.eclipse.ice.viz.service.modeling.EdgeController;
......@@ -140,8 +140,8 @@ public class NekPolygonController extends FaceController implements IVizUpdateab
condition.register(this);
// Notify listeners of the change.
UpdateableSubscriptionType[] eventType = new UpdateableSubscriptionType[1];
eventType[0] = UpdateableSubscriptionType.PROPERTY;
SubscriptionType[] eventType = new SubscriptionType[1];
eventType[0] = SubscriptionType.PROPERTY;
updateManager.notifyListeners(eventType);
}
}
......@@ -198,8 +198,8 @@ public class NekPolygonController extends FaceController implements IVizUpdateab
condition.register(this);
// Notify listeners of the change.
UpdateableSubscriptionType[] eventType = new UpdateableSubscriptionType[1];
eventType[0] = UpdateableSubscriptionType.PROPERTY;
SubscriptionType[] eventType = new SubscriptionType[1];
eventType[0] = SubscriptionType.PROPERTY;
updateManager.notifyListeners(eventType);
}
}
......@@ -262,8 +262,8 @@ public class NekPolygonController extends FaceController implements IVizUpdateab
condition.register(this);
// Notify listeners of the change.
UpdateableSubscriptionType[] eventType = new UpdateableSubscriptionType[1];
eventType[0] = UpdateableSubscriptionType.PROPERTY;
SubscriptionType[] eventType = new SubscriptionType[1];
eventType[0] = SubscriptionType.PROPERTY;
updateManager.notifyListeners(eventType);
}
}
......@@ -367,8 +367,8 @@ public class NekPolygonController extends FaceController implements IVizUpdateab
// This is the IVizUpdateable update method, which will only be
// triggered by boundary conditions. Thus, this should trigger a
// Property type update for the part's own listeners
UpdateableSubscriptionType[] eventType = new UpdateableSubscriptionType[1];
eventType[0] = UpdateableSubscriptionType.PROPERTY;
SubscriptionType[] eventType = new SubscriptionType[1];
eventType[0] = SubscriptionType.PROPERTY;
updateManager.notifyListeners(eventType);
}
......
......@@ -18,7 +18,7 @@ import java.util.ArrayList;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.ice.viz.service.datastructures.VizObject.IManagedUpdateableListener;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionManager;
import org.eclipse.ice.viz.service.datastructures.VizObject.UpdateableSubscriptionType;
import org.eclipse.ice.viz.service.datastructures.VizObject.SubscriptionType;
import org.junit.Test;
/**
......@@ -41,18 +41,18 @@ public class UpdateableSubscriptionManagerTester {
UpdateableSubscriptionManager manager = source.getManager();
// Create a listener for the object
ArrayList<UpdateableSubscriptionType> allList = new ArrayList<UpdateableSubscriptionType>();
allList.add(UpdateableSubscriptionType.ALL);
ArrayList<SubscriptionType> allList = new ArrayList<SubscriptionType>();
allList.add(SubscriptionType.ALL);
TestListener listener = new TestListener(allList);
source.register(listener);
// Create a list containing the CHILD type
ArrayList<UpdateableSubscriptionType> list = new ArrayList<UpdateableSubscriptionType>();
list.add(UpdateableSubscriptionType.CHILD);
ArrayList<SubscriptionType> list = new ArrayList<SubscriptionType>();
list.add(SubscriptionType.CHILD);
// Create a list containing the PROPERTY type
ArrayList<UpdateableSubscriptionType> propertyList = new ArrayList<UpdateableSubscriptionType>();
propertyList.add(UpdateableSubscriptionType.PROPERTY);
ArrayList<SubscriptionType> propertyList = new ArrayList<SubscriptionType>();
propertyList.add(SubscriptionType.PROPERTY);
// Check that the listener receives updates normally
source.sendUpdate(list);
......@@ -138,26 +138,26 @@ public class UpdateableSubscriptionManagerTester {
TestUpdateable source = new TestUpdateable();
// A list that specifies all subscription types
ArrayList<UpdateableSubscriptionType> allList = new ArrayList<UpdateableSubscriptionType>();
allList.add(UpdateableSubscriptionType.ALL);
ArrayList<SubscriptionType> allList = new ArrayList<SubscriptionType>();
allList.add(SubscriptionType.ALL);
// A list that specifies the child and property subscription types
ArrayList<UpdateableSubscriptionType> childPropertyList = new ArrayList<UpdateableSubscriptionType>();
childPropertyList.add(UpdateableSubscriptionType.CHILD);
childPropertyList.add(UpdateableSubscriptionType.PROPERTY);
ArrayList<SubscriptionType> childPropertyList = new ArrayList<SubscriptionType>();
childPropertyList.add(SubscriptionType.CHILD);
childPropertyList.add(SubscriptionType.PROPERTY);