Commit b107b0e1 authored by Robert Smith's avatar Robert Smith
Browse files

Split JavaFX packages



Split the viz.service.javafx package into the shared viz.service.javafx
package and individual packages for the javafx implementations of the
geometry and mesh editors: viz.service.javafx.geometry and
viz.service.javafx.mesh.
Signed-off-by: Robert Smith's avatarRobert Smith <SmithRW@ornl.gov>
parent 9abed7db
......@@ -14,11 +14,6 @@ Eclipse-ExtensibleAPI: true
Import-Package: junit.framework;version="4.12.0",
org.eclipse.ice.viz.service,
org.eclipse.ice.viz.service.datastructures.VizObject,
org.eclipse.ice.viz.service.geometry.shapes,
org.eclipse.ice.viz.service.geometry.widgets,
org.eclipse.ice.viz.service.javafx.mesh.datatypes,
org.eclipse.ice.viz.service.mesh.datastructures,
org.eclipse.ice.viz.service.mesh.properties,
org.eclipse.ice.viz.service.modeling,
org.junit;version="4.12.0"
......@@ -13,8 +13,6 @@ package org.eclipse.ice.viz.service.javafx.mesh.datastructures.test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.eclipse.ice.viz.service.javafx.mesh.datatypes.FXEdgeController;
import org.eclipse.ice.viz.service.javafx.mesh.datatypes.FXMeshControllerFactory;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.ice.viz.service.modeling.AbstractMesh;
import org.eclipse.ice.viz.service.modeling.AbstractView;
......
......@@ -13,7 +13,6 @@ package org.eclipse.ice.viz.service.javafx.mesh.test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.eclipse.ice.viz.service.javafx.mesh.AxisGridGizmo;
import org.junit.Test;
/**
......
......@@ -4,8 +4,6 @@ Bundle-Name: JavaFX Visualization Services Plugin
Bundle-SymbolicName: org.eclipse.ice.viz.service.javafx;singleton:=true
Bundle-Version: 2.1.7.20150825
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/ControllerFactory.xml,
OSGI-INF/vizGeometryService.xml
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Bundle-Vendor: Oak Ridge National Laboratory
......@@ -13,13 +11,12 @@ Eclipse-ExtensibleAPI: true
Import-Package: org.eclipse.ice.viz.service,
org.eclipse.ice.viz.service.datastructures.VizObject,
org.eclipse.ice.viz.service.geometry.shapes,
org.eclipse.ice.viz.service.geometry.widgets,
org.eclipse.ice.viz.service.mesh.datastructures,
org.eclipse.ice.viz.service.mesh.properties,
org.eclipse.ice.viz.service.modeling
Export-Package: org.eclipse.ice.viz.service.javafx.geometry,
org.eclipse.ice.viz.service.javafx.geometry.datatypes,
org.eclipse.ice.viz.service.javafx.mesh,
org.eclipse.ice.viz.service.javafx.mesh.datatypes,
Export-Package: org.eclipse.ice.viz.service.javafx.canvas,
org.eclipse.ice.viz.service.javafx.internal,
org.eclipse.ice.viz.service.javafx.internal.model,
org.eclipse.ice.viz.service.javafx.internal.scene.camera,
org.eclipse.ice.viz.service.javafx.scene.base,
org.eclipse.ice.viz.service.javafx.scene.model,
org.eclipse.ice.viz.service.javafx.viewer
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.ice.viz.service.mesh">
<implementation class="org.eclipse.ice.viz.service.javafx.mesh.FXMeshVizService"/>
<service>
<provide interface="org.eclipse.ice.viz.service.IVizService"/>
</service>
</scr:component>
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.ice.viz.service.mesh">
<implementation class="org.eclipse.ice.viz.service.javafx.geometry.FXGeometryVizService"/>
<service>
<provide interface="org.eclipse.ice.viz.service.IVizService"/>
</service>
</scr:component>
......@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.ice.viz.service.javafx.canvas;
import org.eclipse.ice.viz.service.javafx.geometry.datatypes.TransformGizmo;
import org.eclipse.ice.viz.service.javafx.internal.model.FXCameraAttachment;
import org.eclipse.ice.viz.service.javafx.internal.model.FXRenderer;
import org.eclipse.ice.viz.service.javafx.internal.scene.camera.CameraController;
......
......@@ -8,7 +8,7 @@
* Contributors:
* Tony McCrary (tmccrary@l33tlabs.com)
*******************************************************************************/
package org.eclipse.ice.viz.service.javafx.geometry.datatypes;
package org.eclipse.ice.viz.service.javafx.canvas;
import javafx.collections.ObservableList;
import javafx.scene.DepthTest;
......
package org.eclipse.ice.viz.service.javafx.internal.model;
import org.eclipse.ice.viz.service.geometry.shapes.ShapeType;
import org.eclipse.ice.viz.service.javafx.geometry.datatypes.TransformGizmo;
import org.eclipse.ice.viz.service.javafx.canvas.TransformGizmo;
import org.eclipse.ice.viz.service.javafx.internal.Util;
import javafx.scene.Group;
......
......@@ -10,8 +10,6 @@ Import-Package: javafx.scene;version="2.2.0",
javafx.scene.paint;version="2.2.0",
junit.framework;version="4.12.0",
org.apache.log4j,
org.eclipse.ice.viz.service.javafx.mesh,
org.eclipse.ice.viz.service.javafx.mesh.datatypes,
org.eclipse.ice.viz.service.mesh.datastructures,
org.eclipse.ice.viz.service.modeling,
org.eclipse.ice.viz.service.visit
......
......@@ -10,7 +10,6 @@ Import-Package: gov.lbnl.visit.swt,
org.eclipse.ice.viz.service.datastructures.VizObject,
org.eclipse.ice.viz.service.modeling,
org.eclipse.ui.views.properties.tabbed
Service-Component: OSGI-INF/vizService.xml
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui
Bundle-Vendor: Oak Ridge National Laboratory
......
......@@ -129,6 +129,8 @@
<!-- <module>org.eclipse.ice.viz.service.geometry.test</module> -->
<module>org.eclipse.ice.viz.service.javafx</module>
<!-- <module>org.eclipse.ice.viz.service.javafx.test</module> -->
<module>org.eclipse.ice.viz.service.javafx.geometry</module>
<module>org.eclipse.ice.viz.service.javafx.mesh</module>
<!-- <module>org.eclipse.ice.viz.service.jme3</module> -->
<!-- <module>org.eclipse.ice.viz.service.jme3.test</module> -->
<module>org.eclipse.ice.viz.service.mesh</module>
......
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