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
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
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JavaFX Mesh Visualization Services Plugin
Bundle-SymbolicName: org.eclipse.ice.viz.service.javafx.mesh;singleton:=true
Bundle-Version: 2.1.7.20150825
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/vizGeometryService.xml
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Bundle-Vendor: Oak Ridge National Laboratory
Eclipse-ExtensibleAPI: true
Import-Package: org.eclipse.ice.viz.service,
org.eclipse.ice.viz.service.datastructures.VizObject,
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.mesh,
org.eclipse.ice.viz.service.javafx.scene.base,
org.eclipse.ice.viz.service.javafx.scene.model,
org.eclipse.ice.viz.service.javafx.viewer,
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.mesh,
org.eclipse.ice.viz.service.javafx.mesh.datatypes
<?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.mesh.FXMeshVizService"/>
<service>
<provide interface="org.eclipse.ice.viz.service.IVizService"/>
</service>
<implementation class="org.eclipse.ice.viz.service.javafx.geometry.FXGeometryVizService"/>
<service>
<provide interface="org.eclipse.ice.viz.service.IVizService"/>
</service>
</scr:component>-->
\ No newline at end of file
output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
OSGI-INF/
source.. = src/
bin.excludes = OSGI-INF/ControllerFactory.xml,\
OSGI-INF/javafxMeshService.xml,\
OSGI-INF/vizMeshService.xml
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
</plugin>
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ICE</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<version>2.1.7.20150825</version>
<relativePath>../${pom-filename}</relativePath>
</parent>
<groupId>ICE</groupId>
<artifactId>org.eclipse.ice.viz.service.javafx.mesh</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
......@@ -16,7 +16,6 @@ import java.util.Set;
import org.eclipse.ice.viz.service.AbstractVizService;
import org.eclipse.ice.viz.service.IVizCanvas;
import org.eclipse.ice.viz.service.IVizService;
import org.eclipse.ice.viz.service.datastructures.VizObject.IVizObject;
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.IControllerFactory;
......@@ -41,8 +40,6 @@ public class FXMeshVizService extends AbstractVizService {
* <p>
* Creates a GeometryCanvas.
* </p>
*
* @see IVizService#createCanvas(IVizObject)
*/
@Override
public IVizCanvas createCanvas(AbstractController geometry)
......@@ -75,9 +72,10 @@ public class FXMeshVizService extends AbstractVizService {
protected Set<String> findSupportedExtensions() {
return Collections.emptySet();
}
/*
* (non-Javadoc)
*
* @see org.eclipse.ice.viz.service.IVizService#getFactory()
*/
@Override
......
......@@ -92,13 +92,6 @@ public class FXLinearEdgeView extends AbstractView {
// Set the node's transformation
node.getTransforms().setAll(Util.convertTransformation(transformation));
// // Create a Shape3D for the model
// mesh = createShape(model);
// node.getChildren().add(mesh);
//
// // Set the cylinder to be the constructing material by default
// mesh.setMaterial(constructingMaterial);
}
/**
......
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