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 <>
parent cd779ad6
......@@ -9,7 +9,7 @@
<programArgs>-product org.eclipse.platform.ide --launcher.defaultAction openFile --launcher.appendVmargs -data @noDefault
<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
......@@ -7,6 +7,7 @@ Fragment-Host:
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.apache.log4j,,,,
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
* Contributors:
* Robert Smith
import static org.junit.Assert.*;
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.
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());
assertTrue(secondary == exchanger.getSecondaryPipe());
assertTrue(primary == exchanger.getPrimaryPipe());
......@@ -51,7 +51,10 @@ public class HeatExchangerMesh extends AbstractMesh {
* one.
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;
Supports Markdown
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