GitLab will be shut down on June 25 to move to a new facility. https://www.eclipsestatus.io/incidents/5ffy27gwcbx7

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

Added osgi extension to product



Added the -Dosgi.framework.extensions=org.eclipse.fx.osgi to product's
VM arguments. 
Signed-off-by: Robert Smith's avatarRobert Smith <SmithRW@ornl.gov>
parent cd779ad6
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<launcherArgs> <launcherArgs>
<programArgs>-product org.eclipse.platform.ide --launcher.defaultAction openFile --launcher.appendVmargs -data @noDefault <programArgs>-product org.eclipse.platform.ide --launcher.defaultAction openFile --launcher.appendVmargs -data @noDefault
</programArgs> </programArgs>
<vmArgs>-Dvisit.port=5600 -DREFRESH_BUNDLES=FALSE -Xmx2048M -XX:MaxPermSize=1024M -Dmax_download_size=52428800 -Dorg.eclipse.equinox.http.jetty.http.port=8080 <vmArgs>-Dvisit.port=5600 -DREFRESH_BUNDLES=FALSE -Xmx2048M -XX:MaxPermSize=1024M -Dmax_download_size=52428800 -Dorg.eclipse.equinox.http.jetty.http.port=8080 -Dosgi.framework.extensions=org.eclipse.fx.osgi
</vmArgs> </vmArgs>
<vmArgsLin>-Dvisit.binpath=@user.home/visit/bin <vmArgsLin>-Dvisit.binpath=@user.home/visit/bin
</vmArgsLin> </vmArgsLin>
......
...@@ -7,6 +7,7 @@ Fragment-Host: org.eclipse.ice.viz.service.visit ...@@ -7,6 +7,7 @@ Fragment-Host: org.eclipse.ice.viz.service.visit
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.apache.log4j, Import-Package: org.apache.log4j,
org.eclipse.ice.viz.service.datastructures.VizObject, org.eclipse.ice.viz.service.datastructures.VizObject,
org.eclipse.ice.viz.service.geometry.reactor,
org.eclipse.ice.viz.service.geometry.shapes, org.eclipse.ice.viz.service.geometry.shapes,
org.junit;version="4.12.0" org.junit;version="4.12.0"
Bundle-Vendor: Oak Ridge National Laboratory Bundle-Vendor: Oak Ridge National Laboratory
/*******************************************************************************
* Copyright (c) 2016 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:
* Robert Smith
*******************************************************************************/
package org.eclipse.ice.viz.service.geometry.reactor.test;
import static org.junit.Assert.*;
import org.eclipse.ice.viz.service.geometry.reactor.HeatExchangerMesh;
import org.eclipse.ice.viz.service.geometry.reactor.PipeController;
import org.eclipse.ice.viz.service.geometry.reactor.PipeMesh;
import org.eclipse.ice.viz.service.modeling.AbstractView;
import org.junit.Test;
/**
* A class to test the functionality of the HeatExchangerMesh.
*
* @author Robert Smith
*
*/
public class HeatExchangerMeshTester {
/**
* Test the HeatExchanger's ability to correctly manage its contained pipes.
*/
@Test
public void checkPipes(){
//Create a heat exchanger and some pipes
HeatExchangerMesh exchanger = new HeatExchangerMesh();
PipeController primary = new PipeController(new PipeMesh(), new AbstractView());
PipeController secondary = new PipeController(new PipeMesh(), new AbstractView());
exchanger.setSecondaryPipe(secondary);
assertTrue(secondary == exchanger.getSecondaryPipe());
exchanger.setPrimaryPipe(primary);
assertTrue(primary == exchanger.getPrimaryPipe());
}
}
...@@ -51,7 +51,10 @@ public class HeatExchangerMesh extends AbstractMesh { ...@@ -51,7 +51,10 @@ public class HeatExchangerMesh extends AbstractMesh {
* one. * one.
*/ */
public PipeController getSecondaryPipe() { public PipeController getSecondaryPipe() {
return (PipeController) entities.get("Secondary Pipe").get(0); List<AbstractController> category = getEntitiesByCategory(
"Secondary Pipe");
return !category.isEmpty() ? (PipeController) category.get(0) : null;
} }
/** /**
......
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