Commit 9555a069 authored by Robert Smith's avatar Robert Smith
Browse files

Refactored JavaFX package structure



Changed the JavaFX package structure so that all JavaFX IVizCanvas
implementations draw from the same generic JavaFX classes and are all
located within the viz.service.javafx package rather than spread through
the viz.service, viz.service.geometry, and viz.service.mesh packages.
Signed-off-by: Robert Smith's avatarRobert Smith <SmithRW@ornl.gov>
parent 1de0994e
......@@ -56,6 +56,11 @@ public class ICEGeometryPage extends ICEFormPage
*
*/
private GeometryComponent geometryComp;
/**
* The visualization service that is providing the graphical implementation for the geometry editor.
*/
private IVizService service;
/**
* <p>
......@@ -125,7 +130,6 @@ public class ICEGeometryPage extends ICEFormPage
ShapeTreeView shapeTreeView = (ShapeTreeView) getSite()
.getWorkbenchWindow().getActivePage()
.findView(ShapeTreeView.ID);
// shapeTreeView.setFactory(new JME3ControllerFactory());
shapeTreeView.setGeometry(geometryComp.getGeometry());
return;
......@@ -173,6 +177,9 @@ public class ICEGeometryPage extends ICEFormPage
// Get JME3 Geometry service from factory
IVizServiceFactory factory = editor.getVizServiceFactory();
IVizService service = factory.get("ICE Geometry Editor");
((ShapeTreeView) getSite()
.getWorkbenchWindow().getActivePage()
.findView(ShapeTreeView.ID)).setFactory(service.getFactory());
// Create and draw geometry canvas
try {
......
......@@ -23,7 +23,7 @@
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<stringAttribute key="productFile" value="/org.eclipse.ice.repository/ice.product"/>
<stringAttribute key="selected_target_plugins" value="ca.odell.glazedlists@default:default,com.google.gson@default:default,com.google.guava@default:default,com.ibm.icu@default:default,com.jcraft.jsch*0.1.51.v201410302000@default:default,com.jcraft.jsch*0.1.53.v201508180515@default:default,com.sun.jersey@default:default,javaewah@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.ws.rs*1.1.1.v20130318-1750@default:default,javax.ws.rs*2.0.1.v201504171603@default:default,javax.xml@default:default,net.sourceforge.lpg.lpgjavaruntime@default:default,org.apache.ant@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.math@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.codehaus.jackson.core@default:default,org.codehaus.jackson.jaxrs@default:default,org.codehaus.jackson.mapper@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.cdt.autotools.core@default:default,org.eclipse.cdt.autotools.ui@default:default,org.eclipse.cdt.codan.checkers.ui@default:default,org.eclipse.cdt.codan.checkers@default:default,org.eclipse.cdt.codan.core.cxx@default:default,org.eclipse.cdt.codan.core@default:default,org.eclipse.cdt.codan.ui.cxx@default:default,org.eclipse.cdt.codan.ui@default:default,org.eclipse.cdt.core.lrparser@default:default,org.eclipse.cdt.core.native@default:default,org.eclipse.cdt.core.parser.upc@default:default,org.eclipse.cdt.core.win32.x86_64@default:false,org.eclipse.cdt.core.win32@default:false,org.eclipse.cdt.core@default:default,org.eclipse.cdt.debug.core@default:default,org.eclipse.cdt.debug.mi.core@default:default,org.eclipse.cdt.debug.mi.ui@default:default,org.eclipse.cdt.debug.ui@default:default,org.eclipse.cdt.doc.user@default:default,org.eclipse.cdt.gdb.ui@default:default,org.eclipse.cdt.gdb@default:default,org.eclipse.cdt.launch@default:default,org.eclipse.cdt.make.core@default:default,org.eclipse.cdt.make.ui@default:default,org.eclipse.cdt.managedbuilder.core@default:default,org.eclipse.cdt.managedbuilder.gnu.ui@default:default,org.eclipse.cdt.managedbuilder.ui@default:default,org.eclipse.cdt.remote.core@default:default,org.eclipse.cdt.ui@default:default,org.eclipse.cdt@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:true,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ease.help@default:default,org.eclipse.ease.lang.javascript.rhino.debugger@default:default,org.eclipse.ease.lang.javascript.rhino@default:default,org.eclipse.ease.lang.javascript.ui@default:default,org.eclipse.ease.lang.javascript@default:default,org.eclipse.ease.lang.python@default:default,org.eclipse.ease.modules.charting@default:default,org.eclipse.ease.modules.help@default:default,org.eclipse.ease.modules.platform@default:default,org.eclipse.ease.modules.team.svn@default:default,org.eclipse.ease.ui.scripts@default:default,org.eclipse.ease.ui@default:default,org.eclipse.ease@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.github.core@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.epp.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:true,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.fx.javafx@default:true,org.eclipse.fx.osgi@default:false,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.workspace.cli@default:default,org.eclipse.nebula.visualization.widgets@default:default,org.eclipse.nebula.visualization.xygraph@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.nebula.widgets.nattable.extension.glazedlists@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.photran.cdtinterface@default:default,org.eclipse.photran.core.vpg@default:default,org.eclipse.photran.core@default:default,org.eclipse.photran.ui@default:default,org.eclipse.platform@default:default,org.eclipse.ptp.aix@default:false,org.eclipse.ptp.cdt.compilers.core@default:default,org.eclipse.ptp.core@default:default,org.eclipse.ptp.debug.core@default:default,org.eclipse.ptp.debug.sdm.core@default:default,org.eclipse.ptp.debug.sdm.ui@default:default,org.eclipse.ptp.debug.sdm@default:default,org.eclipse.ptp.debug.ui@default:default,org.eclipse.ptp.doc.user@default:default,org.eclipse.ptp.ems.core@default:default,org.eclipse.ptp.ems.ui@default:default,org.eclipse.ptp.etfw.doc.user@default:default,org.eclipse.ptp.etfw.feedback.perfsuite.doc.user@default:default,org.eclipse.ptp.etfw.feedback.perfsuite@default:default,org.eclipse.ptp.etfw.feedback@default:default,org.eclipse.ptp.etfw.jaxb@default:default,org.eclipse.ptp.etfw.launch@default:default,org.eclipse.ptp.etfw.parallel@default:default,org.eclipse.ptp.etfw.tau.papiselect@default:default,org.eclipse.ptp.etfw.tau.perfdmf@default:default,org.eclipse.ptp.etfw.tau.selinst@default:default,org.eclipse.ptp.etfw.tau.selinstfort@default:default,org.eclipse.ptp.etfw.tau.ui@default:default,org.eclipse.ptp.etfw.tau@default:default,org.eclipse.ptp.etfw.toolopts@default:default,org.eclipse.ptp.etfw@default:default,org.eclipse.ptp.gem.help@default:default,org.eclipse.ptp.gem@default:default,org.eclipse.ptp.launch@default:default,org.eclipse.ptp.macosx@default:false,org.eclipse.ptp.pldt.common@default:default,org.eclipse.ptp.pldt.doc.user@default:default,org.eclipse.ptp.pldt.mpi.analysis.cdt@default:default,org.eclipse.ptp.pldt.mpi.analysis@default:default,org.eclipse.ptp.pldt.mpi.core@default:default,org.eclipse.ptp.pldt.mpi.fortran@default:default,org.eclipse.ptp.pldt.openacc.fortran@default:default,org.eclipse.ptp.pldt.openacc@default:default,org.eclipse.ptp.pldt.openmp.analysis@default:default,org.eclipse.ptp.pldt.openmp.core@default:default,org.eclipse.ptp.pldt.openmp.fortran@default:default,org.eclipse.ptp.pldt.openmp.ui.pv@default:default,org.eclipse.ptp.pldt.openshmem@default:default,org.eclipse.ptp.pldt.upc@default:default,org.eclipse.ptp.pldt.wizards@default:default,org.eclipse.ptp.proxy.protocol@default:default,org.eclipse.ptp.proxy@default:default,org.eclipse.ptp.rdt.sync.cdt.core@default:default,org.eclipse.ptp.rdt.sync.cdt.ui@default:default,org.eclipse.ptp.rdt.sync.core@default:default,org.eclipse.ptp.rdt.sync.fortran.ui@default:default,org.eclipse.ptp.rdt.sync.git.core@default:default,org.eclipse.ptp.rdt.sync.git.ui@default:default,org.eclipse.ptp.rdt.sync.ui@default:default,org.eclipse.ptp.remote.server.core@default:default,org.eclipse.ptp.remote.terminal@default:default,org.eclipse.ptp.rm.ibm.ll.doc.user@default:default,org.eclipse.ptp.rm.ibm.ll.ui@default:default,org.eclipse.ptp.rm.ibm.pe.doc.user@default:default,org.eclipse.ptp.rm.ibm.pe.ui@default:default,org.eclipse.ptp.rm.ibm.platform.lsf.doc.user@default:default,org.eclipse.ptp.rm.ibm.platform.lsf.ui@default:default,org.eclipse.ptp.rm.jaxb.configs@default:default,org.eclipse.ptp.rm.jaxb.contrib@default:default,org.eclipse.ptp.rm.jaxb.control.core@default:default,org.eclipse.ptp.rm.jaxb.control.ui@default:default,org.eclipse.ptp.rm.jaxb.core@default:default,org.eclipse.ptp.rm.jaxb.doc.user@default:default,org.eclipse.ptp.rm.jaxb.ui@default:default,org.eclipse.ptp.rm.lml.core@default:default,org.eclipse.ptp.rm.lml.da.server@default:default,org.eclipse.ptp.rm.lml.da@default:default,org.eclipse.ptp.rm.lml.monitor.core@default:default,org.eclipse.ptp.rm.lml.monitor.ui@default:default,org.eclipse.ptp.rm.lml.ui@default:default,org.eclipse.ptp.rm.slurm.help@default:default,org.eclipse.ptp.ui@default:default,org.eclipse.ptp.utils@default:default,org.eclipse.ptp@default:default,org.eclipse.rcp@default:default,org.eclipse.remote.core@default:default,org.eclipse.remote.jsch.core@default:default,org.eclipse.remote.jsch.ui@default:default,org.eclipse.remote.ui@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.ant.junit@default:false,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.eclipse.gef.finder@default:default,org.eclipse.swtbot.forms.finder@default:default,org.eclipse.swtbot.go@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.tm.terminal.connector.remote@default:default,org.eclipse.tm.terminal.control@default:default,org.eclipse.tm.terminal.view.core@default:default,org.eclipse.tm.terminal.view.ui@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:true,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.wst.xsd.ui@default:default,org.eclipse.xsd.edit@default:default,org.eclipse.xsd@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.mozilla.javascript@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:false,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="gov.lbnl.visit.swt@default:default,org.eclipse.ice.analysistool@default:true,org.eclipse.ice.caebat.batml.ui@default:default,org.eclipse.ice.caebat.batml@default:true,org.eclipse.ice.client.compatibility@default:default,org.eclipse.ice.client.rcp@default:true,org.eclipse.ice.client.widgets.moose@default:default,org.eclipse.ice.client.widgets.rcp@default:true,org.eclipse.ice.client.widgets.reactoreditor.grid@default:true,org.eclipse.ice.client.widgets.reactoreditor.lwr@default:true,org.eclipse.ice.client.widgets.reactoreditor.sfr@default:true,org.eclipse.ice.client.widgets.reactoreditor@default:true,org.eclipse.ice.client.widgets@default:true,org.eclipse.ice.client@default:default,org.eclipse.ice.core@default:default,org.eclipse.ice.datastructures@default:true,org.eclipse.ice.dependencies@default:true,org.eclipse.ice.developer@default:default,org.eclipse.ice.filesimulation@default:true,org.eclipse.ice.io@default:true,org.eclipse.ice.item@default:true,org.eclipse.ice.kdd@default:true,org.eclipse.ice.materials.ui@default:true,org.eclipse.ice.materials@default:true,org.eclipse.ice.mesh@default:true,org.eclipse.ice.nek5000@default:true,org.eclipse.ice.persistence.xml@default:true,org.eclipse.ice.poly@default:true,org.eclipse.ice.proteus@default:true,org.eclipse.ice.reactor.perspective@default:true,org.eclipse.ice.reactor.plant@default:true,org.eclipse.ice.reactor.sfr@default:true,org.eclipse.ice.reactor@default:true,org.eclipse.ice.reactorAnalyzer@default:true,org.eclipse.ice.reflectivity.ui@default:true,org.eclipse.ice.reflectivity@default:true,org.eclipse.ice.sassena@default:default,org.eclipse.ice.vibe@default:true,org.eclipse.ice.viz.service.geometry@default:true,org.eclipse.ice.viz.service.jme3@default:true,org.eclipse.ice.viz.service.mesh@default:default,org.eclipse.ice.viz.service.paraview.web@default:default,org.eclipse.ice.viz.service.paraview@default:default,org.eclipse.ice.viz.service.visit@default:true,org.eclipse.ice.viz.service@default:true,org.eclipse.ice.viz@default:true,org.eclipse.ice.xolotl@default:true"/>
<stringAttribute key="selected_workspace_plugins" value="gov.lbnl.visit.swt@default:default,org.eclipse.ice.analysistool@default:true,org.eclipse.ice.caebat.batml@default:true,org.eclipse.ice.client.compatibility@default:default,org.eclipse.ice.client.rcp@default:true,org.eclipse.ice.client.widgets.moose@default:default,org.eclipse.ice.client.widgets.rcp@default:true,org.eclipse.ice.client.widgets.reactoreditor.grid@default:true,org.eclipse.ice.client.widgets.reactoreditor.lwr@default:true,org.eclipse.ice.client.widgets.reactoreditor.sfr@default:true,org.eclipse.ice.client.widgets.reactoreditor@default:true,org.eclipse.ice.client.widgets@default:true,org.eclipse.ice.client@default:default,org.eclipse.ice.core@default:default,org.eclipse.ice.datastructures@default:true,org.eclipse.ice.dependencies@default:true,org.eclipse.ice.developer@default:default,org.eclipse.ice.filesimulation@default:true,org.eclipse.ice.io@default:true,org.eclipse.ice.item@default:true,org.eclipse.ice.kdd@default:true,org.eclipse.ice.materials.ui@default:true,org.eclipse.ice.materials@default:true,org.eclipse.ice.mesh@default:true,org.eclipse.ice.nek5000@default:true,org.eclipse.ice.persistence.xml@default:true,org.eclipse.ice.poly@default:true,org.eclipse.ice.proteus@default:true,org.eclipse.ice.reactor.perspective@default:true,org.eclipse.ice.reactor.plant@default:true,org.eclipse.ice.reactor.sfr@default:true,org.eclipse.ice.reactor@default:true,org.eclipse.ice.reactorAnalyzer@default:true,org.eclipse.ice.reflectivity.ui@default:true,org.eclipse.ice.reflectivity@default:true,org.eclipse.ice.sassena@default:default,org.eclipse.ice.vibe@default:true,org.eclipse.ice.viz.service.geometry@default:true,org.eclipse.ice.viz.service.javafx.temp2@default:true,org.eclipse.ice.viz.service.jme3@default:true,org.eclipse.ice.viz.service.mesh@default:default,org.eclipse.ice.viz.service.paraview.web@default:default,org.eclipse.ice.viz.service.paraview@default:default,org.eclipse.ice.viz.service.visit@default:true,org.eclipse.ice.viz.service@default:true,org.eclipse.ice.viz@default:true,org.eclipse.ice.xolotl@default:true"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
......
<?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.geometry">
<implementation class="org.eclipse.ice.viz.service.geometry.GeometryVizService"/>
<implementation class="org.eclipse.ice.viz.service.geometry.GeometryVizService2"/>
<service>
<provide interface="org.eclipse.ice.viz.service.IVizService"/>
</service>
......
......@@ -17,7 +17,9 @@ 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.geometry.shapes.FXShapeControllerFactory;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.ice.viz.service.modeling.IControllerFactory;
import org.eclipse.ice.viz.service.modeling.Shape;
/**
......@@ -78,4 +80,9 @@ public class GeometryVizService extends AbstractVizService {
return Collections.emptySet();
}
@Override
public IControllerFactory getFactory() {
return new FXShapeControllerFactory();
}
}
......@@ -342,8 +342,6 @@ public class ShapeTreeView extends ViewPart
* The new factory to store in this view
*/
public void setFactory(IControllerFactory factory) {
// TODO Uncomment after the JavaFX implementation is moved to its own
// package
// this.factory = factory;
this.factory = factory;
}
}
......@@ -134,7 +134,7 @@ public class FXGeometryAttachment extends GeometryAttachment {
// On update, refresh the list of top level nodes
fxAttachmentNode.getChildren().clear();
for (AbstractController child : geom
for (AbstractController child : finalGeom
.getEntities()) {
fxAttachmentNode.getChildren()
.add((Group) child.getRepresentation());
......
......@@ -107,10 +107,10 @@ public class FPSController extends CameraController {
final Group xform = (Group) camera.getParent();
Rotate x = new Rotate();
final Rotate x = new Rotate();
x.setAxis(Rotate.X_AXIS);
Rotate y = new Rotate();
final Rotate y = new Rotate();
y.setAxis(Rotate.Y_AXIS);
Rotate z = new Rotate();
......@@ -198,7 +198,8 @@ public class FPSController extends CameraController {
mousePosY = arg0.getSceneY();
mouseDeltaX = (mousePosX - mouseOldX);
mouseDeltaY = (mousePosY - mouseOldY);
System.out.println(mouseDeltaX + " " + mouseDeltaY);
double modifier = 1.0;
if (arg0.isPrimaryButtonDown()) {
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry excluding="org/eclipse/ice/viz/service/geometry/shapes/Tube.java|org/eclipse/ice/viz/service/geometry/widgets/RenderShape.java" kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
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: Geometry Visualization Service Plugin
Bundle-SymbolicName: org.eclipse.ice.viz.service.javafx.temp2;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
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
<?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.geometry.widgets">
<implementation class="org.eclipse.ice.viz.service.geometry.widgets.ShapeTreeView"/>
<reference bind="setFactory" cardinality="1..1" interface="org.eclipse.ice.viz.service.modeling.IControllerFactory" name="IControllerFactory" policy="static"/>
</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.geometry">
<implementation class="org.eclipse.ice.viz.service.javafx.geometry.FXGeometryVizService"/>
<service>
<provide interface="org.eclipse.ice.viz.service.IVizService"/>
</service>
</scr:component>
output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
OSGI-INF/
source.. = src/
<?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</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
/*******************************************************************************
* Copyright (c) 2015 UT-Battelle, LLC.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Tony McCrary (tmccrary@l33tlabs.com)
*******************************************************************************/
package org.eclipse.ice.viz.service.javafx.canvas;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.eclipse.ice.viz.service.javafx.scene.model.INode;
import org.eclipse.ice.viz.service.modeling.AbstractController;
import org.eclipse.jface.util.Geometry;
/**
* <p>
* Base for GeometryAttachment implementations, which provide nodes with the
* ability to display ICE Geometry elements and their constituent IShapes.
* </p>
*
* @author Tony McCrary (tmccrary@l33tlabs.com)
*
*/
public abstract class AbstractAttachment extends Attachment
implements IModelPart {
/**
* Geometry that has been added but has not been integrated as the node
* hasn't been attached yet.
*/
private List<AbstractController> queuedGeometry;
/** List of shapes that have been added via Geometry instances. */
private List<AbstractController> shapes;
/** */
private boolean visible;
/** */
private boolean enabled;
/** */
private boolean immutable;
/** */
protected AbstractController currentGeom = null;
/**
*
* @param node
*/
protected void checkNode(INode node) {
}
/**
*
* @param shape
*/
protected void checkMesh(AbstractController shape) {
}
/**
* @see IModelPart#addGeometry(Geometry)
*/
@Override
public void addGeometry(AbstractController geom) {
if (geom == null) {
return;
}
if (currentGeom == geom) {
return;
} else {
currentGeom = geom;
}
if (owner == null) {
if (queuedGeometry == null) {
queuedGeometry = new ArrayList<>();
}
queuedGeometry.add(geom);
return;
}
}
/**
* @see IModelPart#addShape(Geometry)
*/
@Override
public void addShape(AbstractController shape) {
checkMesh(shape);
if (shapes == null) {
shapes = new ArrayList<>();
}
shapes.add(shape);
processShape(shape);
}
/**
* @see IAttachment#attach(INode)
*/
@Override
public void attach(INode owner) {
super.attach(owner);
if (queuedGeometry == null) {
return;
}
for (AbstractController geom : queuedGeometry) {
for (AbstractController shape : geom.getEntities()) {
addShape(shape);
}
}
queuedGeometry.clear();
}
/**
* @see IAttachment#detach(INode)
*/
@Override
public void detach(INode owner) {
super.detach(owner);
if (shapes != null) {
shapes.clear();
}
if (queuedGeometry != null) {
queuedGeometry.clear();
}
}
/**
* <p>
* Handles generating renderer specific data from the input model shape.
* </p>
*
* @param shape
* ICE shape to visualize
*/
protected abstract void processShape(AbstractController shape);
/**
* @see IModelPart#addShape(Geometry)
*/
@Override
public void removeShape(AbstractController shape) {
if (shapes == null) {
return;
}
if (!shapes.contains(shape)) {
return;
}
shapes.remove(shape);
disposeShape(shape);
}
/**
*
* @param shape
*/
protected abstract void disposeShape(AbstractController shape);
/**
*
*/
@Override
public boolean hasShape(AbstractController shape) {
if (shapes == null) {
return false;
}
return shapes.contains(shape);
}
/**
*
*/
@Override
public AbstractController getShape(int index) {
if (shapes == null) {
return null;
}
return shapes.get(index);
}
/**
*
* @param copy
* @return
*/
@Override
public List<AbstractController> getShapes(boolean copy) {
if (shapes == null) {
return Collections.emptyList();
}
if (copy) {
return new ArrayList<AbstractController>(shapes);
} else {
return shapes;
}
}
/**
*
*/
@Override
public void clearShapes() {
if (shapes == null) {
return;
}
shapes.clear();
}
/**
*/
@Override
public void setVisible(boolean visible) {
this.visible = visible;
}
/**
*
*/
@Override
public boolean isVisible() {
return visible;
}
/**
*
* @return
*/
@Override
public boolean isImmutable() {
return immutable;
}
/**
*
* @return
*/
@Override
public void setImmutable(boolean immutable) {
this.immutable = immutable;
}
}
/*******************************************************************************
* Copyright (c) 2015 UT-Battelle, LLC.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Tony McCrary (tmccrary@l33tlabs.com)
*******************************************************************************/
package org.eclipse.ice.viz.service.javafx.canvas;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.ice.viz.service.javafx.scene.model.IAttachment;
import org.eclipse.ice.viz.service.javafx.viewer.IAttachmentManager;
/**
* <p>
* Abstract implementation of an IAttachmentManager.
* </p>
*
* @author Tony McCrary (tmccrary@l33tlabs.com)
*
*/
abstract public class AbstractAttachmentManager implements IAttachmentManager {
/** The active list of attachments. */
protected List<IAttachment> active;
/** The list of attachments queued for removal. */
private List<IAttachment> removalQueue;
/**
* @see IAttachmentManager#allocate()
*/
@Override
public abstract IAttachment allocate();
/**
* @see IAttachmentManager#destroy(IAttachment)
*/
@Override
public void destroy(IAttachment attach) {
if (!(attach instanceof IAttachment)) {
return;
}
if (removalQueue == null) {
removalQueue = new ArrayList<>();
}
active.remove(attach);
removalQueue.add(attach);
}
/**
* <p>
* Batch deletes the attachments in the removal queue.
* </p>
*/
private void processDeletions() {
if (removalQueue == null || removalQueue.isEmpty()) {
return;
}
for (IAttachment attachment : removalQueue) {
attachment.detach(attachment.getOwner());
}
removalQueue.clear();
}
/**
* @see IAttachmentManager#update()
*/
@Override
public void update() {
processDeletions();
}