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

Merge branch 'UnifiedVizRefactor_NoReactor' of https://github.com/eclipse/ice...

Merge branch 'UnifiedVizRefactor_NoReactor' of https://github.com/eclipse/ice into UnifiedVizRefactor_NoReactor2
parents fec89e6e ffd5a390
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="bin"/>
</classpath>
/bin
/target
/bulletjme64.dll
/lwjgl64.dll
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.client.widgets.rcp.test</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Eclipse Widgets RCP Bundle Tester
Bundle-SymbolicName: org.eclipse.ice.client.widgets.rcp.test
Bundle-Version: 2.1.8
Fragment-Host: org.eclipse.ice.client.widgets.rcp;bundle-version="2.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.eclipse.ice.client.common,
org.eclipse.ice.client.widgets,
org.junit
Bundle-Vendor: Oak Ridge National Laboratory
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
</head>
<body lang="EN-US">
<h2>About This Content</h2>
<p>July 1, 2014</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
apply to your use of any object code in the Content. Check the Redistributor's license that was
provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content
and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html>
\ No newline at end of file
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
additional.bundles = org.junit,\
org.hamcrest.core
<?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.8</version>
<relativePath>../${pom-filename}</relativePath>
</parent>
<groupId>ICE</groupId>
<artifactId>org.eclipse.ice.client.widgets.rcp.test</artifactId>
<packaging>eclipse-plugin</packaging>
<properties>
<sonar.skip>true</sonar.skip>
</properties>
</project>
/*******************************************************************************
* Copyright (c) 2014 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:
* Jordan Deyton (UT-Battelle, LLC.) - initial API and implementation and/or initial documentation
*
*******************************************************************************/
package org.eclipse.ice.client.widgets.geometry.test;
import org.eclipse.ice.viz.service.jme3.application.MasterApplication;
import org.eclipse.ice.viz.service.jme3.application.ViewAppState;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
/**
* This class can be used to test an embedded, custom {@link ViewAppState}. This
* test in particular tests the <code>GeometryEditor</code>'s view.
*
* @author Jordan Deyton
*
*/
public class GeometryViewLauncher {
public static void main(String[] args) {
// Create the display and shell.
Display display = new Display();
Shell shell = new Shell(display);
shell.open();
// Create the application and widgets that can create and dispose of jME
// views.
final MasterApplication app = MasterApplication.createApplication();
// Set the shell's Layout and create a SashForm with a left and right
// Composite.
shell.setLayout(new FillLayout());
// Wait until the Application is initialized.
app.blockUntilInitialized(0);
// Create a geometry view, start it, and embed it in the shell.
// TODO Uncomment this when class is implemented.
// GeometryAppState view = new GeometryAppState(app);
// view.start();
// view.createComposite(shell);
// Lay out the shell.
shell.layout();
// ---- Add geometries to the view. ---- //
// TODO
// ------------------------------------- //
// Close the display and shell.
while (!shell.isDisposed()) {
if (!display.readAndDispatch()) {
display.sleep();
}
}
display.dispose();
// Stop the ViewAppState and the Application.
// view.stop();
app.stop();
return;
}
}
/// *******************************************************************************
// * Copyright (c) 2014 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:
// * Jordan Deyton (UT-Battelle, LLC.) - initial API and implementation and/or
/// initial documentation
// *
// *******************************************************************************/
// package org.eclipse.ice.client.widgets.reactoreditor.plant.test;
//
// import java.util.ArrayList;
//
// import org.eclipse.ice.client.widgets.reactoreditor.plant.PlantAppState;
// import org.eclipse.ice.reactor.plant.CoreChannel;
// import org.eclipse.ice.reactor.plant.HeatExchanger;
// import org.eclipse.ice.reactor.plant.Junction;
// import org.eclipse.ice.reactor.plant.Pipe;
// import org.eclipse.ice.reactor.plant.PlantComposite;
// import org.eclipse.ice.reactor.plant.Reactor;
// import org.eclipse.ice.viz.service.jme3.application.MasterApplication;
// import org.eclipse.ice.viz.service.jme3.application.ViewAppState;
// import org.eclipse.swt.layout.FillLayout;
// import org.eclipse.swt.widgets.Display;
// import org.eclipse.swt.widgets.Shell;
//
/// **
// * This class can be used to test an embedded, custom {@link ViewAppState}.
/// This
// * test in particular tests the <code>MeshEditor</code>'s view.
// *
// * @author Jordan Deyton
// *
// */
// public class PlantViewLauncher {
//
// public static void main(String[] args) {
// // Create the display and shell.
// Display display = new Display();
// Shell shell = new Shell(display);
// shell.open();
//
// // Create the application and widgets that can create and dispose of jME
// // views.
// final MasterApplication app = MasterApplication.createApplication();
//
// // Set the shell's Layout and create a SashForm with a left and right
// // Composite.
// shell.setLayout(new FillLayout());
//
// // Wait until the Application is initialized.
// app.blockUntilInitialized(0);
//
// // Create a plant view, start it, and embed it in the shell.
// PlantAppState view = new PlantAppState();
// view.start(app);
// view.createComposite(shell);
//
// // Lay out the shell.
// shell.layout();
//
// // ---- Add a plant to the view. ---- //
// PlantComposite plant = new PlantComposite();
//
// Junction j1, j2;
// Pipe p1, p2;
// HeatExchanger h;
//
// p1 = new Pipe(3.0, 0.5);
// p1.setId(1);
// p1.setPosition(new double[] { 0, 0, 0 });
// p1.setOrientation(new double[] { 0, 1, 0 });
//
// p2 = new Pipe(5.0, 0.3);
// p2.setId(2);
// p2.setPosition(new double[] { 3.5, 7, -1 });
// p2.setOrientation(new double[] { 1, 1, 1 });
//
// h = new HeatExchanger();
// h.setId(3);
// h.setPosition(new double[] { 3, 0, -1 });
// h.setOrientation(new double[] { 0, 1, 0 });
// h.setLength(7);
// h.setInnerRadius(0.5);
//
// j1 = new Junction();
// j1.setId(4);
// j1.addInput(p1);
// j1.addOutput(h);
//
// j2 = new Junction();
// j2.setId(5);
// j2.addInput(h.getPrimaryPipe());
// j2.addOutput(p2);
//
// // Set the plant.
// view.setPlant(plant);
//
// // Add several plant components.
// // plant.addPlantComponent(j1);
// // plant.addPlantComponent(p1);
// // plant.addPlantComponent(j2);
// // plant.addPlantComponent(p2);
// // plant.addPlantComponent(h);
//
// CoreChannel c1 = new CoreChannel();
// c1.setId(7);
// c1.setLength(5);
// c1.setPosition(new double[] { 5, 0, 0 });
// c1.setOrientation(new double[] { 0, 1, 0 });
// c1.setRadius(0.5f);
// plant.addPlantComponent(c1);
//
// Reactor r = new Reactor();
// r.setId(6);
// plant.addPlantComponent(r);
//
// ArrayList<CoreChannel> coreChannels = new ArrayList<CoreChannel>(3);
// coreChannels.add(c1);
// r.setCoreChannels(coreChannels);
// // ---------------------------------- //
//
// // Close the display and shell.
// while (!shell.isDisposed()) {
// if (!display.readAndDispatch()) {
// display.sleep();
// }
// }
// display.dispose();
//
// // Stop the ViewAppState and the Application.
// view.stop();
// app.stop();
//
// return;
// }
// }
<?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.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.client.widgets.rcp</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ds.core.builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
#Sat Nov 24 16:55:17 EST 2012
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
#Sat Nov 24 16:55:17 EST 2012
eclipse.preferences.version=1
resolve.requirebundle=false
pluginProject.extensions=false
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Eclipse Widgets RCP Bundle
Bundle-SymbolicName: org.eclipse.ice.client.widgets.rcp;singleton:=true
Bundle-Version: 2.1.8
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.eclipse.ice.client.widgets.jme,
org.eclipse.ice.client.widgets.reactoreditor.plant
Import-Package: org.eclipse.core.resources,
org.eclipse.core.runtime;version="3.4.0",
org.eclipse.core.runtime.jobs,
org.eclipse.ice.datastructures.ICEObject,
org.eclipse.ice.reactor.plant,
org.eclipse.ice.viz.service.geometry.shapes,
org.eclipse.ice.viz.service.jme3.application,
org.eclipse.ice.viz.service.jme3.internal,
org.eclipse.ice.viz.service.jme3.widgets,
org.eclipse.jface.databinding.swt,
org.eclipse.ui.views.properties.tabbed,
org.osgi.framework,
org.slf4j;version="1.7.2"
Require-Bundle: org.eclipse.ice.client.compatibility;bundle-version="2.0.0",
org.eclipse.ice.datastructures,
org.eclipse.ice.viz.service;bundle-version="2.0.0"
Bundle-ClassPath: .
Bundle-Vendor: Oak Ridge National Laboratory
Bundle-ActivationPolicy: lazy
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
</head>
<body lang="EN-US">
<h2>About This Content</h2>
<p>July 1, 2014</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
apply to your use of any object code in the Content. Check the Redistributor's license that was
provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content
and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
<h3>Third Party Content</h3>
<p>The Content includes items that have been sourced from third parties as set out below. If you
did not receive this Content directly from the Eclipse Foundation, the following is provided
for informational purposes only, and you should look to the Redistributor's license for
terms and conditions of use.</p>
<p>
<strong>jMonkeyEngine 3</strong> <br/><br/>
The plug-in includes software developed by jMonkey Engine.
<br/><br/>
Your use of the jMonkey Engine code is subject to the terms and conditions of jME's BSD License,
a copy of which is contained in the file LICENSE and is also available at
<a href="http://hub.jmonkeyengine.org/wiki/doku.php/bsd_license">http://hub.jmonkeyengine.org/wiki/doku.php/bsd_license</a>.
<br/><br/>
Source code and further information about jMonkeyEngine can be found at <a href="http://hub.jmonkeyengine.org/">http://hub.jmonkeyengine.org/</a>.
</body>
</html>
\ No newline at end of file
output.. = bin/
bin.includes = META-INF/,\
.,\
pom.xml,\
build.properties,\
icons/
source.. = src/
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