The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-
If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") 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 http://www.eclipse.org.
-
-
-
\ No newline at end of file
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/build.properties b/org.eclipse.ice.client.widgets.reactoreditor/build.properties
deleted file mode 100644
index ff2afb3f0..000000000
--- a/org.eclipse.ice.client.widgets.reactoreditor/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = META-INF/,\
- build.properties,\
- .,\
- pom.xml,\
- schema/,\
- plugin.xml,\
- OSGI-INF/
-output.. = bin/
-source.. = src/
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/plugin.xml b/org.eclipse.ice.client.widgets.reactoreditor/plugin.xml
deleted file mode 100644
index 84943bad0..000000000
--- a/org.eclipse.ice.client.widgets.reactoreditor/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/pom.xml b/org.eclipse.ice.client.widgets.reactoreditor/pom.xml
deleted file mode 100644
index 908a8729c..000000000
--- a/org.eclipse.ice.client.widgets.reactoreditor/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 4.0.0
-
- ICE
- org.eclipse.ice.build
- 2.1.8
- ../${pom-filename}
-
- ICE
- org.eclipse.ice.client.widgets.reactoreditor
- eclipse-plugin
-
\ No newline at end of file
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/schema/org.eclipse.ice.client.widgets.reactoreditor.ireactoreditorregistry.exsd b/org.eclipse.ice.client.widgets.reactoreditor/schema/org.eclipse.ice.client.widgets.reactoreditor.ireactoreditorregistry.exsd
deleted file mode 100644
index 4d70c2ac9..000000000
--- a/org.eclipse.ice.client.widgets.reactoreditor/schema/org.eclipse.ice.client.widgets.reactoreditor.ireactoreditorregistry.exsd
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
- [Enter description of this extension point.]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [Enter the first release in which this extension point appears.]
-
-
-
-
-
-
-
-
- [Enter extension point usage example here.]
-
-
-
-
-
-
-
-
- [Enter API information here.]
-
-
-
-
-
-
-
-
- [Enter information about supplied implementation of this extension point.]
-
-
-
-
-
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AnalysisDataReader.java b/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AnalysisDataReader.java
deleted file mode 100644
index d09ea45cb..000000000
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AnalysisDataReader.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
- * Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.ice.reactor.LWRData;
-import org.eclipse.ice.reactor.LWRDataProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This class should read in data into data structures used by the
- * ReactorEditor. Ideally, the files read in by this class should be
- * standardized in some way. This class should read the files into a array (an
- * "assembly") of data providers.
- *
- * @author Jordan H. Deyton
- *
- */
-public class AnalysisDataReader {
-
- /**
- * Logger for handling event messages and other information.
- */
- private static final Logger logger = LoggerFactory
- .getLogger(AnalysisDataReader.class);
-
- // NOTES
- // 1) Currently, we have a Map of supported features. The map tells us if
- // we need to look for axial levels.
- // 2) readFeature expects the data to be in order from lowest-indexed to
- // highest in all cases. Axial data ordering may prove a problem if we
- // need to handle disordered feature data.
- // 3) Reading in the data should probably be handled by the specific
- // strategy that output the file in the first place.
-
- // FIXME - We may want to move this to the lwr package.
-
- /**
- * A map of features supported by this reader and whether or not they use
- * axial levels.
- */
- private Map supportedFeatures;
- /**
- * The arrays of data providers. The first index is the assembly, and the
- * second is the rod data provider.
- */
- private List> fuelAssemblies;
- /**
- * The number of rows in each assembly.
- */
- private int assemblyRows;
- /**
- * The number of columns in each assembly.
- */
- private int assemblyCols;
- /**
- * The number of axial levels for data that uses axial levels.
- */
- private int axialLevels;
-
- /**
- * This is used to check the lines of input that contain the data. Since it
- * is required in a few methods, we make it an instance variable.
- */
- private String dataRowRegex;
-
- /**
- * The default constructor. Standard procedure requires a call to readData()
- * to actually read in the data.
- */
- public AnalysisDataReader() {
- // Build the currently supported features (computed by the
- // GodfreyStrategy).
- supportedFeatures = new HashMap(4);
- supportedFeatures.put("Fuel Pin Difference", true);
- supportedFeatures.put("Fuel Pin Powers Uncertainties", true);
- supportedFeatures.put("Radial Power", false);
- supportedFeatures.put("Radial Power Difference", false);
- }
-
- /**
- * Reads in data from a provided file. Data will be stored within this
- * instance and should be queried through other functions.
- *
- * @param uri
- * The URI of the data file to read from.
- */
- public void readData(URI uri) {
-
- // Get a File object from the URI and get its name.
- File file = new File(uri.getPath());
- String fileName = file.getName();
-
- // Make sure the file exists.
- if (!file.exists()) {
- System.err.println("Invalid file " + fileName + ". Cannot read data.");
- return;
- }
-
- // Read in the data.
- try {
- // Create a BufferedReader from the file.
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- new FileInputStream(file)));
-
- // Get the number of assemblies.
- int assemblies = Integer.parseInt(reader.readLine().split(":")[1]
- .trim());
- // Get the number of axial levels.
- axialLevels = Integer.parseInt(reader.readLine().split(":")[1]
- .trim());
- // Get the number of rows in each assembly.
- assemblyRows = Integer.parseInt(reader.readLine().split(":")[1]
- .trim());
- // Get the number of columns in each assembly.
- assemblyCols = Integer.parseInt(reader.readLine().split(":")[1]
- .trim());
-
- // Set up the regular expressions used to check the lines of data.
- // dlbRegex is the regular expression for a double with the logic:
- // 1-or-more digits, maybe followed by a period and
- // 1-or-more-digits.
- String dblRegex = "-?\\d+(\\.\\d+)?";
- // dataRowRegex makes sure that the number of doubles on a line is
- // exactly the same as the number of columns in an assembly. The
- // logic here is:
- // Start of line (^), 0-or-more whitespace (\\s*), a double followed
- // by 1-or-more whitespace (dblRegex + \\s+) exactly assemblyCols-1
- // times ({assemblyCols - 1}), a double (dblRegex), 0-or-more
- // whitespace (\\s*), end of line ($).
- dataRowRegex = "^\\s*(" + dblRegex + "\\s+){" + (assemblyCols - 1)
- + "}" + dblRegex + "\\s*$";
-
- // Initialize the array of fuel assemblies.
- fuelAssemblies = new ArrayList>(assemblies);
-
- // Each fuel assembly is an array of rod data providers.
- List fuelAssembly;
-
- // Build the array of fuel assemblies.
- for (int i = 0; i < assemblies; i++) {
- fuelAssembly = new ArrayList();
- for (int j = 0; j < assemblyRows * assemblyCols; j++) {
- fuelAssembly.add(new LWRDataProvider());
- }
- fuelAssemblies.add(fuelAssembly);
- }
-
- // Read in the data file one feature at a time.
- String feature;
- while ((feature = nextLine(reader)) != null) {
- if (supportedFeatures.containsKey(feature)) {
- readFeature(reader, feature, supportedFeatures.get(feature));
- }
- // If the line does not match any feature, this should just read
- // the next line until a feature is read.
- }
-
- // Close the reader.
- reader.close();
- } catch (IOException e) {
- // Handle IOExceptions.
- System.err.println("IOException while reading " + fileName
- + ". Cannot read data.");
- logger.error(getClass().getName() + " Exception!",e);
- } catch (NumberFormatException e) {
- // Handle NumberFormatExceptions. These are thrown when dataRowRegex
- // is not matched.
- System.err.println("NumberFormatException while reading " + fileName
- + ". Invalid number.");
- logger.error(getClass().getName() + " Exception!",e);
- }
- ;
- }
-
- /**
- * Get the number of rows in each assembly.
- *
- * @return The number of rows in each assembly.
- */
- public int getAssemblyRows() {
- return assemblyRows;
- }
-
- /**
- * Get the number of columns in each assembly.
- *
- * @return The number of columns in each assembly.
- */
- public int getAssemblyColumns() {
- return assemblyCols;
- }
-
- /**
- * Get the number of axial levels used for the assembly data.
- *
- * @return The number of axial levels used for the assembly data.
- */
- public int getAxialLevels() {
- return axialLevels;
- }
-
- /**
- * Get the number of assemblies read in from the provided data.
- *
- * @return Returns the number of assemblies read in or 0 if no data has been
- * read in.
- */
- public int getNumberOfAssemblies() {
- int count = 0;
- if (fuelAssemblies != null) {
- count = fuelAssemblies.size();
- }
- return count;
- }
-
- /**
- * Get an array of LWRDataProviders for a particular fuel assembly. Each
- * LWRDataProvider provides data for a single rod and multiple features.
- *
- * @param assembly
- * The index of the assembly.
- * @return An ArrayList of LWRDataProviders, or null if assembly is an
- * invalid index or the data has not been read in.
- */
- public List getAssemblyDataProviders(int assembly) {
- List fuelAssembly = null;
- if ((fuelAssemblies != null) && (assembly >= 0)
- && (assembly < fuelAssemblies.size())) {
- fuelAssembly = fuelAssemblies.get(assembly);
- }
- return fuelAssembly;
- }
-
- /**
- * This function gets the next non-empty line from a BufferedReader. Empty
- * lines may include whitespace.
- *
- * @param reader
- * The BufferedReader from which to read.
- * @return The next non-empty line or null (if reader.readLine() == null).
- * @throws IOException
- * IOExceptions from reading need to be handled by the caller.
- */
- private String nextLine(BufferedReader reader) throws IOException {
- String line = null;
- while ((line = reader.readLine()) != null) {
- // If the line is not empty, break from the loop.
- if (!(line.trim().isEmpty())) {
- break;
- }
- }
- return line;
- }
-
- /**
- * Gets the next non-empty line of text from the reader if it matches it
- * with a regular expression.
- *
- * @param reader
- * The BufferedReader from which to read.
- * @param expected
- * The regular expression to match against.
- * @return Returns the next line from the reader if it matches with the
- * regular expression.
- * @throws IOException
- * Throws an IOException either from reading or if the pattern
- * is not matched.
- */
- private String nextLine(BufferedReader reader, String expected)
- throws IOException {
- String line = null;
- while ((line = reader.readLine()) != null) {
- // If the line is not empty, break from the loop.
- if (!(line.trim().isEmpty())) {
- break;
- }
- }
- // Compare the line against the regular expression.
- if (!line.matches(expected)) {
- System.err.println("Expected string of form \"" + expected
- + "\" but got \"" + line + "\"");
- throw new IOException();
- }
- return line;
- }
-
- /**
- * Reads in a feature from the text file. This means grabbing data for each
- * rod in each assembly at all possible axial levels.
- *
- * @param reader
- * The BufferedReader used to read the file.
- * @param feature
- * The feature to read in.
- * @param useAxialLevels
- * Whether or not to look for axial levels in the data.
- * @throws IOException
- * The caller needs to handle reading IO exceptions.
- * @throws NumberFormatException
- * The caller needs to handle invalid doubles.
- */
- private void readFeature(BufferedReader reader, String feature,
- boolean useAxialLevels) throws IOException, NumberFormatException {
-
- // Try to read in the feature data for each fuel assembly.
- for (int assembly = 0; assembly < fuelAssemblies.size(); assembly++) {
- // Expected "Assembly #"
- String line = nextLine(reader, "^Assembly\\s" + assembly + "\\s*$");
-
- // Get the current fuel assembly.
- List fuelAssembly = fuelAssemblies.get(assembly);
-
- // See if we need to iterate over axial levels.
- int iterations = 1;
- if (useAxialLevels) {
- iterations = axialLevels;
- }
-
- // Loop over the axial levels (if applicable).
- for (int i = 0; i < iterations; i++) {
- // Expected "Axial Level #" (if axial levels are used with this
- // feature).
- if (useAxialLevels) {
- line = nextLine(reader, "^Axial Level\\s" + i + "\\s*$");
- }
- // Loop over the rows of the assembly data. Each line at this
- // point should be lines of doubles matching the dataRowRegex.
- for (int row = 0; row < assemblyRows; row++) {
- line = nextLine(reader, dataRowRegex);
- // Expected assemblyCols numbers.
- String[] splitLine = line.trim().split("\\s+");
-
- // Loop over each value in the row.
- for (int col = 0; col < assemblyCols; col++) {
- // Store the feature/value pair in the data provider.
- LWRData data = new LWRData(feature);
- data.setValue(Double.parseDouble(splitLine[col]));
- fuelAssembly.get(row * assemblyCols + col).addData(
- data, 0);
- }
- }
- }
- }
- }
-
-}
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IReactorEditorRegistry.java b/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IReactorEditorRegistry.java
deleted file mode 100644
index e66feb917..000000000
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IReactorEditorRegistry.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
- * Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
-
-/**
- * An IReactorEditorRegistry maintains a group of {@link ReactorFormEditor}s.
- * Implementations may expand the behavior to include additional features like
- * setting the {@link ReactorFormInput} for one of the editors.
- *
- * @author Jordan
- *
- */
-public interface IReactorEditorRegistry {
-
- /**
- * Adds a {@link ReactorFormEditor} to the registry with the specified ID.
- * The ID is the same as the associated Item or Form.
- *
- * @param editor
- * The ReactorFormEditor that has been created.
- * @param id
- * The ID of the editor. This should be the same as its
- * associated Item or Form.
- */
- public void addReactorEditor(ReactorFormEditor editor, int id);
-
- /**
- * Removes a {@link ReactorFormEditor} from the registry.
- *
- * @param id
- * The ID of the editor. This should be the same as its
- * associated Item or Form.
- */
- public void removeReactorEditor(int id);
-
-}
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorEclipseFormWidget.java b/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorEclipseFormWidget.java
deleted file mode 100644
index 38e8eb5e2..000000000
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorEclipseFormWidget.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
- * Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
-
-import org.eclipse.ice.client.widgets.EclipseFormWidget;
-import org.eclipse.ice.client.widgets.ICEFormEditor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class extends the EclipseFormWidget and opens the ReactorFormEditor
- * instead of the ICEFormEditor.
- *
- * @author Jay Jay Billings
- *
- */
-public class ReactorEclipseFormWidget extends EclipseFormWidget {
-
- /**
- * The current registry used to generate analysis widgets for customized
- * analysis views.
- */
- private final IAnalysisWidgetRegistry widgetRegistry;
-
- /**
- * The current registry of ReactorFormEditors.
- */
- private final IReactorEditorRegistry editorRegistry;
-
- /**
- * The default constructor.
- *
- * @param widgetRegistry
- * The {@link IAnalysisWidgetRegistry} used to pull tailored
- * analysis views.
- * @param editorRegistry
- * The {@link IReactorEditorRegistry} used to store references to
- * open reactor editors.
- */
- public ReactorEclipseFormWidget(IAnalysisWidgetRegistry widgetRegistry,
- IReactorEditorRegistry editorRegistry) {
-
- // Set the registry.
- this.widgetRegistry = widgetRegistry;
- this.editorRegistry = editorRegistry;
-
- return;
- }
-
- /**
- * This operation displays the ReactorFormEditor.
- */
- @Override
- public void display() {
-
- // Local Declarations
- IWorkbenchPage page = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
-
- // If the Form has been set, load the widget
- if (widgetForm != null) {
-
- // Setup the Input. We need to pass the registry to the
- // ReactorFormEditor through the input.
- ReactorFormInputFactory factory = new ReactorFormInputFactory();
- ICEFormInput = factory.createInput(widgetForm, widgetRegistry);
-
- // Open the page
- try {
- IEditorPart formEditor = page.openEditor(ICEFormInput,
- ReactorFormEditor.ID);
- // Set this editor reference so that listeners can be registered
- // later.
- ICEFormEditor = (ICEFormEditor) formEditor;
-
- // Add the ReactorFormEditor to the registry.
- editorRegistry.addReactorEditor((ReactorFormEditor) formEditor,
- ICEFormInput.getForm().getId());
-
- } catch (PartInitException e) {
- // Dump the stacktrace if something happens.
- logger.error(getClass().getName() + " Exception!",e);
- }
-
- }
-
- return;
- }
-
-}
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorFormEditor.java b/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorFormEditor.java
deleted file mode 100644
index 53b44a002..000000000
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorFormEditor.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
- * Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ice.client.widgets.ICEFormEditor;
-import org.eclipse.ice.client.widgets.ICEFormPage;
-import org.eclipse.ice.client.widgets.ICEMasterDetailsPage;
-import org.eclipse.ice.client.widgets.ICEResourcePage;
-import org.eclipse.ice.datastructures.ICEObject.Component;
-import org.eclipse.ice.datastructures.componentVisitor.IReactorComponent;
-import org.eclipse.ice.datastructures.form.Form;
-import org.eclipse.ice.datastructures.form.MasterDetailsComponent;
-import org.eclipse.ice.datastructures.form.ResourceComponent;
-import org.eclipse.ice.reactorAnalyzer.ReactorAnalyzer;
-import org.eclipse.ice.reactorAnalyzer.ReactorComposite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-
-/**
- * This class extends the default ICEFormEditor to enable it to draw data from
- * the ReactorAnalyzer better.
- *
- * @author Jay Jay Billings
- *
- */
-public class ReactorFormEditor extends ICEFormEditor {
-
- /**
- * ID for Eclipse
- */
- public static final String ID = "org.eclipse.ice.client.widgets.reactor.editor";
-
- /**
- * The ReactorPage displayed by this ReactorFormEditor. There is only one
- * AnalysisToolComposite for displaying reactor information.
- */
- private ReactorPage reactorPage;
-
- /**
- * The input to this form editor. It contains useful information, like the
- * {@link IAnalysisWidgetRegistry} used to generate {@link IAnalysisView}s.
- */
- private ReactorFormInput input;
-
- /**
- * This operation overrides init so that the ICE Form, passed as an
- * IEditorInput, can be stored. Furthermore, it gathers any input that is
- * specifically associated with a ReactorFormEditor.
- */
- @Override
- public void init(IEditorSite site, IEditorInput input) {
-
- // Check the input. We *must* have a ReactorFormInput.
- if (!(input instanceof ReactorFormInput)) {
- throw new RuntimeException(
- "Input passed to ReactorFormEditor.init()"
- + " is not of type ReactorFormInput.");
- }
- // Store a reference to the form input.
- this.input = (ReactorFormInput) input;
-
- // Continue with the super-class' init() behavior.
- super.init(site, input);
-
- // Register with the Form shared with the ReactorAnalyzer Item. This is
- // so we can receive notifications when new components are added.
- iceDataForm.register(this);
-
- return;
- }
-
- /**
- * This operation overrides the default drawing routines of ICE's Form
- * Editor to load the custom analysis widgets for nuclear reactors.
- */
- @Override
- protected void addPages() {
-
- // Local Declaration
- ArrayList formPages = new ArrayList();
- ResourceComponent resourceComponent;
- ArrayList components;
-
- // Loop over the DataComponents and get them into the map
- for (Component i : iceDataForm.getComponents()) {
- logger.info("ReactorFormEditor Message: "
- + "Adding component " + i.getName() + " " + i.getId());
- i.accept(this);
- }
-
- // ---- Create the ReactorPage. ---- //
-
- // Get the reactor Components. If the IReactorEditor initialized
- // properly, there should be an input and reference reactor component.
- components = componentMap.get("reactor");
- if (!(components.isEmpty())) {
- // Get the ReactorComposite. It should be the only IReactorComponent
- // held by the form.
- ReactorComposite reactorComposite = (ReactorComposite) components
- .get(0);
-
- // Create the SelectionProvider used to feed the current selection
- // from all the AnalysisViews to the Editor's IWorkbenchPartSite.
- // FIXME - I'm not sure how this will work with multiple reactor
- // editors open!
- SelectionProvider provider = new SelectionProvider();
- getSite().setSelectionProvider(provider);
-
- // Create the page itself.
- reactorPage = new ReactorPage(this, "Reactor", "Reactor Page");
-
- // Set the registry, broker, selection provider, and reactor
- // composite for the ReactorPage.
- reactorPage.setAnalysisWidgetRegistry(input.getRegistry());
- reactorPage.setStateBroker(input.getStateBroker());
- reactorPage.setSelectionProvider(provider);
- reactorPage.setReactorComposite(reactorComposite);
-
- // Add the resource component for comparison data.
- reactorPage.addComponent((componentMap
- .get("output").get(0)));
-
- // Add the data Components (input and reference loaders) to the
- // first page only.
- components = componentMap.get("data");
- if (!(components.isEmpty())) {
- // Add the data Components to the page.
- for (Component comp : components) {
- reactorPage.addComponent(comp);
- }
- }
- // Add the ReactorPages to the Editor's FormPages.
- formPages.add(reactorPage);
- } else {
- logger.info("ReactorFormEditor Message: "
- + "No IReactorEditor present. IReactorComponents will not "
- + "be rendered.");
- }
- /* ---------------------------------- */
-
- /* ---- Create the Analysis Configuration page. ---- */
- // This page allows the user to configure KDD strategies and run them.
-
- // Create pages for the MasterDetailsComponents
- if (!(componentMap.get("masterDetails").isEmpty())) {
- // Local Declarations
- MasterDetailsComponent masterDetailsComponent = null;
-
- // Get the MasterDetailsComponent and create the MasterDetails page.
- if (!(componentMap.get("masterDetails").isEmpty())) {
- masterDetailsComponent = (MasterDetailsComponent) (componentMap
- .get("masterDetails").get(0));
- if (masterDetailsComponent != null) {
- // Get the name
- String name = masterDetailsComponent.getName();
- // Make the page
- ICEMasterDetailsPage iCEMasterDetailsPage = new ICEMasterDetailsPage(
- this, "MDPid", name);
-
- // Set the MasterDetailsComponent
- iCEMasterDetailsPage
- .setMasterDetailsComponent(masterDetailsComponent);
-
- formPages.add(iCEMasterDetailsPage);
- }
- }
- }
- /* ------------------------------------------------- */
-
- /* ---- Create the Analysis Artifacts page. ---- */
- // This page allows the user to view resources (results) from the KDD
- // strategies on the previous page.
-
- // Create the page for ResourceComponents
- if (!(componentMap.get("output").isEmpty())) {
- resourceComponent = (ResourceComponent) (componentMap.get("output")
- .get(0));
- if (resourceComponent != null) {
- // Make the page
- resourceComponentPage = new ICEResourcePage(this,
- resourceComponent.getName(),
- resourceComponent.getName());
- // Set the ResourceComponent
- resourceComponentPage.setResourceComponent(resourceComponent);
- }
- formPages.add(resourceComponentPage);
- }
- /* --------------------------------------------- */
-
- // Add the pages created above to the ReactorFormEditor.
- try {
- for (ICEFormPage i : formPages) {
- addPage(i);
- }
- } catch (PartInitException e) {
- logger.error(getClass().getName() + " Exception!",e);
- }
-
- return;
- }
-
- /**
- * Overrides the doSave() behavior from ICEFormEditor to ensure that all
- * ReactorSectionParts (AnalysisToolComposites) in rendered ReactorPages
- * refresh with the new data.
- */
- @Override
- public void doSave(IProgressMonitor monitor) {
- // Perform the standard doSave behavior.
- super.doSave(monitor);
-
- // We need to refresh the other reactor pages, too! Otherwise, if they
- // have been rendered, they will not refresh their data immediately.
-
- // Get the currently-selected page.
- ICEFormPage selectedPage = (ICEFormPage) this.getSelectedPage();
- // For the other ReactorPages, refresh all of their parts.
- if (reactorPage != null && reactorPage != selectedPage) {
- // Check to make sure the ReactorPage has been rendered.
- IManagedForm managedForm = reactorPage.getManagedForm();
- if (managedForm != null) {
- for (IFormPart part : managedForm.getParts()) {
- part.refresh();
- }
-
- }
- }
-
- /*
- * To re-create the bug that necessitates this override, comment out the
- * above code (except for the super call). Open a new Reactor Analyzer
- * in ICE. Briefly open the second Reactor Page (Fuel Assembly/Pin),
- * then go back to the first page (Reactor/Fuel Assembly).
- *
- * Now, load an SFReactor file. The ICEFormEditor.doSave() method calls
- * refresh on the currently-opened ReactorPage. However, the second
- * ReactorPage will only be updated when the reactor SFRComponent
- * notifies its listeners, which does not happen until another SFR file
- * is loaded.
- *
- * What this means is that the second page will still display an LWR
- * grid until you load a second SFR file!
- *
- * The third page is OK, because it's not been rendered yet.
- */
- }
-
- @Override
- public void setInput(IEditorInput editorInput) {
- // // Get the old ReactorFormInput if possible.
-
- super.setInput(editorInput);
-
- // Update the form with any new input/reference components and pass on
- // any new information required by the ReactorPage.
- if (editorInput instanceof ReactorFormInput) {
- // Get the ReactorFormInput and the Form associated with this
- // editor/Reactor Analyzer.
- ReactorFormInput formInput = (ReactorFormInput) editorInput;
- Form form = formInput.getForm();
-
- // Get the ReactorComposite from the form.
- ReactorComposite reactorComposite = (ReactorComposite) form
- .getComponent(ReactorAnalyzer.reactorCompositeId);
-
- // If necessary, update the input reactor component in the form.
- IReactorComponent input = formInput.getInputReactorComponent();
- if (input != null) {
-
- // Get the ID used for the input reactor component.
- int id = ReactorAnalyzer.inputReactorComponentId;
-
- // If the component is different from the previous one, we need
- // to update the form.
- IReactorComponent oldInput = reactorComposite
- .getReactorComponent(id);
- if (input != oldInput) {
- // Update the ReactorComposite.
- reactorComposite.setComponent(id, input);
- }
- }
-
- IReactorComponent reference = formInput
- .getReferenceReactorComponent();
- if (reference != null) {
-
- // Get the ID used for the reference reactor component.
- int id = ReactorAnalyzer.referenceReactorComponentId;
-
- // If the component is different from the previous one, we need
- // to update the form.
- IReactorComponent oldReference = reactorComposite
- .getReactorComponent(id);
- if (reference != oldReference) {
- // Update the ReactorComposite.
- reactorComposite.setComponent(id, reference);
- }
- }
-
- // Set the reactor page's StateBroker if the page has been created.
- StateBroker newBroker = formInput.getStateBroker();
- if (reactorPage != null) {
- reactorPage.setStateBroker(newBroker);
- }
- // Tell the core that the form has been updated.
- notifyUpdateListeners();
- }
-
- return;
- }
-
-}
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorFormInput.java b/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorFormInput.java
deleted file mode 100644
index a39c8940d..000000000
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorFormInput.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
- * Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
-
-import org.eclipse.ice.client.widgets.ICEFormInput;
-import org.eclipse.ice.datastructures.componentVisitor.IReactorComponent;
-import org.eclipse.ice.datastructures.form.Form;
-import org.eclipse.ice.datastructures.resource.ICEResource;
-import org.eclipse.ice.reactorAnalyzer.ReactorAnalyzer;
-
-/**
- * This class provides input for {@link ReactorFormEditor}s. It requires both an
- * {@link IAnalysisWidgetRegistry} and a {@link StateBroker}. All
- * ReactorFormEditors share the same analysis widget registry, but they do not
- * necessarily share the same StateBroker. Two editors can be linked together by
- * making them share the same StateBroker.
- *
- * @author Jordan H. Deyton
- *
- */
-public class ReactorFormInput extends ICEFormInput {
-
- /**
- * The registry that provides the available {@link IAnalysisView}s to the
- * reactor editor.
- */
- private final IAnalysisWidgetRegistry registry;
-
- /**
- * The StateBroker that manages selections in the reactor editor.
- */
- private final StateBroker broker;
-
- /**
- * The input reactor component.
- */
- private IReactorComponent inputReactor;
- /**
- * The source file for {@link #inputReactor}.
- */
- private ICEResource inputSource;
-
- /**
- * The reference reactor component.
- */
- private IReactorComponent referenceReactor;
- /**
- * The source file for {@link #referenceReactor}.
- */
- private ICEResource referenceSource;
-
- /**
- * The default constructor. This creates input for a
- * {@link ReactorFormEditor} and creates a new StateBroker for the editor.
- *
- * @param inputForm
- * The form associated with the Reactor Analyzer item.
- * @param registry
- * The registry that provides the available {@link IAnalysisView}
- * s to the reactor editors.
- */
- public ReactorFormInput(Form inputForm, IAnalysisWidgetRegistry registry) {
- this(inputForm, registry, new StateBroker());
- }
-
- /**
- * This constructor provides the specified StateBroker for the
- * {@link ReactorFormEditor}.
- *
- * @param inputForm
- * The form associated with the Reactor Analyzer item.
- * @param registry
- * The registry that provides the available {@link IAnalysisView}
- * s to the reactor editors.
- * @param broker
- * The StateBroker that manages selections in the reactor editor.
- */
- public ReactorFormInput(Form inputForm, IAnalysisWidgetRegistry registry,
- StateBroker broker) {
- super(inputForm);
-
- this.registry = registry;
- this.broker = broker;
-
- return;
- }
-
- /**
- * Gets the registry that provides the available {@link IAnalysisView}s to
- * the reactor editors.
- *
- * @return The input's IAnalysisWidgetRegistry.
- */
- public IAnalysisWidgetRegistry getRegistry() {
- return registry;
- }
-
- /**
- * Gets the StateBroker that manages selections in the reactor editor.
- *
- * @return The input's StateBroker.
- */
- public StateBroker getStateBroker() {
- return broker;
- }
-
- /**
- * Sets the input reactor component used by the {@link ReactorAnalyzer}.
- *
- * @param input
- * The new input reactor component.
- * @param source
- * The source file for the input reactor component.
- */
- public void setInputReactorComponent(IReactorComponent input,
- ICEResource source) {
-
- if (input != null && source != null) {
- inputReactor = input;
- inputSource = source;
- }
-
- return;
- }
-
- /**
- * Gets the input IReactorComponent. This will be used to update the form
- * for the {@link ReactorFormEditor}.
- *
- * @return The new input reactor component.
- */
- public IReactorComponent getInputReactorComponent() {
- return inputReactor;
- }
-
- /**
- * Gets the ICEResource for the file that contains the input
- * IReactorComponent.
- *
- * @return The source file for the input reactor component.
- */
- public ICEResource getInputReactorComponentSource() {
- return inputSource;
- }
-
- /**
- * Sets the reference reactor component used by the {@link ReactorAnalyzer}.
- * This updates the underlying form!
- *
- * @param reference
- * The new reference reactor component.
- * @param source
- * The source file for the reference reactor component.
- */
- public void setReferenceReactorComponent(IReactorComponent reference,
- ICEResource source) {
-
- if (reference != null && source != null) {
- referenceReactor = reference;
- referenceSource = source;
- }
-
- return;
- }
-
- /**
- * Gets the reference IReactorComponent. This will be used to update the
- * form for the {@link ReactorFormEditor}.
- *
- * @return The new reference reactor component.
- */
- public IReactorComponent getReferenceReactorComponent() {
- return referenceReactor;
- }
-
- /**
- * Gets the ICEResource for the file that contains the reference
- * IReactorComponent.
- *
- * @return The source file for the reference reactor component.
- */
- public ICEResource getReferenceReactorComponentSource() {
- return referenceSource;
- }
-
-}
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorFormInputFactory.java b/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorFormInputFactory.java
deleted file mode 100644
index b4ae98073..000000000
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorFormInputFactory.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
- * Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
-
-import org.eclipse.ice.datastructures.componentVisitor.IReactorComponent;
-import org.eclipse.ice.datastructures.form.Form;
-import org.eclipse.ice.datastructures.resource.ICEResource;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.jface.viewers.TreePath;
-
-/**
- * This factory is used to help construct {@link ReactorFormInput} for a
- * {@link ReactorFormEditor}.
- *
- * @author Jordan H. Deyton
- *
- */
-public class ReactorFormInputFactory {
-
- /**
- * The default method for creating {@link ReactorFormInput}.
- *
- * @param inputForm
- * The form associated with the Reactor Analyzer item.
- * @param registry
- * The registry that provides the available {@link IAnalysisView}
- * s to the reactor editor.
- * @return A new ReactorFormInput if the parameters are not null, null
- * otherwise.
- */
- public ReactorFormInput createInput(Form inputForm,
- IAnalysisWidgetRegistry registry) {
-
- ReactorFormInput input = null;
-
- if (inputForm != null && registry != null) {
- input = new ReactorFormInput(inputForm, registry);
- }
-
- return input;
- }
-
- /**
- * This method creates a {@link ReactorFormInput} based on previous input
- * and a new {@link StateBroker}.
- *
- * @param oldInput
- * The previous input for the Reactor Analyzer.
- * @param broker
- * The new StateBroker that should be used to manage selections
- * in the reactor editor.
- * @return A new ReactorFormInput if the parameters are not null, null
- * otherwise.
- */
- public ReactorFormInput createInput(ReactorFormInput oldInput,
- StateBroker broker) {
-
- ReactorFormInput input = null;
-
- if (oldInput != null && broker != null) {
- // Create the basic ReactorFormInput.
- Form inputForm = oldInput.getForm();
- IAnalysisWidgetRegistry registry = oldInput.getRegistry();
- input = new ReactorFormInput(inputForm, registry, broker);
- }
-
- return input;
- }
-
- /**
- * This method creates a {@link ReactorFormInput} based on previous input
- * and a {@link ITreeSelection} that will be used to generate a new
- * {@link StateBroker}.
- *
- * @param oldInput
- * The previous input for the Reactor Analyzer.
- * @param selection
- * A selection of {@link IReactorComponent}s that will be fed
- * into a new StateBroker.
- * @param dataSource
- * the DataSource that the selection is being sent to, e.g.,
- * Input or Reference.
- * @return A new ReactorFormInput if the parameters are not null, null
- * otherwise.
- */
- public ReactorFormInput createInput(ReactorFormInput oldInput,
- ITreeSelection selection, DataSource dataSource) {
- ReactorFormInput input = null;
-
- if (oldInput != null && selection != null) {
- // Create the basic ReactorFormInput with a new StateBroker.
- StateBroker broker = new StateBroker();
- broker.copyValues(oldInput.getStateBroker());
- Form inputForm = oldInput.getForm();
- IAnalysisWidgetRegistry registry = oldInput.getRegistry();
-
- // Reset all keys associated with this data source.
- broker.resetSource(dataSource.toString());
-
- IReactorComponent rootComponent = null;
-
- // Create the form input.
- input = new ReactorFormInput(inputForm, registry, broker);
-
- // Update the StateBroker based on the ITreeSelection.
- if (!selection.isEmpty()) {
- TreePath path = selection.getPaths()[0];
-
- IAnalysisWidgetFactory factory;
- IStateBrokerHandler handler;
-
- // Loop over the segments in the TreePath. Each segment is a
- // node in the tree from the root to the selected object.
- int size = path.getSegmentCount();
- Object lastObject = null;
- for (int i = 0; i < size; i++) {
- Object object = path.getSegment(i);
-
- // Get the IAnalysisWidgetFactory for the object, then get
- // an IStateBrokerKeyProvider from the factory. Use the key
- // provider to get a key, then update the StateBroker with
- // the object.
- factory = registry.getAnalysisWidgetFactory(object
- .getClass());
- if (factory != null) {
- handler = factory.createStateBrokerHandler();
- handler.setDataSource(dataSource);
- if (handler.addValue(object, lastObject, broker)) {
- lastObject = object;
-
- // If possible, set the input reactor and its
- // resource for the input.
- if (rootComponent == null) {
- rootComponent = (IReactorComponent) object;
- ICEResource source = (ICEResource) path
- .getSegment(0);
-
- if (dataSource == DataSource.Input) {
- input.setInputReactorComponent(
- rootComponent, source);
- } else {
- input.setReferenceReactorComponent(
- rootComponent, source);
- }
- }
- }
- }
- }
- }
- }
-
- return input;
- }
-
-}
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorFormWidgetBuilder.java b/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorFormWidgetBuilder.java
deleted file mode 100644
index 74e718365..000000000
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorFormWidgetBuilder.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
- * Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ice.client.widgets.IFormWidgetBuilder;
-import org.eclipse.ice.iclient.uiwidgets.IFormWidget;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This class provides the declarative service that registers the Reactor Editor
- * Form Widget with ICE's service for dynamically extending the widget factory.
- *
- * @author Jay Jay Billings
- *
- */
-public class ReactorFormWidgetBuilder implements IFormWidgetBuilder {
-
- /**
- * Logger for handling event messages and other information.
- */
- private static final Logger logger = LoggerFactory
- .getLogger(ReactorFormWidgetBuilder.class);
-
- /**
- * The name of the items/forms used to create {@link ReactorFormEditor}s.
- * This should be the same as the name in the Reactor Analyzer item class.
- */
- public static final String name = "Reactor Analyzer";
-
- /**
- * The current registry used to generate analysis widgets for customized
- * analysis views.
- */
- private IAnalysisWidgetRegistry widgetRegistry = null;
-
- /**
- * The current registry of ReactorFormEditors.
- */
- private IReactorEditorRegistry editorRegistry = null;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ice.client.widgets.IFormWidgetBuilder#getTargetFormName
- * ()
- */
- @Override
- public String getTargetFormName() {
- return name;
- }
-
- /**
- * This operation builds the FormWidget.
- *
- * @return The FormWidget for the Reactor Editor.
- */
- @Override
- public IFormWidget build() {
-
- ReactorEclipseFormWidget widget = null;
-
- if (widgetRegistry == null || editorRegistry == null) {
- logger.info("ReactorFormWidgetBuilder error: "
- + "No analysis widget registry or editor registry "
- + "available for creating a ReactorEclipseFormWidget!");
- } else {
- widget = new ReactorEclipseFormWidget(widgetRegistry,
- editorRegistry);
- }
-
- return widget;
- }
-
- /**
- * Sets the IAnalysisWidgetRegistry used by {@link AnalysisToolComposite}s
- * in {@link ReactorPage}s.
- *
- * @param registry
- * The widget registry.
- */
- public void setAnalysisWidgetRegistry(IAnalysisWidgetRegistry registry) {
- logger.info("ReactorFormWidgetBuilder: "
- + "Adding new IAnalysisWidgetRegistry.");
- if (registry != null) {
- this.widgetRegistry = registry;
- }
- return;
- }
-
- /**
- * Sets the IReactorEditorRegistry to which {@link ReactorFormEditor}s
- * should register when they are created. These editors are contacted from
- * the ReactorViewer in the reactors perspective.
- *
- * @param registry
- * The editor registry.
- */
- public void setReactorEditorRegistry(IReactorEditorRegistry registry) {
- logger.info("ReactorFormWidgetBuilder: "
- + "Adding new IReactorEditorRegistry.");
- if (registry != null) {
- this.editorRegistry = registry;
- }
-
- IConfigurationElement[] elements = Platform.getExtensionRegistry()
- .getConfigurationElementsFor(
- "org.eclipse.ice.client.widgets.reactoreditor.ireactoreditorregistry");
- logger.info(
- "Available configuration elements(in org.eclipse.ice.client.widgets.reactoreditor.ReactorFormInputFactory.java):");
- for (IConfigurationElement element : elements) {
- logger.info(
- element.getNamespaceIdentifier() + " " + element.getName());
- }
-
- return;
- }
-}
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorPage.java b/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorPage.java
deleted file mode 100644
index 93b92b39f..000000000
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ReactorPage.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
- * Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
-
-import java.util.ArrayList;
-
-import org.eclipse.ice.client.widgets.ICEFormEditor;
-import org.eclipse.ice.client.widgets.ICEFormPage;
-import org.eclipse.ice.datastructures.ICEObject.Component;
-import org.eclipse.ice.datastructures.ICEObject.IUpdateable;
-import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener;
-import org.eclipse.ice.datastructures.ICEObject.ListComponent;
-import org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor;
-import org.eclipse.ice.datastructures.componentVisitor.IReactorComponent;
-import org.eclipse.ice.datastructures.form.AdaptiveTreeComposite;
-import org.eclipse.ice.datastructures.form.DataComponent;
-import org.eclipse.ice.datastructures.form.GeometryComponent;
-import org.eclipse.ice.datastructures.form.MasterDetailsComponent;
-import org.eclipse.ice.datastructures.form.MatrixComponent;
-import org.eclipse.ice.datastructures.form.MeshComponent;
-import org.eclipse.ice.datastructures.form.ResourceComponent;
-import org.eclipse.ice.datastructures.form.TableComponent;
-import org.eclipse.ice.datastructures.form.TimeDataComponent;
-import org.eclipse.ice.datastructures.form.TreeComposite;
-import org.eclipse.ice.datastructures.form.emf.EMFComponent;
-import org.eclipse.ice.datastructures.resource.ICEResource;
-import org.eclipse.ice.reactorAnalyzer.ReactorAnalyzer;
-import org.eclipse.ice.reactorAnalyzer.ReactorComposite;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.SectionPart;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * This class extends the default ICEFormPage to provide custom page composed of
- * widgets for reactors.
- *
- * This class only cares about the IReactorComponents and DataComponents that
- * are passed to it and all other visitation operations do nothing.
- *
- * @author Jay Jay Billings
- *
- */
-public class ReactorPage extends ICEFormPage implements IComponentVisitor,
- IUpdateableListener {
-
- /**
- * The list of DataComponents that is formed by visiting the Components
- * assigned to this page. These are typically the input and reference data.
- */
- private final ArrayList dataComponents;
-
- /**
- * This Composite contains the input and reference reactor components.
- */
- private ReactorComposite reactorComposite;
-
- /**
- * The resource Component. This is typically the "Comparison Reactor".
- */
- private ResourceComponent resourceComponent;
-
- /**
- * The SectionPart that contains the {@link #analysisComposite}.
- */
- private SectionPart sectionPart;
-
- /**
- * The AnalysisToolComposite that renders the reactor data for this page.
- */
- private AnalysisToolComposite analysisComposite;
- /**
- * The registry maintains a Map of factories for analysis widgets.
- */
- private IAnalysisWidgetRegistry registry;
- /**
- * The StateBroker that manages state information about the different views.
- */
- private StateBroker stateBroker;
- /**
- * The ISelectionProvider that manages the current selection in the
- * ReactorEditor. The current selection has its properties displayed in the
- * ICE Properties View.
- */
- private ISelectionProvider selectionProvider;
-
- /**
- * The constructor
- *
- * @param editor
- * The FormEditor that is constructing this page
- * @param id
- * The unique identifier of this page.
- * @param title
- * The title that this page should display in the editor.
- */
- public ReactorPage(FormEditor editor, String id, String title) {
-
- // Call the super constructor
- super(editor, id, title);
-
- // Set the FormEditor if it is not null and throw an exception
- // otherwise.
- if (editor != null && editor instanceof ICEFormEditor) {
- this.editor = (ICEFormEditor) editor;
- } else {
- throw new RuntimeException("Editor in ReactorPage "
- + " constructor cannot be null.");
- }
- // Setup the list for Components
- dataComponents = new ArrayList();
- reactorComposite = null;
-
- return;
- }
-
- /**
- * Sets the IAnalysisWidgetRegistry used to generate {@link IAnalysisView}s
- * for the {@link #analysisComposite}.
- *
- * @param registry
- * The IAnalysisWidgetRegistry to use.
- */
- public void setAnalysisWidgetRegistry(IAnalysisWidgetRegistry registry) {
- if (registry != null) {
- this.registry = registry;
- }
- return;
- }
-
- /**
- * Sets the ISelectionProvider that manages the current selection in the
- * ReactorEditor. The current selection has its properties displayed in the
- * ICE Properties View.
- *
- * @param provider
- * The new ISelectionProvider.
- */
- public void setSelectionProvider(ISelectionProvider provider) {
- // Only set the provider if it is not null.
- if (provider != null) {
- selectionProvider = provider;
- }
- return;
- }
-
- /**
- * This operation sets the state broker that will be shared by the parts of
- * the ReactorEditor to maintain view state.
- *
- * @param broker
- * The state broker
- */
- public void setStateBroker(StateBroker broker) {
- // Only set the broker if it is not null.
- if (broker != null) {
- stateBroker = broker;
-
- // Update the section parts.
- if (analysisComposite != null) {
- analysisComposite.setStateBroker(broker);
- }
- }
-
- return;
- }
-
- /**
- * Sets the ReactorComposite that contains the input and reference reactor
- * components for this reactor page.
- *
- * @param reactorComposite
- * The new ReactorComposite.
- */
- public void setReactorComposite(ReactorComposite reactorComposite) {
- // Only proceed if the new reactor composite is not null.
- if (reactorComposite != null) {
- // If necessary, unregister from the old reactor composite.
- if (this.reactorComposite != null) {
- this.reactorComposite.unregister(this);
- }
-
- // Set the new one and register with it.
- this.reactorComposite = reactorComposite;
- reactorComposite.register(this);
-
- // Update the page based on the new reactor composite.
- update(reactorComposite);
- }
-
- return;
- }
-
- /**
- * This operation adds a Component to the set of Components that are managed
- * by this page.
- *
- * @param component
- * A new Component for this page to manage
- */
- public void addComponent(Component component) {
-
- if (component != null) {
- // Visit the components so that they can be sorted
- component.accept(this);
- }
-
- return;
- }
-
- /**
- * This operation overrides the parent operation to create the graphical
- * content of the Form.
- *
- * @param managedForm
- * The IManagedForm from the parent FormEditor.
- */
- @Override
- protected void createFormContent(IManagedForm managedForm) {
-
- // Local Declarations
- final ScrolledForm form = managedForm.getForm();
- form.getBody().setLayout(new FillLayout());
- form.setMinWidth(10);
-
- // ---- Create the AnalysisToolComposite ---- //
- // Get the toolkit used to create Composites, Sections, etc.
- FormToolkit formToolkit = managedForm.getToolkit();
-
- // Create a single Section with a single SectionPart. When the form
- // updates, it calls the SectionPart's refresh() method. This method
- // should call this class' refreshContent() method.
- Section section = formToolkit.createSection(form.getBody(),
- ExpandableComposite.NO_TITLE | ExpandableComposite.EXPANDED);
- sectionPart = new SectionPart(section) {
- @Override
- public void refresh() {
- super.refresh();
-
- // Call the method in the ReactorPage. There's no need for a
- // separate class just for this behavior.
- refreshContent();
- }
- };
- // Add the section part to the form so that updates will be sent to the
- // part (and thus will call refreshContent()).
- managedForm.addPart(sectionPart);
-
- // Create the ATC inside the section, and set the ATC as the section's
- // primary client Composite.
- analysisComposite = new AnalysisToolComposite(section, stateBroker,
- registry, selectionProvider);
- section.setClient(analysisComposite);
-
- // Set the background color for the ATC to be the same as the section.
- analysisComposite.setBackground(section.getBackground());
-
- // Refresh the information displayed in the ATC.
- refreshContent();
- // ------------------------------------------ //
-
- return;
- }
-
- /**
- * This method refreshes {@link #analysisComposite}. Normally, this would be
- * taken care of by the {@link IFormPart}s on this page. However, we only
- * have one part and do not need to have a separate class to handle the
- * part's behavior (which is just to wrap an {@link AnalysisToolComposite}.
- */
- protected void refreshContent() {
-
- // If possible, update the ATC.
- if (analysisComposite != null) {
- // Get the input and reference reactor components from the
- // composite.
- IReactorComponent input = reactorComposite
- .getReactorComponent(ReactorAnalyzer.inputReactorComponentId);
- IReactorComponent reference = reactorComposite
- .getReactorComponent(ReactorAnalyzer.referenceReactorComponentId);
-
- // Set the input and reference reactor for the ATC.
- analysisComposite.setData(DataSource.Input.toString(), input);
- analysisComposite.setData(DataSource.Reference.toString(),
- reference);
- }
-
- // If the ResourceComponent has been populated with
- // ICEResources, then give it to the AnalysisComposite.
- if (resourceComponent != null) {
- ArrayList resources = resourceComponent.getResources();
- if (resources != null && !resources.isEmpty()) {
- analysisComposite.setData(DataSource.Comparison.toString(),
- resourceComponent);
- }
- }
- return;
- }
-
- /**
- * This is activated by the {@link IReactorComponent}s in
- * {@link #reactorComposite} and by {@link #resourceComponent}.
- */
- @Override
- public void update(IUpdateable component) {
-
- // Note that this is called by the reactor composite AND the resource
- // component.
-
- // Redraw - note that we must use the UI Thread
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- @Override
- public void run() {
- // Refresh the section part. This will ultimately call
- // refreshContent().
- sectionPart.refresh();
- }
- });
- }
-
- // ---- Implements IComponentVisitor ---- //
- // These operations should update the references to components that are
- // important to displaying reactor information in the AnalysisToolComposite,
- // and, if necessary, register with them.
-
- @Override
- public void visit(DataComponent component) {
- // Add the data component to the list
- dataComponents.add(component);
- }
-
- @Override
- public void visit(ResourceComponent component) {
- // Set the resource component and register with it.
- resourceComponent = component;
- resourceComponent.register(this);
- }
-
- @Override
- public void visit(TableComponent component) {
- // Nothing to do
- }
-
- @Override
- public void visit(MatrixComponent component) {
- // Nothing to do
- }
-
- @Override
- public void visit(GeometryComponent component) {
- // Nothing to do
- }
-
- @Override
- public void visit(MasterDetailsComponent component) {
- // Nothing to do
- }
-
- @Override
- public void visit(TreeComposite component) {
- // Nothing to do
- }
-
- @Override
- public void visit(IReactorComponent component) {
- // Nothing to do
- }
-
- @Override
- public void visit(TimeDataComponent component) {
- // Nothing to do
- }
-
- @Override
- public void visit(MeshComponent component) {
- // Nothing to do
- }
-
-
- @Override
- public void visit(AdaptiveTreeComposite component) {
- // Nothing to do
-
- }
- // -------------------------------------- //
-
- @Override
- public void visit(EMFComponent component) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void visit(ListComponent component) {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/properties/ReactorComponentPropertySource.java b/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/properties/ReactorComponentPropertySource.java
deleted file mode 100644
index df4a2b6ec..000000000
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/properties/ReactorComponentPropertySource.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
- * Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor.properties;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener;
-import org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor;
-import org.eclipse.ice.datastructures.componentVisitor.IReactorComponent;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * This class provides the properties of an SFRComponent to be displayed in the
- * ICE Properties View. It displays all of the properties of an SFRComponent.
- *
- * Sub-classes should add their own properties via
- * {@link #addProperty(SimpleProperty)}.
- *
- *
- * @author Jordan H. Deyton
- *
- */
-public class ReactorComponentPropertySource implements IPropertySource {
-
- /**
- * A Map of {@linkplain SimpleProperty} instances for the selected
- * component.
- */
- private final Map properties;
-
- /**
- * The default constructor.
- *
- * @param component
- * The component whose properties are to be displayed in the ICE
- * Properties View.
- */
- public ReactorComponentPropertySource(IReactorComponent component) {
- // Set a default, blank component if the argument is null.
- if (component == null) {
- component = new IReactorComponent() {
- // Give the properties something to signify that the component
- // is
- // invalid.
- @Override
- public String getName() {
- return "Invalid reactor component!";
- }
-
- @Override
- public String getDescription() {
- return "This is an invalid reactor component!";
- }
-
- @Override
- public int getId() {
- return 1;
- }
-
- @Override
- public void accept(IComponentVisitor visitor) {
- }
-
- @Override
- public void update(String updatedKey, String newValue) {
- }
-
- @Override
- public void register(IUpdateableListener listener) {
- }
-
- @Override
- public void unregister(IUpdateableListener listener) {
- }
-
- @Override
- public void setId(int id) {
- }
-
- @Override
- public void setName(String name) {
- }
-
- @Override
- public void setDescription(String description) {
- }
-
- // This is required to avoid a CloneNotSupported exception.
- @Override
- public Object clone() {
- return null;
- }
- };
- }
-
- // Initialize the map of properties.
- properties = new HashMap();
-
- // Set the basic properties for IReactorComponents.
- String category = "Basic Properties";
- addProperty(new SimpleProperty("name", "Name", category,
- component.getName()));
- addProperty(new SimpleProperty("description", "Description", category,
- component.getDescription()));
- addProperty(new SimpleProperty("id", "ID", category, component.getId()));
-
- return;
- }
-
- /**
- * Adds a SimpleProperty to the properties exposed by this IPropertySource.
- *
- * @param property
- * A SimpleProperty instance to add.
- * @return True if the property is not null and its ID did not already exist
- * in the map, false otherwise.
- */
- public boolean addProperty(SimpleProperty property) {
-
- // By default, the addition failed.
- boolean success = false;
-
- // Only attempt to add the property if the property is not null and its
- // ID is not already in the Map.
- if (property != null && !properties.containsKey(property.getId())) {
- properties.put(property.getId(), property);
- success = true;
- }
-
- return success;
- }
-
- /* ---- Implements IPropertySource. ---- */
- /**
- * Returns null. Properties for IReactorComponents are currently read-only!
- */
- @Override
- public Object getEditableValue() {
- // Read-only!
- return null;
- }
-
- /**
- * Returns the IPropertyDescriptors for IReactorComponents.
- */
- @Override
- public IPropertyDescriptor[] getPropertyDescriptors() {
- // Create a new Array.
- IPropertyDescriptor[] descriptors = new IPropertyDescriptor[properties
- .size()];
-
- // Add a PropertyDescriptor for each of the simple properties.
- int i = 0;
- for (SimpleProperty property : properties.values()) {
- descriptors[i++] = property.getPropertyDescriptor();
- }
-
- return descriptors;
- }
-
- /**
- * Returns the value for a particular IReactorComponent property or null if
- * it is an invalid property.
- */
- @Override
- public Object getPropertyValue(Object id) {
-
- // Set the default return value.
- Object value = null;
-
- // See if the id matches any of the supported property IDs.
- SimpleProperty property = properties.get(id);
- if (property != null) {
- value = property.getValue();
- }
- return value;
- }
-
- /**
- * Returns false. Properties for IReactorComponents are currently read-only!
- */
- @Override
- public boolean isPropertySet(Object id) {
- // Read-only!
- return false;
- }
-
- /**
- * Does nothing. Properties for IReactorComponents are currently read-only!
- */
- @Override
- public void resetPropertyValue(Object id) {
- // Read-only!
- return;
- }
-
- /**
- * Does nothing. Properties for IReactorComponents are currently read-only!
- */
- @Override
- public void setPropertyValue(Object id, Object value) {
- // Read-only!
- return;
- }
- /* ------------------------------------- */
-}
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/properties/SimpleProperty.java b/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/properties/SimpleProperty.java
deleted file mode 100644
index 56bf7c6d9..000000000
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/properties/SimpleProperty.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
- * Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor.properties;
-
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-
-/**
- * This class provides a wrapper for a simple IPropertyDescriptor. A property
- * requires at least 3 things: an ID, a display name, and a value. It can also
- * have a category, the default value being "Misc".
- *
- * The ID for a SimpleProperty should be unique for a particular
- * IPropertySource.
- *
- * If an instance requires a more specialized IPropertyDescriptor, then the
- * method {@linkplain SimpleProperty#getPropertyDescriptor()} should be
- * overridden.
- *
- * @author Jordan H. Deyton
- *
- */
-public class SimpleProperty {
-
- /**
- * The ID of the property. This is used to construct an IPropertyDescriptor
- * and should be unique within the IPropertySource.
- */
- private final String id;
- /**
- * The text displayed for the IPropertyDescriptor. This does not need to be
- * unique.
- */
- private final String displayName;
- /**
- * The category under which the property will appear. If null, the property
- * should default to "Misc". If no categories are specified in the
- * IPropertySource, then "Misc" will not appear.
- */
- private final String category;
- /**
- * The value of the property. If null, you may want to override
- * {@linkplain SimpleProperty#getValue()}.
- */
- private final Object value;
-
- /**
- * The default constructor.
- *
- * @param id
- * The ID of the property. This is used to construct an
- * IPropertyDescriptor and should be unique within the
- * IPropertySource.
- * @param displayName
- * The text displayed for the IPropertyDescriptor. This does not
- * need to be unique.
- * @param category
- * The category under which the property will appear. If null,
- * the property should default to "Misc". If no categories are
- * specified in the IPropertySource, then "Misc" will not appear.
- * @param value
- * The value of the property. If null, you may want to override
- * {@linkplain SimpleProperty#getValue()}.
- */
- public SimpleProperty(String id, String displayName, String category,
- Object value) {
- // Replace any null Strings with empty Strings.
- this.id = (id != null ? id : "");
- this.displayName = (displayName != null ? displayName : "");
- this.category = (category != null ? category : "");
- this.value = value;
-
- return;
- }
-
- /**
- * Gets a PropertyDescriptor for the SimpleProperty.
- *
- * @return A PropertyDescriptor configured with the SimpleProperty's fields.
- */
- public PropertyDescriptor getPropertyDescriptor() {
- PropertyDescriptor property = new PropertyDescriptor(id, displayName);
- property.setCategory(category);
- return property;
- }
-
- /**
- * Gets the String ID used for the SimpleProperty. It should be unique
- * within the parent IPropertySource.
- *
- * @return A String ID.
- */
- public String getId() {
- return id;
- }
-
- /**
- * Gets the current value of the property.
- *
- * @return An Object pointing to the value of the property.
- */
- public Object getValue() {
- return value;
- }
-}
diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEResourcePageTester.java b/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEResourcePageTester.java
index c98c29e94..027350f3b 100644
--- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEResourcePageTester.java
+++ b/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/ICEResourcePageTester.java
@@ -29,7 +29,6 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.eclipse.ui.IEditorReference;
import org.junit.Test;
-import org.hamcrest.Matcher;
/**
* This class is responsible for testing the ICEResourcePage.
diff --git a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/IFormWidgetBuilderTest.java b/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/IFormWidgetBuilderTest.java
index 571f69ddb..8ced4faf1 100644
--- a/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/IFormWidgetBuilderTest.java
+++ b/org.eclipse.ice.client.widgets.test/src/org/eclipse/ice/client/widgets/test/IFormWidgetBuilderTest.java
@@ -10,7 +10,8 @@
*******************************************************************************/
package org.eclipse.ice.client.widgets.test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.ice.client.widgets.IFormWidgetBuilder;
diff --git a/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF b/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
index c58617f95..86e34a55c 100644
--- a/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
+++ b/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
@@ -20,13 +20,16 @@ Import-Package: com.jme3.app,
org.eclipse.core.resources,
org.eclipse.core.runtime;version="3.4.0",
org.eclipse.core.runtime.jobs,
+ org.eclipse.draw2d,
+ org.eclipse.draw2d.geometry,
+ org.eclipse.gef,
+ org.eclipse.gef.editparts,
org.eclipse.ice.client.common,
org.eclipse.ice.client.common.internal,
org.eclipse.ice.client.common.properties,
org.eclipse.ice.client.widgets.jme,
org.eclipse.ice.iclient,
org.eclipse.ice.iclient.uiwidgets,
- org.eclipse.ice.reactor,
org.eclipse.ice.viz.service,
org.eclipse.ice.viz.service.csv,
org.eclipse.ice.viz.service.datastructures,
@@ -45,7 +48,8 @@ Import-Package: com.jme3.app,
org.eclipse.ui.views.properties.tabbed,
org.osgi.framework;version="1.6.0",
org.slf4j;version="1.7.2"
-Export-Package: org.eclipse.ice.client.widgets
+Export-Package: org.eclipse.ice.client.widgets,
+ org.eclipse.ice.client.widgets.analysis
Service-Component: OSGI-INF/eclipseWidgetsComponent.xml,
OSGI-INF/formEditorVizService.xml
Bundle-Vendor: Oak Ridge National Laboratory
diff --git a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ComponentPropertySection.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ComponentPropertySection.java
index c3a63b17e..785a8e97a 100644
--- a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ComponentPropertySection.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ComponentPropertySection.java
@@ -26,12 +26,12 @@
import org.eclipse.ice.datastructures.form.MasterDetailsComponent;
import org.eclipse.ice.datastructures.form.MatrixComponent;
import org.eclipse.ice.datastructures.form.MeshComponent;
+import org.eclipse.ice.datastructures.form.MeshComponent;
import org.eclipse.ice.datastructures.form.ResourceComponent;
import org.eclipse.ice.datastructures.form.TableComponent;
import org.eclipse.ice.datastructures.form.TimeDataComponent;
import org.eclipse.ice.datastructures.form.TreeComposite;
import org.eclipse.ice.datastructures.form.emf.EMFComponent;
-import org.eclipse.ice.datastructures.form.MeshComponent;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.SWT;
diff --git a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EMFTreeCompositeViewer.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EMFTreeCompositeViewer.java
index f39cb063c..3a0f93057 100644
--- a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EMFTreeCompositeViewer.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EMFTreeCompositeViewer.java
@@ -16,9 +16,7 @@
import org.eclipse.ice.datastructures.form.TreeComposite;
import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.dialogs.IInputValidator;
import org.eclipse.jface.dialogs.InputDialog;
@@ -28,9 +26,7 @@
import org.eclipse.jface.window.Window;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IPartListener2;
import org.eclipse.ui.IWorkbenchPartReference;
diff --git a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
index b960c8194..4ea9cc6e8 100644
--- a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
@@ -36,13 +36,13 @@
import org.eclipse.ice.datastructures.form.MasterDetailsComponent;
import org.eclipse.ice.datastructures.form.MatrixComponent;
import org.eclipse.ice.datastructures.form.MeshComponent;
+import org.eclipse.ice.datastructures.form.MeshComponent;
import org.eclipse.ice.datastructures.form.ResourceComponent;
import org.eclipse.ice.datastructures.form.TableComponent;
import org.eclipse.ice.datastructures.form.TimeDataComponent;
import org.eclipse.ice.datastructures.form.TreeComposite;
import org.eclipse.ice.datastructures.form.emf.EMFComponent;
import org.eclipse.ice.datastructures.form.geometry.ICEGeometry;
-import org.eclipse.ice.datastructures.form.MeshComponent;
import org.eclipse.ice.iclient.IClient;
import org.eclipse.ice.iclient.uiwidgets.IObservableWidget;
import org.eclipse.ice.iclient.uiwidgets.IProcessEventListener;
diff --git a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEMeshPage.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEMeshPage.java
index e186d1045..7e2e468c9 100644
--- a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEMeshPage.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEMeshPage.java
@@ -20,12 +20,13 @@
import org.eclipse.ice.datastructures.ICEObject.ICEObject;
import org.eclipse.ice.datastructures.form.MeshComponent;
import org.eclipse.ice.viz.service.IVizService;
+import org.eclipse.ice.viz.service.geometry.widgets.TransformationView;
import org.eclipse.ice.viz.service.jme3.mesh.IMeshSelectionListener;
import org.eclipse.ice.viz.service.jme3.mesh.JME3MeshCanvas;
import org.eclipse.ice.viz.service.jme3.mesh.MeshAppStateMode;
import org.eclipse.ice.viz.service.jme3.mesh.MeshAppStateModeFactory;
-import org.eclipse.ice.viz.service.jme3.mesh.MeshSelectionManager;
import org.eclipse.ice.viz.service.jme3.mesh.MeshAppStateModeFactory.Mode;
+import org.eclipse.ice.viz.service.jme3.mesh.MeshSelectionManager;
import org.eclipse.ice.viz.service.mesh.datastructures.BezierEdge;
import org.eclipse.ice.viz.service.mesh.datastructures.Edge;
import org.eclipse.ice.viz.service.mesh.datastructures.Hex;
@@ -36,7 +37,6 @@
import org.eclipse.ice.viz.service.mesh.datastructures.Vertex;
import org.eclipse.ice.viz.service.mesh.datastructures.VizMeshComponent;
import org.eclipse.ice.viz.service.mesh.properties.MeshSelection;
-import org.eclipse.ice.viz.service.geometry.widgets.TransformationView;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.ToolBarManager;
diff --git a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
index 384c16c47..e6cc7a802 100644
--- a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
@@ -15,6 +15,7 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
+
import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.resources.IResourceChangeEvent;
@@ -30,7 +31,6 @@
import org.eclipse.ice.datastructures.resource.VizResource;
import org.eclipse.ice.iclient.uiwidgets.ISimpleResourceProvider;
import org.eclipse.ice.viz.service.widgets.PlotGridComposite;
-import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTError;
@@ -38,8 +38,6 @@
import org.eclipse.swt.custom.StackLayout;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
diff --git a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICESectionPage.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICESectionPage.java
index e0c2aea41..6360f7c59 100644
--- a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICESectionPage.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICESectionPage.java
@@ -24,12 +24,12 @@
import org.eclipse.ice.datastructures.form.MasterDetailsComponent;
import org.eclipse.ice.datastructures.form.MatrixComponent;
import org.eclipse.ice.datastructures.form.MeshComponent;
+import org.eclipse.ice.datastructures.form.MeshComponent;
import org.eclipse.ice.datastructures.form.ResourceComponent;
import org.eclipse.ice.datastructures.form.TableComponent;
import org.eclipse.ice.datastructures.form.TimeDataComponent;
import org.eclipse.ice.datastructures.form.TreeComposite;
import org.eclipse.ice.datastructures.form.emf.EMFComponent;
-import org.eclipse.ice.datastructures.form.MeshComponent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
diff --git a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/IFormWidgetBuilder.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/IFormWidgetBuilder.java
index 6cf100a5c..90357b0aa 100644
--- a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/IFormWidgetBuilder.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/IFormWidgetBuilder.java
@@ -17,7 +17,6 @@
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.Platform;
import org.eclipse.ice.iclient.uiwidgets.IFormWidget;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/TreeNodeFilteredItemsSelectionDialog.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/TreeNodeFilteredItemsSelectionDialog.java
index 342ca7ac7..9e4052423 100644
--- a/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/TreeNodeFilteredItemsSelectionDialog.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/TreeNodeFilteredItemsSelectionDialog.java
@@ -15,7 +15,6 @@
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import org.eclipse.core.runtime.CoreException;
@@ -32,7 +31,6 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AbstractColorFactory.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/AbstractColorFactory.java
similarity index 94%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AbstractColorFactory.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/AbstractColorFactory.java
index 5bafc0aa2..512a7b1ec 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AbstractColorFactory.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/AbstractColorFactory.java
@@ -9,7 +9,7 @@
* Jordan Deyton - Initial API and implementation and/or initial documentation
*
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Display;
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AnalysisToolComposite.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/AnalysisToolComposite.java
similarity index 94%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AnalysisToolComposite.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/AnalysisToolComposite.java
index a60778b58..26490a636 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AnalysisToolComposite.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/AnalysisToolComposite.java
@@ -10,13 +10,12 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.eclipse.ice.reactor.pwr.PressurizedWaterReactor;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StackLayout;
@@ -497,15 +496,19 @@ public void setData(String key, Object value) {
}
// Get the factory for the data object's class.
- // FIXME - For the moment, we relegate all Comparison data to the LWR
+ // FIXME - For the moment, we delegate all Comparison data to the LWR
// analysis package.
- IAnalysisWidgetFactory factory;
- if (dataSource == DataSource.Comparison) {
- factory = registry
- .getAnalysisWidgetFactory(PressurizedWaterReactor.class);
- } else {
- factory = registry.getAnalysisWidgetFactory(value.getClass());
- }
+
+ // FIXME! Disabled while we remove the reactor stuff!
+
+ IAnalysisWidgetFactory factory = null;
+
+// if (dataSource == DataSource.Comparison) {
+// factory = registry
+// .getAnalysisWidgetFactory(PressurizedWaterReactor.class);
+// } else {
+// factory = registry.getAnalysisWidgetFactory(value.getClass());
+// }
// Make sure the registry has a factory for this data object.
if (factory == null) {
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AnalysisView.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/AnalysisView.java
similarity index 96%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AnalysisView.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/AnalysisView.java
index f937c1b7e..82c4576a1 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AnalysisView.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/AnalysisView.java
@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AnalysisWidgetRegistry.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/AnalysisWidgetRegistry.java
similarity index 95%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AnalysisWidgetRegistry.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/AnalysisWidgetRegistry.java
index baa0c3ff1..cafe6c6aa 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/AnalysisWidgetRegistry.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/AnalysisWidgetRegistry.java
@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import java.util.HashMap;
import java.util.List;
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/Circle.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/Circle.java
similarity index 98%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/Circle.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/Circle.java
index 61b0f9259..cf6f9f9ff 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/Circle.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/Circle.java
@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.Shape;
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/DataSource.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/DataSource.java
similarity index 93%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/DataSource.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/DataSource.java
index 7f0a3539c..76fef2abf 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/DataSource.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/DataSource.java
@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
/**
* An enum representing the possible data sources supported by the
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IAnalysisView.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IAnalysisView.java
similarity index 95%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IAnalysisView.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IAnalysisView.java
index 1bf922630..e8a51a53e 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IAnalysisView.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IAnalysisView.java
@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.swt.widgets.Composite;
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IAnalysisWidgetFactory.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IAnalysisWidgetFactory.java
similarity index 98%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IAnalysisWidgetFactory.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IAnalysisWidgetFactory.java
index 826962ac9..67888ba92 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IAnalysisWidgetFactory.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IAnalysisWidgetFactory.java
@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import java.util.List;
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IAnalysisWidgetRegistry.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IAnalysisWidgetRegistry.java
similarity index 94%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IAnalysisWidgetRegistry.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IAnalysisWidgetRegistry.java
index 6a8bb1d2a..29f6de6f0 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IAnalysisWidgetRegistry.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IAnalysisWidgetRegistry.java
@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
/**
* This class provides an interface for an OSGi-DS-based registry. The current
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IColorFactory.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IColorFactory.java
similarity index 95%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IColorFactory.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IColorFactory.java
index 153e128cf..e5bebff58 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IColorFactory.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IColorFactory.java
@@ -9,7 +9,7 @@
* Jordan Deyton - Initial API and implementation and/or initial documentation
*
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Display;
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IStateBrokerHandler.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IStateBrokerHandler.java
similarity index 97%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IStateBrokerHandler.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IStateBrokerHandler.java
index d84ea43ac..1a9952cde 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IStateBrokerHandler.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IStateBrokerHandler.java
@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
/**
* This interface is used to get keys for objects that will be added to a
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IStateListener.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IStateListener.java
similarity index 93%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IStateListener.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IStateListener.java
index a89d536bc..c43a5be1a 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IStateListener.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IStateListener.java
@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
/**
* A class implementing this interface should register with a StateBroker as a
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IWizardProvider.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IWizardProvider.java
similarity index 95%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IWizardProvider.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IWizardProvider.java
index c6b4f2234..95bbdb021 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/IWizardProvider.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/IWizardProvider.java
@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import org.eclipse.jface.wizard.IWizard;
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/LinearColorFactory.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/LinearColorFactory.java
similarity index 95%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/LinearColorFactory.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/LinearColorFactory.java
index e5252df8d..7be8040fc 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/LinearColorFactory.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/LinearColorFactory.java
@@ -9,7 +9,7 @@
* Jordan Deyton - Initial API and implementation and/or initial documentation
*
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import java.util.ArrayList;
import java.util.List;
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/MaterialShape.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/MaterialShape.java
similarity index 98%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/MaterialShape.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/MaterialShape.java
index 2110369cf..e2c32f074 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/MaterialShape.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/MaterialShape.java
@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.Shape;
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/PaletteColorFactory.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/PaletteColorFactory.java
similarity index 98%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/PaletteColorFactory.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/PaletteColorFactory.java
index 4abedb3f1..3a1a7fbc8 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/PaletteColorFactory.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/PaletteColorFactory.java
@@ -10,7 +10,7 @@
* Jordan Deyton - bug 474742
*
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import java.util.Iterator;
import java.util.LinkedHashMap;
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/SelectionProvider.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/SelectionProvider.java
similarity index 95%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/SelectionProvider.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/SelectionProvider.java
index 51edf0515..058248405 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/SelectionProvider.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/SelectionProvider.java
@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.jface.viewers.ISelection;
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/StateBroker.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/StateBroker.java
similarity index 99%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/StateBroker.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/StateBroker.java
index 1e8cd18ad..1a9d8fd05 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/StateBroker.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/StateBroker.java
@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ToolItemMenuListener.java b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/ToolItemMenuListener.java
similarity index 97%
rename from org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ToolItemMenuListener.java
rename to org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/ToolItemMenuListener.java
index 9255319d0..eda005530 100644
--- a/org.eclipse.ice.client.widgets.reactoreditor/src/org/eclipse/ice/client/widgets/reactoreditor/ToolItemMenuListener.java
+++ b/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/analysis/ToolItemMenuListener.java
@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
-package org.eclipse.ice.client.widgets.reactoreditor;
+package org.eclipse.ice.client.widgets.analysis;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Point;
diff --git a/org.eclipse.ice.client/src/org/eclipse/ice/client/common/ICEItemRenameParticipant.java b/org.eclipse.ice.client/src/org/eclipse/ice/client/common/ICEItemRenameParticipant.java
index a01cee26d..e9abea52f 100644
--- a/org.eclipse.ice.client/src/org/eclipse/ice/client/common/ICEItemRenameParticipant.java
+++ b/org.eclipse.ice.client/src/org/eclipse/ice/client/common/ICEItemRenameParticipant.java
@@ -15,11 +15,8 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.content.ITextContentDescriber;
import org.eclipse.ice.datastructures.form.FormTextContentDescriber;
import org.eclipse.ice.iclient.IClient;
diff --git a/org.eclipse.ice.client/src/org/eclipse/ice/client/common/properties/FileComboBoxCellEditor.java b/org.eclipse.ice.client/src/org/eclipse/ice/client/common/properties/FileComboBoxCellEditor.java
index 59550fd0f..ea9f6fbaf 100644
--- a/org.eclipse.ice.client/src/org/eclipse/ice/client/common/properties/FileComboBoxCellEditor.java
+++ b/org.eclipse.ice.client/src/org/eclipse/ice/client/common/properties/FileComboBoxCellEditor.java
@@ -38,7 +38,6 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Layout;
/**
diff --git a/org.eclipse.ice.client/src/org/eclipse/ice/client/common/wizards/ImportFileWizardPage.java b/org.eclipse.ice.client/src/org/eclipse/ice/client/common/wizards/ImportFileWizardPage.java
index 30b01cff5..0ae903431 100644
--- a/org.eclipse.ice.client/src/org/eclipse/ice/client/common/wizards/ImportFileWizardPage.java
+++ b/org.eclipse.ice.client/src/org/eclipse/ice/client/common/wizards/ImportFileWizardPage.java
@@ -15,15 +15,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ice.client.common.internal.ClientHolder;
import org.eclipse.ice.client.internal.Client;
-import org.eclipse.ice.iclient.IClient;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -34,7 +26,6 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.slf4j.Logger;
diff --git a/org.eclipse.ice.client/src/org/eclipse/ice/client/common/wizards/ImportItemWizard.java b/org.eclipse.ice.client/src/org/eclipse/ice/client/common/wizards/ImportItemWizard.java
index fe068a73f..2c9b5561c 100644
--- a/org.eclipse.ice.client/src/org/eclipse/ice/client/common/wizards/ImportItemWizard.java
+++ b/org.eclipse.ice.client/src/org/eclipse/ice/client/common/wizards/ImportItemWizard.java
@@ -17,7 +17,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.ice.client.common.ImportItemWizardHandler;
-import org.eclipse.ice.client.common.internal.ClientHolder;
import org.eclipse.ice.iclient.IClient;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.ui.IWorkbenchWindow;
diff --git a/org.eclipse.ice.client/src/org/eclipse/ice/client/common/wizards/ImportItemWizardPage.java b/org.eclipse.ice.client/src/org/eclipse/ice/client/common/wizards/ImportItemWizardPage.java
index 56f20f97a..c834323d0 100644
--- a/org.eclipse.ice.client/src/org/eclipse/ice/client/common/wizards/ImportItemWizardPage.java
+++ b/org.eclipse.ice.client/src/org/eclipse/ice/client/common/wizards/ImportItemWizardPage.java
@@ -14,7 +14,6 @@
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
diff --git a/org.eclipse.ice.client/src/org/eclipse/ice/client/internal/Client.java b/org.eclipse.ice.client/src/org/eclipse/ice/client/internal/Client.java
index 1edf8ae63..7ade258ae 100644
--- a/org.eclipse.ice.client/src/org/eclipse/ice/client/internal/Client.java
+++ b/org.eclipse.ice.client/src/org/eclipse/ice/client/internal/Client.java
@@ -20,7 +20,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.ice.client.common.internal.ClientHolder;
import org.eclipse.ice.core.iCore.ICore;
import org.eclipse.ice.datastructures.ICEObject.Identifiable;
@@ -38,13 +37,7 @@
import org.eclipse.ice.iclient.uiwidgets.IUpdateEventListener;
import org.eclipse.ice.iclient.uiwidgets.IWidgetClosedListener;
import org.eclipse.ice.iclient.uiwidgets.IWidgetFactory;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.EditorPart;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
diff --git a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/ItemManagerTester.java b/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/ItemManagerTester.java
index 5874c98ec..0096c43cf 100644
--- a/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/ItemManagerTester.java
+++ b/org.eclipse.ice.core.test/src/org/eclipse/ice/core/test/ItemManagerTester.java
@@ -20,33 +20,16 @@
import static org.junit.Assert.fail;
import java.io.File;
-import java.io.InputStream;
-import java.io.Reader;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFileState;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IPathVariableManager;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourceAttributes;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.ice.core.internal.itemmanager.ItemManager;
import org.eclipse.ice.datastructures.ICEObject.Identifiable;
import org.eclipse.ice.datastructures.form.DataComponent;
diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EntryTester.java b/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EntryTester.java
index c744468de..71b1e604f 100644
--- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EntryTester.java
+++ b/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/EntryTester.java
@@ -32,8 +32,6 @@
import org.eclipse.ice.datastructures.form.BasicEntryContentProvider;
import org.eclipse.ice.datastructures.form.Entry;
import org.eclipse.ice.datastructures.form.IEntryContentProvider;
-import org.eclipse.ice.viz.service.datastructures.VizAllowedValueType;
-import org.eclipse.ice.viz.service.datastructures.VizEntry;
import org.junit.Test;
/**
diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/GeometryTester.java b/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/GeometryTester.java
index 191ba67c4..b6cc152d7 100644
--- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/GeometryTester.java
+++ b/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/GeometryTester.java
@@ -24,12 +24,12 @@
import org.eclipse.ice.datastructures.ICEObject.ICEJAXBHandler;
import org.eclipse.ice.datastructures.form.GeometryComponent;
+import org.eclipse.ice.datastructures.form.geometry.ICEGeometry;
+import org.eclipse.ice.datastructures.form.geometry.ICEShape;
import org.eclipse.ice.viz.service.geometry.shapes.Geometry;
import org.eclipse.ice.viz.service.geometry.shapes.OperatorType;
import org.eclipse.ice.viz.service.geometry.shapes.ShapeType;
import org.eclipse.ice.viz.service.geometry.shapes.Transformation;
-import org.eclipse.ice.datastructures.form.geometry.ICEGeometry;
-import org.eclipse.ice.datastructures.form.geometry.ICEShape;
import org.junit.Test;
/**
diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEShapeTester.java b/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEShapeTester.java
index 5fe7214d2..4ad444e34 100644
--- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEShapeTester.java
+++ b/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEShapeTester.java
@@ -28,7 +28,6 @@
import org.eclipse.ice.datastructures.ICEObject.ICEJAXBHandler;
import org.eclipse.ice.datastructures.form.geometry.ICEShape;
-import org.eclipse.ice.datastructures.test.TestComponentListener;
import org.eclipse.ice.viz.service.geometry.shapes.OperatorType;
import org.eclipse.ice.viz.service.geometry.shapes.ShapeType;
import org.eclipse.ice.viz.service.geometry.shapes.Transformation;
diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MaterialStackTester.java b/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MaterialStackTester.java
index ca373e1f2..28dfa4639 100644
--- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MaterialStackTester.java
+++ b/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MaterialStackTester.java
@@ -11,7 +11,10 @@
*******************************************************************************/
package org.eclipse.ice.datastructures.test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -23,7 +26,6 @@
import org.eclipse.ice.datastructures.ICEObject.ICEJAXBHandler;
import org.eclipse.ice.datastructures.form.Material;
import org.eclipse.ice.datastructures.form.MaterialStack;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshComponentTester.java b/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshComponentTester.java
index bd8cc02d6..e942b2c37 100644
--- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshComponentTester.java
+++ b/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshComponentTester.java
@@ -26,7 +26,6 @@
import javax.xml.bind.JAXBException;
-import org.eclipse.ice.datastructures.ICEObject.Component;
import org.eclipse.ice.datastructures.ICEObject.ICEJAXBHandler;
import org.eclipse.ice.datastructures.form.MeshComponent;
import org.eclipse.ice.viz.service.mesh.datastructures.Edge;
diff --git a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestVisitor.java b/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestVisitor.java
index 6269fa444..378877c28 100644
--- a/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestVisitor.java
+++ b/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/TestVisitor.java
@@ -21,12 +21,12 @@
import org.eclipse.ice.datastructures.form.MasterDetailsComponent;
import org.eclipse.ice.datastructures.form.MatrixComponent;
import org.eclipse.ice.datastructures.form.MeshComponent;
+import org.eclipse.ice.datastructures.form.MeshComponent;
import org.eclipse.ice.datastructures.form.ResourceComponent;
import org.eclipse.ice.datastructures.form.TableComponent;
import org.eclipse.ice.datastructures.form.TimeDataComponent;
import org.eclipse.ice.datastructures.form.TreeComposite;
import org.eclipse.ice.datastructures.form.emf.EMFComponent;
-import org.eclipse.ice.datastructures.form.MeshComponent;
/**
*
- *
- * @author Eric J. Lingerfelt
- */
-public class HdfFileFactoryTester {
-
- /**
- * The file handle for the test
- */
- File dataFile = null;
-
- /**
- *
- * This operation checks the openH5File, createH5File, and closeH5File
- * operations.
- *
- */
- @Test
- public void checkFileOperations() {
-
- // Local Declarations
- String separator = System.getProperty("file.separator");
- String testFileName = "test1.h5";
- H5File h5File;
- int fileHandle = -1;
- int newFileHandle = -1;
- String userDir = System.getProperty("user.home") + separator
- + "ICETests";
-
- // Creating a file:
-
- // Try to create a file on null
- assertNull(HdfFileFactory.createH5File(null));
-
- // Create a normal file
- File dataFile = new File(userDir + separator + testFileName);
- // Create a file
- System.out.println(dataFile.getAbsolutePath());
- h5File = HdfFileFactory.createH5File(dataFile.toURI());
- // Make sure it is not null
- assertNotNull(h5File);
-
- // Make sure it exists and can be written and read from
- assertTrue(h5File.exists());
- assertTrue(h5File.canWrite());
- assertTrue(h5File.canRead());
- try {
- // Get the first file handle
- fileHandle = h5File.open();
- // Make sure the file is open and exists
- assertTrue(fileHandle >= 0);
-
- h5File.createGroup("Bob",
- (H5Group) ((javax.swing.tree.DefaultMutableTreeNode) h5File
- .getRootNode()).getUserObject());
-
- // Close the file
- h5File.close();
-
- // create a file ontop of a file
- h5File = HdfFileFactory.createH5File(dataFile.toURI());
- // Open it
- fileHandle = h5File.open();
- // Make sure the file is open and exists
- assertTrue(fileHandle >= 0);
-
- // Check to see if bob exists
- H5Group group = (H5Group) ((javax.swing.tree.DefaultMutableTreeNode) h5File
- .getRootNode()).getUserObject();
- assertEquals(0, group.getMemberList().size()); // Bob, or any other
- // group, does not
- // exist
-
- // Now, add Bob back into the group
- h5File.createGroup("Bob",
- (H5Group) ((javax.swing.tree.DefaultMutableTreeNode) h5File
- .getRootNode()).getUserObject());
-
- // Close the file with the correct operation
- HdfFileFactory.closeH5File(h5File);
-
- // Now, try to open that file again with open
- h5File = HdfFileFactory.openH5File(dataFile.toURI());
-
- assertNotNull(h5File);
-
- // Show that it exists
- assertTrue(h5File.exists());
-
- // Delete the dataFile (close the file first)
- h5File.close();
- dataFile.delete();
- // Now, try to grab it. This should return null
- assertNull(HdfFileFactory.openH5File(dataFile.toURI()));
-
- } catch (Exception e) {
- // Fail if any exceptions are hit
- e.printStackTrace();
- fail();
- }
-
- // Delete the file
- if (dataFile.exists()) {
- dataFile.delete();
- }
-
- }
-}
\ No newline at end of file
diff --git a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfIOFactoryTester.java b/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfIOFactoryTester.java
deleted file mode 100644
index dc878082d..000000000
--- a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfIOFactoryTester.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
- * Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.io.hdf.test;
-
-import static org.junit.Assert.fail;
-
-import org.eclipse.ice.io.hdf.HdfIOFactory;
-import org.eclipse.ice.io.hdf.IHdfIORegistry;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Tests the out-of-the-box writing and reading ability of {@link HdfIOFactory}.
- *
- * @author Jordan H. Deyton
- *
- */
-@Ignore
-public class HdfIOFactoryTester {
-
- /**
- * This test ensures the factory's reference to the {@link IHdfIORegistry}
- * is set properly and can be retreived.
- */
- @Test
- public void checkRegistry() {
- fail("Not implemented.");
- }
-
- /**
- * This method checks that, by default, the factory can write to an HDF5
- * file. If object types are not supported (which should be the case since
- * OSGi is not running), then the HDF5 file will be empty.
- */
- @Test
- public void checkWriting() {
- fail("Not implemented.");
- }
-
- /**
- * This method checks that, by default, the factory can read from an HDF5
- * file. If the tag Attributes do not match any other factory in the
- * registry or are non-existent, then the HDF5 Group cannot be read.
- */
- @Test
- public void checkReading() {
- fail("Not implemented.");
- }
-}
diff --git a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfIORegistryTester.java b/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfIORegistryTester.java
deleted file mode 100644
index 571f89d20..000000000
--- a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfIORegistryTester.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
- * Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.io.hdf.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.ice.io.hdf.HdfIOFactory;
-import org.eclipse.ice.io.hdf.HdfIORegistry;
-import org.eclipse.ice.io.hdf.IHdfIOFactory;
-import org.eclipse.ice.io.hdf.IHdfIORegistry;
-import org.junit.Test;
-
-/**
- * Tests the {@link HdfIORegistry}'s ability to register and retrieve new
- * {@link IHdfIOFactory} instances.
- *
- * @author Jordan H. Deyton
- *
- */
-public class HdfIORegistryTester {
-
- /**
- * Reference to the HdfIORegistry to test
- */
- private HdfIORegistry registry;
-
- /**
- * Stub classes to act as supported classes for the FakeHdfIOFactory
- *
- * @author Alex McCaskey
- *
- */
- private class SupportedOne {
- }
-
- private class SupportedTwo {
- }
-
- /**
- * Fake HdfIOFactory to be used in the testing the registration
- * functionality of the IHdfIORegistry
- *
- * @author Alex McCaskey
- *
- */
- private class FakeHdfIOFactory extends HdfIOFactory {
-
- private final Map> tagMap = new HashMap>();
- private final Map, String> supportedMap = new HashMap, String>();
-
- FakeHdfIOFactory() {
- tagMap.put("tag1", SupportedOne.class);
- tagMap.put("tag2", SupportedTwo.class);
- supportedMap.put(SupportedOne.class, "tag1");
- supportedMap.put(SupportedTwo.class, "tag2");
- }
-
- @Override
- public List> getSupportedClasses() {
- return new ArrayList>(tagMap.values());
- }
-
- @Override
- public String getTag(Class supportedClass) {
- return supportedMap.get(supportedClass);
- }
-
- }
-
- /**
- * Checks that {@link IHdfIOFactory} instances can register with the
- * registry and be queried via
- * {@link IHdfIORegistry#getHdfIOFactory(Object)} and
- * {@link IHdfIORegistry#getHdfIOFactory(String)}.
- */
- @Test
- public void checkRegistration() {
-
- // Create a new HdfIORegistry to test
- registry = new HdfIORegistry();
-
- // Create a Fake Factory to register with the
- // HdfIORegistry
- FakeHdfIOFactory factory = new FakeHdfIOFactory();
-
- // Register that FakeHdfIOFactory
- registry.registerHdfIOFactory(factory);
-
- // Test that it was registered correctly
- IHdfIOFactory hdfIOFactory = registry
- .getHdfIOFactory(new SupportedOne());
- assertNotNull(hdfIOFactory);
- assertEquals(factory, hdfIOFactory);
-
- hdfIOFactory = registry.getHdfIOFactory(new SupportedTwo());
- assertNotNull(hdfIOFactory);
- assertEquals(factory, hdfIOFactory);
-
- // Check an unsupported class and make sure it
- // returns null
- hdfIOFactory = registry.getHdfIOFactory(new Object());
- assertNull(hdfIOFactory);
-
- // Now make sure we can get the factory from tags
- hdfIOFactory = registry.getHdfIOFactory("tag1");
- assertNotNull(hdfIOFactory);
- assertEquals(factory, hdfIOFactory);
-
- hdfIOFactory = registry.getHdfIOFactory("tag2");
- assertNotNull(hdfIOFactory);
- assertEquals(factory, hdfIOFactory);
-
- // Test an invalid tag and make sure it returns null
- hdfIOFactory = registry.getHdfIOFactory("tag3");
- assertNull(hdfIOFactory);
-
- }
-
-}
diff --git a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfReaderFactoryTester.java b/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfReaderFactoryTester.java
deleted file mode 100644
index 9c5ba663e..000000000
--- a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfReaderFactoryTester.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Eric J. Lingerfelt, Alexander J. McCaskey,
- * Taylor Patterson, Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.io.hdf.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.net.URI;
-import java.util.ArrayList;
-
-import org.eclipse.ice.io.hdf.HdfFileFactory;
-import org.eclipse.ice.io.hdf.HdfReaderFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
-import ncsa.hdf.object.Attribute;
-import ncsa.hdf.object.Dataset;
-import ncsa.hdf.object.Datatype;
-import ncsa.hdf.object.Group;
-import ncsa.hdf.object.h5.H5Datatype;
-import ncsa.hdf.object.h5.H5File;
-import ncsa.hdf.object.h5.H5Group;
-
-/**
- * This class tests the HdfReaderFactory class.
- *
- * @author Eric J. Lingerfelt
- */
-public class HdfReaderFactoryTester {
-
- /**
- * The data file that will be used for testing purposes. This reference is
- * created before each test, and, if the file exists, is deleted after each
- * test.
- */
- private File dataFile;
- /**
- * The HDF5 file handle for the {@link #dataFile}. This is set to null
- * before each test. If it is left open, it is closed after each test.
- */
- private H5File h5File;
-
- /**
- * Initializes {@link #dataFile} and clears {@link #h5File}.
- */
- @Before
- public void beforeEachTest() {
- // Create a reference to the test file.
- String separator = System.getProperty("file.separator");
- String testFileName = "hdfReaderFactoryFile.h5";
- String userDir = System.getProperty("user.home") + separator
- + "ICETests";
- dataFile = new File(userDir + separator + testFileName);
-
- // Clear the HDF5 file reference.
- h5File = null;
- }
-
- /**
- * If possible, closes {@link #h5File} and deletes {@link #dataFile}.
- */
- @After
- public void afterEachTest() {
-
- // If necessary, close the HDF5 file. This closes any open streams.
- if (h5File != null) {
- try {
- h5File.close();
- } catch (HDF5Exception e) {
- e.printStackTrace();
- }
- h5File = null;
- }
-
- // If possible, delete the test file.
- if (dataFile.exists()) {
- dataFile.delete();
- }
- dataFile = null;
-
- return;
- }
-
- /**
- * This operation checks the getChildH5Group, getChildH5Groups, and
- * getDataset operations.
- */
- @Test
- public void checkGetters() {
-
- // Local declarations
- URI uri = dataFile.toURI();
- String subGroupName = "Bob";
- H5Group subH5Group = null;
- ArrayList rows = new ArrayList();
- int maxRowSize = 0;
- String rowName = "Rows";
-
- // Setup ArrayList of Rows
- rows.add("ABBA");
- rows.add("BABBA");
- rows.add("CABBA");
- rows.add("DabbbyDabbyDooo!");
- rows.add("E");
-
- // Setup the string array
- String[] rowArray = new String[rows.size()];
-
- // Figure out the biggest row size and add to array
- for (int i = 0; i < rows.size(); i++) {
- maxRowSize = Math.max(maxRowSize, rows.get(i).length());
- // Add to array
- rowArray[i] = rows.get(i);
- }
-
- // Create a good H5File
- h5File = HdfFileFactory.createH5File(uri);
- assertNotNull(h5File);
-
- // Open file and setup H5 File to have a parent and child. Check get
- // Readers and get Datasets
- try {
- h5File.open();
- // Setup the H5 File to have a Parent and child
- // Get the parent group
- H5Group parentH5Group = (H5Group) ((javax.swing.tree.DefaultMutableTreeNode) h5File
- .getRootNode()).getUserObject();
-
- // Test to see if a getChild returns null - group does not exist
- assertNull(HdfReaderFactory.getChildH5Group(parentH5Group,
- subGroupName));
-
- // Null Checks
- assertNull(HdfReaderFactory.getChildH5Group(null, subGroupName));
- assertNull(HdfReaderFactory.getChildH5Group(parentH5Group, null));
- assertNull(HdfReaderFactory.getChildH5Group(null, null));
-
- // Add a group to the root group
- h5File.createGroup(subGroupName, parentH5Group);
-
- // Persist data
- h5File.close();
- h5File.open();
-
- // Get the parent
- parentH5Group = (H5Group) ((javax.swing.tree.DefaultMutableTreeNode) h5File
- .getRootNode()).getUserObject();
-
- // Check to see it exists with the group grabber
- subH5Group = HdfReaderFactory.getChildH5Group(parentH5Group,
- subGroupName);
-
- // Check the subH5Groups name to make sure that it does exist and
- // has the correct name
- assertNotNull(subH5Group);
- assertTrue(subGroupName.equals(subH5Group.getName()));
-
- // Check getDatasets
-
- // Check invalid usage of getting dataset that does not exist
- assertNull(HdfReaderFactory.getDataset(subH5Group, rowName));
-
- // Nullary checks for dataSet
- assertNull(HdfReaderFactory.getDataset(null, rowName));
- assertNull(HdfReaderFactory.getDataset(subH5Group, null));
- assertNull(HdfReaderFactory.getDataset(null, null));
-
- // Add a Dataset to the subH5Group
-
- // Create datatypes for the row and column labels
- H5Datatype rowH5Datatype = (H5Datatype) h5File.createDatatype(
- Datatype.CLASS_STRING, maxRowSize, Datatype.NATIVE,
- Datatype.NATIVE);
- long[] dims = { rows.size() };
-
- // Add array to dataset and add dataset ot the subgroup
- Dataset h5RowDataset = h5File.createScalarDS(rowName, subH5Group,
- rowH5Datatype, dims, null, null, 0, null);
- h5RowDataset.write(rowArray);
-
- // Close group and then reopen
- try {
- h5File.close();
- h5File.open();
- } catch (Exception e1) {
- e1.printStackTrace();
- dataFile.delete();
- fail();
- }
-
- // Get the group again
- parentH5Group = (H5Group) ((javax.swing.tree.DefaultMutableTreeNode) h5File
- .getRootNode()).getUserObject();
-
- subH5Group = (H5Group) parentH5Group.getMemberList().get(0);
-
- // Now, check to see if you can get it!
- Dataset data = HdfReaderFactory.getDataset(subH5Group, rowName);
- // Make sure it is not null
- assertNotNull(data);
-
- // Check information on dataset
- assertEquals(1, subH5Group.getMemberList().size());
- // Check the value of that dataset
- assertEquals(rowName, subH5Group.getMemberList().get(0).getName());
- // Check labels that they are not a group
- assertFalse(subH5Group.getMemberList().get(0) instanceof Group);
-
- // Check DataSet information
-
- // Check the rowData
- Object rowData = data.getData();
-
- // Iterate over the list and check the arrayLists
- for (int i = 0; i < rows.size(); i++) {
- // Check contents of rowData at X
- assertEquals(rows.get(i), ((String[]) rowData)[i]);
- }
-
- // Check the getter for index
- // Check nullaries
- assertNull(HdfReaderFactory.getChildH5Group(null, 0));
- assertNull(HdfReaderFactory.getChildH5Group(parentH5Group, -1));
- assertNull(HdfReaderFactory.getChildH5Group(null, -1));
- // Check invalid index - out of bounds
- assertNull(HdfReaderFactory.getChildH5Group(parentH5Group, 1));
-
- // Check valid usage
- subH5Group = HdfReaderFactory.getChildH5Group(parentH5Group, 0);
-
- // Check the subH5Groups name to make sure that it does exist and
- // has the correct name
- assertNotNull(subH5Group);
- assertEquals(subGroupName, subH5Group.getName());
-
- // Try to grab the group as a dataset - should throw a class cast
- // exception
- assertNull(
- HdfReaderFactory.getDataset(parentH5Group, subGroupName));
-
- // Try to grab the dataset as a group - should throw a class cast
- // exception
- assertNull(HdfReaderFactory.getChildH5Group(subH5Group, rowName));
- assertNull(HdfReaderFactory.getChildH5Group(subH5Group, 0));
-
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
-
- return;
- }
-
- /**
- * This operation checks the readDoubleAttribute, readStringAttribute, and
- * readIntegerAttribute operations.
- */
- @Test
- public void checkReaders() {
-
- // Local declarations
- URI uri = dataFile.toURI();
- String integerName = "Integer1";
- String doubleName = "Double1";
- String stringName = "String1";
- int intValue = 3;
- double doubleValue = 5.67656565343;
- String stringValue = "Bobby Lee Jones";
- String childGroupName = "new Group";
-
- // Create a good H5File
- h5File = HdfFileFactory.createH5File(uri);
- assertNotNull(h5File);
-
- // Open file and setup H5 File to have a parent and child. Check get
- // Readers and get Datasets
- try {
- h5File.open();
- // Setup the H5 File to have a Parent and child
- // Get the parent group
- H5Group parentH5Group = (H5Group) ((javax.swing.tree.DefaultMutableTreeNode) h5File
- .getRootNode()).getUserObject();
-
- // Check nullary reader operations
-
- // Check nullary and invalid values for Integer read
- assertNull(HdfReaderFactory.readIntegerAttribute(parentH5Group,
- integerName));
- assertNull(
- HdfReaderFactory.readIntegerAttribute(null, integerName));
- assertNull(
- HdfReaderFactory.readIntegerAttribute(parentH5Group, null));
- assertNull(HdfReaderFactory.readIntegerAttribute(null, null));
-
- // Check nullary and invalid values for Double read
- assertNull(HdfReaderFactory.readDoubleAttribute(parentH5Group,
- doubleName));
- assertNull(HdfReaderFactory.readDoubleAttribute(null, doubleName));
- assertNull(
- HdfReaderFactory.readDoubleAttribute(parentH5Group, null));
- assertNull(HdfReaderFactory.readDoubleAttribute(null, null));
-
- // Check nullary and invalid values for String read
- assertNull(HdfReaderFactory.readStringAttribute(parentH5Group,
- stringName));
- assertNull(HdfReaderFactory.readStringAttribute(null, stringName));
- assertNull(
- HdfReaderFactory.readStringAttribute(parentH5Group, null));
- assertNull(HdfReaderFactory.readStringAttribute(null, null));
-
- // Add a Integer, a Double, and a String to the parentGroup
-
- // Setup dataTypes for Integer, Double, and a String
-
- // Integer Datatype
- // Create the integer datatype
- H5Datatype intDatatype = (H5Datatype) h5File.createDatatype(
- Datatype.CLASS_INTEGER, Datatype.NATIVE, Datatype.NATIVE,
- Datatype.NATIVE);
-
- // Double (float) Datatype
- // Create the float datatype
- H5Datatype doubleDatatype = (H5Datatype) h5File.createDatatype(
- Datatype.CLASS_FLOAT, 8, Datatype.NATIVE, Datatype.NATIVE);
-
- // String Datatype
- // Create a custom String data type for the value
- H5Datatype stringDatatype = (H5Datatype) h5File.createDatatype(
- Datatype.CLASS_STRING, stringValue.length(),
- Datatype.NATIVE, Datatype.NATIVE);
-
- // Add a Integer
- long[] intDims = { 1 };
- int[] intValues = { intValue };
- // Create an attribute object
- Attribute intAttribute = new Attribute(integerName, intDatatype,
- intDims, intValues);
- // Write the attribute
- parentH5Group.writeMetadata(intAttribute);
-
- // Add a Double
- long[] doubleDims = { 1 };
- double[] doubleValues = { doubleValue };
- // Create an attribute object
- Attribute doubleAttribute = new Attribute(doubleName,
- doubleDatatype, doubleDims, doubleValues);
- // Write the attribute
- parentH5Group.writeMetadata(doubleAttribute);
-
- // Add a String
- String[] stringValues = new String[1];
- stringValues[0] = stringValue;
- // Create a byte array from values using the stringToByte method
- // See
- // http://mail.hdfgroup.org/pipermail/hdf-forum_hdfgroup.org/2011-March/004509.html
- byte[] bvalue = Dataset.stringToByte(stringValues,
- stringValue.length());
- // Create an attribute object
- Attribute stringAttribute = new Attribute(stringName,
- stringDatatype, new long[] { 1 });
- // Set the value of the attribute to bvalue
- stringAttribute.setValue(bvalue);
- // Write the attribute to the group's metadata
- parentH5Group.writeMetadata(stringAttribute);
-
- h5File.close();
-
- h5File.open();
- parentH5Group = (H5Group) ((javax.swing.tree.DefaultMutableTreeNode) h5File
- .getRootNode()).getUserObject();
-
- // Now, time to read those values!
- assertEquals(intValue,
- HdfReaderFactory
- .readIntegerAttribute(parentH5Group, integerName)
- .intValue());
- assertEquals(doubleValue,
- HdfReaderFactory
- .readDoubleAttribute(parentH5Group, doubleName)
- .doubleValue(),
- 0.0);
- assertEquals(stringValue, HdfReaderFactory
- .readStringAttribute(parentH5Group, stringName));
-
- // Checking for child groups.
- assertNotNull(HdfReaderFactory.getChildH5Groups(parentH5Group));
- assertEquals(0,
- HdfReaderFactory.getChildH5Groups(parentH5Group).size());
-
- // Check for child objects.
- assertNotNull(HdfReaderFactory.getChildH5Members(parentH5Group));
- assertEquals(0,
- HdfReaderFactory.getChildH5Members(parentH5Group).size());
-
- // Lets add something to the group
- H5Group h5Group = (H5Group) h5File.createGroup(childGroupName,
- parentH5Group);
- // Add an attribute to the group
- // Add a Integer
- h5Group.writeMetadata(intAttribute);
- assertNotNull(h5Group);
-
- // Add a dataset (100x50 integer array) to the parent group.
- String datasetName = "2D integer";
- Datatype dtype = new H5Datatype(Datatype.CLASS_INTEGER, 4,
- Datatype.ORDER_LE, Datatype.SIGN_NONE);
- long[] dims = { 100, 50 };
- long[] maxdims = dims;
- long[] chunks = null;
- int gzip = 0;
- Object data = null;
- h5File.createScalarDS(datasetName, parentH5Group, dtype, dims,
- maxdims, chunks, gzip, data);
-
- // Close to persist the data and reopen, get the new parenth5Group
- // object
- h5File.close();
-
- h5File.open();
- parentH5Group = (H5Group) ((javax.swing.tree.DefaultMutableTreeNode) h5File
- .getRootNode()).getUserObject();
-
- // Check for children now. There should only be one child group.
- assertNotNull(HdfReaderFactory.getChildH5Groups(parentH5Group));
- assertEquals(1,
- HdfReaderFactory.getChildH5Groups(parentH5Group).size());
- assertEquals(childGroupName, HdfReaderFactory
- .getChildH5Groups(parentH5Group).get(0).getName());
-
- // Check for child objects. There should be two (a group and a
- // dataset).
- assertNotNull(HdfReaderFactory.getChildH5Members(parentH5Group));
- assertEquals(2,
- HdfReaderFactory.getChildH5Members(parentH5Group).size());
- assertEquals(childGroupName, HdfReaderFactory
- .getChildH5Members(parentH5Group).get(1).getName());
- assertEquals(datasetName, HdfReaderFactory
- .getChildH5Members(parentH5Group).get(0).getName());
-
- } catch (Exception e) {
- // Fail out of the test, not supposed to happen
- e.printStackTrace();
- fail();
- }
- return;
- }
-}
\ No newline at end of file
diff --git a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfWriterFactoryTester.java b/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfWriterFactoryTester.java
deleted file mode 100644
index 9c5830950..000000000
--- a/org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfWriterFactoryTester.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Eric J. Lingerfelt, Alexander J. McCaskey,
- * Taylor Patterson, Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.io.hdf.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.net.URI;
-
-import org.eclipse.ice.io.hdf.HdfFileFactory;
-import org.eclipse.ice.io.hdf.HdfWriterFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
-import ncsa.hdf.object.Attribute;
-import ncsa.hdf.object.Dataset;
-import ncsa.hdf.object.Datatype;
-import ncsa.hdf.object.HObject;
-import ncsa.hdf.object.h5.H5Datatype;
-import ncsa.hdf.object.h5.H5File;
-import ncsa.hdf.object.h5.H5Group;
-
-/**
- * This class tests the HdfWriterFactory class.
- *
- * @author Eric J. Lingerfelt
- */
-public class HdfWriterFactoryTester {
-
- /**
- * The data file that will be used for testing purposes. This reference is
- * created before each test, and, if the file exists, is deleted after each
- * test.
- */
- private File dataFile;
- /**
- * The HDF5 file handle for the {@link #dataFile}. This is set to null
- * before each test. If it is left open, it is closed after each test.
- */
- private H5File h5File;
-
- /**
- * Initializes {@link #dataFile} and clears {@link #h5File}.
- */
- @Before
- public void beforeEachTest() {
- // Create a reference to the test file.
- String separator = System.getProperty("file.separator");
- String testFileName = "hdfWriterFactoryFile.h5";
- String userDir = System.getProperty("user.home") + separator
- + "ICETests";
- dataFile = new File(userDir + separator + testFileName);
-
- // Clear the HDF5 file reference.
- h5File = null;
- }
-
- /**
- * If possible, closes {@link #h5File} and deletes {@link #dataFile}.
- */
- @After
- public void afterEachTest() {
-
- // If necessary, close the HDF5 file. This closes any open streams.
- if (h5File != null) {
- try {
- h5File.close();
- } catch (HDF5Exception e) {
- e.printStackTrace();
- }
- h5File = null;
- }
-
- // If possible, delete the test file.
- if (dataFile.exists()) {
- dataFile.delete();
- }
- dataFile = null;
-
- return;
- }
-
- /**
- * This operation checks the createFloatDatatype, createH5Group, and
- * createIntegerH5Datatype operations.
- */
- @Test
- public void checkCreators() {
- // Local declarations
- URI uri = dataFile.toURI();
-
- // Create a bad H5File
- h5File = HdfFileFactory.createH5File(null);
- assertNull(h5File);
-
- // Create a good H5File
- h5File = HdfFileFactory.createH5File(uri);
- assertNotNull(h5File);
-
- // Create a bad Reactor group
- H5Group reactorGroup = HdfWriterFactory.createH5Group(null, null, null);
- assertNull(reactorGroup);
-
- // Create a bad Reactor group
- reactorGroup = HdfWriterFactory.createH5Group(h5File, null, null);
- assertNull(reactorGroup);
-
- // Create a bad Reactor group
- reactorGroup = HdfWriterFactory.createH5Group(h5File, "", null);
- assertNull(reactorGroup);
-
- // Get the root group
- H5Group rootH5Group = (H5Group) ((javax.swing.tree.DefaultMutableTreeNode) h5File
- .getRootNode()).getUserObject();
-
- // Create a good Reactor group
- reactorGroup = HdfWriterFactory.createH5Group(h5File, "Reactor",
- rootH5Group);
- assertNotNull(reactorGroup);
-
- try {
-
- // Get the HObject at the given path
- HObject hObject = h5File.get("/Reactor");
-
- // Check that its not null and an instance of H5Group
- assertNotNull(hObject);
- assertTrue(hObject instanceof H5Group);
-
- // Cast the H5Object to an H5Group and check its name
- H5Group tempGroup = (H5Group) hObject;
- assertTrue("Reactor".equals(tempGroup.getName()));
-
- } catch (Exception e) {
-
- // Print the stack trace
- e.printStackTrace();
-
- // Fail the test
- fail();
- }
-
- // Create a bad Geometry group under the Reactor Group
- H5Group geometryGroup = HdfWriterFactory.createH5Group(null, "",
- reactorGroup);
- assertNull(geometryGroup);
-
- // Create a bad Geometry group under the Reactor Group
- geometryGroup = HdfWriterFactory.createH5Group(null, "Geometry",
- reactorGroup);
- assertNull(geometryGroup);
-
- // Create a good Geometry group under the Reactor Group
- geometryGroup = HdfWriterFactory.createH5Group(h5File, "Geometry",
- reactorGroup);
- assertNotNull(geometryGroup);
-
- try {
-
- // Get the HObject at the given path
- HObject hObject = h5File.get("/Reactor/Geometry");
-
- // Check that its not null and an instance of H5Group
- assertNotNull(hObject);
- assertTrue(hObject instanceof H5Group);
-
- // Cast the H5Object to an H5Group and check its name
- H5Group tempGroup = (H5Group) hObject;
- assertTrue("Geometry".equals(tempGroup.getName()));
-
- } catch (Exception e) {
-
- // Print the stack trace
- e.printStackTrace();
-
- // Fail the test
- fail();
- }
-
- // Create a bad integer datatype
- H5Datatype integerDatatype = HdfWriterFactory
- .createIntegerH5Datatype(null);
- assertNull(integerDatatype);
-
- // Create a good integer datatype
- integerDatatype = HdfWriterFactory.createIntegerH5Datatype(h5File);
- assertNotNull(integerDatatype);
- assertEquals(integerDatatype.getDatatypeClass(),
- H5Datatype.CLASS_INTEGER);
-
- // Create a bad float datatype
- H5Datatype floatDatatype = HdfWriterFactory.createFloatH5Datatype(null);
- assertNull(floatDatatype);
-
- // Create a good float datatype
- floatDatatype = HdfWriterFactory.createFloatH5Datatype(h5File);
- assertNotNull(floatDatatype);
- assertEquals(floatDatatype.getDatatypeClass(), H5Datatype.CLASS_FLOAT);
-
- return;
- }
-
- /**
- * This operation checks the writeDoubleAttribute, writeStringAttribute, and
- * writeIntegerAttribute operations.
- */
- @Test
- public void checkWriters() {
- // Local declarations
- URI uri = dataFile.toURI();
- boolean flag = true;
- double number = 0.12345678912345;
-
- // Create a good H5File
- h5File = HdfFileFactory.createH5File(uri);
-
- H5Group rootH5Group = (H5Group) ((javax.swing.tree.DefaultMutableTreeNode) h5File
- .getRootNode()).getUserObject();
-
- // Create a good Reactor group
- H5Group reactorGroup = HdfWriterFactory.createH5Group(h5File, "Reactor",
- rootH5Group);
- assertNotNull(reactorGroup);
-
- // Write some double attributes with bad arguments
- flag = HdfWriterFactory.writeDoubleAttribute(null, null, null, number);
- assertFalse(flag);
-
- flag = HdfWriterFactory.writeDoubleAttribute(h5File, null, null,
- number);
- assertFalse(flag);
-
- flag = HdfWriterFactory.writeDoubleAttribute(h5File, reactorGroup, null,
- number);
- assertFalse(flag);
-
- // Write a double attribute with good arguments
- flag = HdfWriterFactory.writeDoubleAttribute(h5File, reactorGroup,
- "double value", number);
- assertTrue(true);
-
- try {
-
- // Check to see if the attribute was actually written
- Attribute attribute = (Attribute) reactorGroup.getMetadata().get(0);
- assertEquals(attribute.getName(), "double value");
- assertEquals(attribute.getType().getDatatypeClass(),
- Datatype.CLASS_FLOAT);
- assertEquals(((double[]) attribute.getValue())[0], number, 0.0);
-
- } catch (Exception e) {
-
- // Print the stack trace
- e.printStackTrace();
-
- // Fail the test
- fail();
- }
-
- // Write some integer attributes with bad arguments
- flag = HdfWriterFactory.writeIntegerAttribute(null, null, null, 5);
- assertFalse(flag);
-
- flag = HdfWriterFactory.writeIntegerAttribute(h5File, null, null, 5);
- assertFalse(flag);
-
- flag = HdfWriterFactory.writeIntegerAttribute(h5File, reactorGroup,
- null, 5);
- assertFalse(flag);
-
- // Write a integer attribute with good arguments
- flag = HdfWriterFactory.writeIntegerAttribute(h5File, reactorGroup,
- "integer value", 5);
- assertTrue(true);
-
- try {
-
- // Check to see if the attribute was actually written
- Attribute attribute = (Attribute) reactorGroup.getMetadata().get(1);
- assertEquals(attribute.getName(), "integer value");
- assertEquals(attribute.getType().getDatatypeClass(),
- Datatype.CLASS_INTEGER);
- assertEquals(((int[]) attribute.getValue())[0], 5);
-
- } catch (Exception e) {
-
- // Print the stack trace
- e.printStackTrace();
-
- // Fail the test
- fail();
- }
-
- // Write some string attributes with bad arguments
- flag = HdfWriterFactory.writeStringAttribute(null, null, null, null);
- assertFalse(flag);
-
- flag = HdfWriterFactory.writeStringAttribute(h5File, null, null, null);
- assertFalse(flag);
-
- flag = HdfWriterFactory.writeStringAttribute(h5File, reactorGroup, null,
- null);
- assertFalse(flag);
-
- flag = HdfWriterFactory.writeStringAttribute(h5File, reactorGroup, "",
- null);
- assertFalse(flag);
-
- flag = HdfWriterFactory.writeStringAttribute(h5File, reactorGroup, "",
- "");
- assertFalse(flag);
-
- flag = HdfWriterFactory.writeStringAttribute(h5File, reactorGroup,
- "string value", "");
- assertFalse(flag);
-
- // Write a string attribute with good arguments
- flag = HdfWriterFactory.writeStringAttribute(h5File, reactorGroup,
- "string value", "USS Defiant");
- assertTrue(flag);
-
- try {
-
- // Check to see if the attribute was actually written
- Attribute attribute = (Attribute) reactorGroup.getMetadata().get(2);
- assertEquals(attribute.getName(), "string value");
- assertEquals(attribute.getType().getDatatypeClass(),
- Datatype.CLASS_STRING);
- String attributeValue = Dataset.byteToString(
- (byte[]) attribute.getValue(),
- ((byte[]) attribute.getValue()).length)[0];
- assertEquals(attributeValue, "USS Defiant");
-
- } catch (Exception e) {
-
- // Print the stack trace
- e.printStackTrace();
-
- // Fail the test
- fail();
- }
-
- return;
- }
-}
\ No newline at end of file
diff --git a/org.eclipse.ice.io/.classpath b/org.eclipse.ice.io/.classpath
index 039123375..098194ca4 100644
--- a/org.eclipse.ice.io/.classpath
+++ b/org.eclipse.ice.io/.classpath
@@ -1,10 +1,5 @@
-
-
-
-
-
diff --git a/org.eclipse.ice.io/META-INF/MANIFEST.MF b/org.eclipse.ice.io/META-INF/MANIFEST.MF
index cd3a00ef5..367e18ed8 100644
--- a/org.eclipse.ice.io/META-INF/MANIFEST.MF
+++ b/org.eclipse.ice.io/META-INF/MANIFEST.MF
@@ -4,29 +4,13 @@ Bundle-Name: org.eclipse.ice.io
Bundle-SymbolicName: org.eclipse.ice.io;singleton:=true
Bundle-Version: 2.1.8
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ClassPath: .,
- deps/jhdf.jar,
- deps/jhdf4obj.jar,
- deps/jhdf5.jar,
- deps/jhdf5obj.jar,
- deps/jhdfobj.jar
+Bundle-ClassPath: .
Require-Bundle: org.eclipse.ice.datastructures,
org.eclipse.ice.dependencies;bundle-version="2.0.0";visibility:=reexport
Service-Component: OSGI-INF/HdfIORegistry.xml,OSGI-INF/HdfIOFactory.xml,
OSGI-INF/ioservice.xml
Comment: Service-Component: OSGI-INF/ICEDatabaseHarness.xml
-Export-Package: ncsa.hdf.hdf5lib,
- ncsa.hdf.hdf5lib.callbacks,
- ncsa.hdf.hdf5lib.exceptions,
- ncsa.hdf.hdf5lib.structs,
- ncsa.hdf.hdflib,
- ncsa.hdf.object,
- ncsa.hdf.object.fits,
- ncsa.hdf.object.h4,
- ncsa.hdf.object.h5,
- ncsa.hdf.object.nc2,
- org.eclipse.ice.io.csv,
- org.eclipse.ice.io.hdf,
+Export-Package: org.eclipse.ice.io.csv,
org.eclipse.ice.io.ini,
org.eclipse.ice.io.ips,
org.eclipse.ice.io.serializable
diff --git a/org.eclipse.ice.io/build.properties b/org.eclipse.ice.io/build.properties
index 499ea41ad..8d9fed03f 100644
--- a/org.eclipse.ice.io/build.properties
+++ b/org.eclipse.ice.io/build.properties
@@ -7,11 +7,6 @@ bin.includes = META-INF/,\
OSGI-INF/HdfIORegistry.xml,\
OSGI-INF/HdfIOFactory.xml,\
OSGI-INF/ioservice.xml,\
- deps/jhdf.jar,\
- deps/jhdf4obj.jar,\
- deps/jhdf5.jar,\
- deps/jhdf5obj.jar,\
- deps/jhdfobj.jar,\
deps/lib/linux/x86_64,\
plugin.xml
src.includes = src/,\
diff --git a/org.eclipse.ice.io/deps/jhdf.jar b/org.eclipse.ice.io/deps/jhdf.jar
deleted file mode 100644
index 9716445d7..000000000
Binary files a/org.eclipse.ice.io/deps/jhdf.jar and /dev/null differ
diff --git a/org.eclipse.ice.io/deps/jhdf4obj.jar b/org.eclipse.ice.io/deps/jhdf4obj.jar
deleted file mode 100644
index eef1ce876..000000000
Binary files a/org.eclipse.ice.io/deps/jhdf4obj.jar and /dev/null differ
diff --git a/org.eclipse.ice.io/deps/jhdf5.jar b/org.eclipse.ice.io/deps/jhdf5.jar
deleted file mode 100644
index 6765c8770..000000000
Binary files a/org.eclipse.ice.io/deps/jhdf5.jar and /dev/null differ
diff --git a/org.eclipse.ice.io/deps/jhdf5obj.jar b/org.eclipse.ice.io/deps/jhdf5obj.jar
deleted file mode 100644
index 9092b67e3..000000000
Binary files a/org.eclipse.ice.io/deps/jhdf5obj.jar and /dev/null differ
diff --git a/org.eclipse.ice.io/deps/jhdfobj.jar b/org.eclipse.ice.io/deps/jhdfobj.jar
deleted file mode 100644
index 99619360f..000000000
Binary files a/org.eclipse.ice.io/deps/jhdfobj.jar and /dev/null differ
diff --git a/org.eclipse.ice.io/deps/lib/linux/x86_64/libhdf.a b/org.eclipse.ice.io/deps/lib/linux/x86_64/libhdf.a
deleted file mode 100644
index 87cdc6596..000000000
Binary files a/org.eclipse.ice.io/deps/lib/linux/x86_64/libhdf.a and /dev/null differ
diff --git a/org.eclipse.ice.io/deps/lib/linux/x86_64/libhdf5.a b/org.eclipse.ice.io/deps/lib/linux/x86_64/libhdf5.a
deleted file mode 100644
index 867ae49eb..000000000
Binary files a/org.eclipse.ice.io/deps/lib/linux/x86_64/libhdf5.a and /dev/null differ
diff --git a/org.eclipse.ice.io/deps/lib/linux/x86_64/libjhdf.so b/org.eclipse.ice.io/deps/lib/linux/x86_64/libjhdf.so
deleted file mode 100755
index 0c08fb560..000000000
Binary files a/org.eclipse.ice.io/deps/lib/linux/x86_64/libjhdf.so and /dev/null differ
diff --git a/org.eclipse.ice.io/deps/lib/linux/x86_64/libjhdf.so.2.10.0 b/org.eclipse.ice.io/deps/lib/linux/x86_64/libjhdf.so.2.10.0
deleted file mode 100755
index 0c08fb560..000000000
Binary files a/org.eclipse.ice.io/deps/lib/linux/x86_64/libjhdf.so.2.10.0 and /dev/null differ
diff --git a/org.eclipse.ice.io/deps/lib/linux/x86_64/libjhdf5.so b/org.eclipse.ice.io/deps/lib/linux/x86_64/libjhdf5.so
deleted file mode 100755
index 2cc4200f7..000000000
Binary files a/org.eclipse.ice.io/deps/lib/linux/x86_64/libjhdf5.so and /dev/null differ
diff --git a/org.eclipse.ice.io/deps/lib/linux/x86_64/libjhdf5.so.2.10.0 b/org.eclipse.ice.io/deps/lib/linux/x86_64/libjhdf5.so.2.10.0
deleted file mode 100755
index 2cc4200f7..000000000
Binary files a/org.eclipse.ice.io/deps/lib/linux/x86_64/libjhdf5.so.2.10.0 and /dev/null differ
diff --git a/org.eclipse.ice.io/src/org/eclipse/ice/io/hdf/HdfFileFactory.java b/org.eclipse.ice.io/src/org/eclipse/ice/io/hdf/HdfFileFactory.java
deleted file mode 100644
index 4308e82fd..000000000
--- a/org.eclipse.ice.io/src/org/eclipse/ice/io/hdf/HdfFileFactory.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Eric J. Lingerfelt, Alexander J. McCaskey,
- * Taylor Patterson, Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.io.hdf;
-
-import java.io.File;
-import java.net.URI;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
-import ncsa.hdf.object.FileFormat;
-import ncsa.hdf.object.h5.H5File;
-
-/**
- *
- * The HDFFileFactory class contains static methods used to create, open, and
- * close HDF5 files.
- *
- *
- * @author Eric J. Lingerfelt
- */
-public class HdfFileFactory {
-
- /**
- * Logger for handling event messages and other information.
- */
- private static final Logger logger = LoggerFactory
- .getLogger(HdfFileFactory.class);
-
- /**
- *
- * Creates, opens, and returns an H5File from the provided uri. If the uri
- * is null, the null is returned. If the FID of resulting h5File is -1, then
- * null is returned. If any Exception is thrown, then null is returned.
- *
- *
- * @param uri
- *
- * The URI of the H5File to create and open.
- *
- * @return
- *
- * An H5File that has been created and opened for read/write
- * operations.
- *
- */
- public static H5File createH5File(URI uri) {
-
- // If parameter is null, return null
- if (uri == null) {
- return null;
- }
-
- // Retrieve an instance of the HDF5 format
- FileFormat fileFormat = FileFormat
- .getFileFormat(FileFormat.FILE_TYPE_HDF5);
-
- try {
-
- // Create a file from the uri
- File file = new File(uri);
-
- // Create an H5 file. If it exists already, then delete it.
- H5File h5File = (H5File) fileFormat.createFile(file.getPath(),
- FileFormat.FILE_CREATE_DELETE);
-
- // We must get an instance to the file and set the format to write
- h5File = (H5File) fileFormat.createInstance(file.getPath(),
- FileFormat.WRITE);
-
- // Open the file
- h5File.open();
-
- // If the file id of the h5File is -1, return null
- if (h5File.getFID() == -1) {
-
- return null;
-
- }
-
- // Return the file
- return h5File;
-
- } catch (Exception e) {
-
- // Print the stack trace
- logger.error("HdfFileFactory Exception!", e);
-
- // Return null
- return null;
-
- }
-
- }
-
- /**
- *
- * Closes an h5File.
- *
- *
- * @param h5File
- *
- * The H5File to close.
- *
- */
- public static void closeH5File(H5File h5File) {
-
- try {
-
- // If the file is not null
- if (h5File != null) {
-
- // Close the file
- h5File.close();
-
- }
-
- } catch (HDF5Exception e) {
-
- // Print the stack trace
- logger.error("HdfFileFactory Exception!", e);
- }
-
- }
-
- /**
- *
- * Opens and returns an h5File from the provided URI. If the uri is null,
- * the null is returned. If the File for uri does not exist, then null is
- * returned. If the resulting h5File is null or does not exist, then null is
- * returned. If any Exception is thrown, then null is returned.
- *
- *
- * @param uri
- *
- * The URI of the H5File to open.
- *
- * @return
- *
- * An H5File that has been opened for read/write operations.
- *
- */
- public static H5File openH5File(URI uri) {
-
- // If parameter is null or does not exist, return null
- if (uri == null || !(new File(uri).exists())) {
- return null;
- }
-
- // Retrieve an instance of the HDF5 format
- FileFormat fileFormat = FileFormat
- .getFileFormat(FileFormat.FILE_TYPE_HDF5);
-
- try {
-
- // Create a file from the uri
- File file = new File(uri);
-
- // Open a h5File
- H5File h5File = (H5File) fileFormat.createInstance(file.getPath(),
- FileFormat.WRITE);
-
- // If the h5File does not exist, then return null
- if (h5File == null || !h5File.exists()) {
- return null;
- }
-
- // Open the file
- h5File.open();
-
- // If the file id of the h5File is -1, return null
- if (h5File.getFID() == -1) {
-
- return null;
-
- }
-
- // Return the file
- return h5File;
-
- } catch (Exception e) {
-
- // Print the stack trace
- logger.error("HdfFileFactory Exception!", e);
-
- // Return null
- return null;
-
- }
-
- }
-}
\ No newline at end of file
diff --git a/org.eclipse.ice.io/src/org/eclipse/ice/io/hdf/HdfIOFactory.java b/org.eclipse.ice.io/src/org/eclipse/ice/io/hdf/HdfIOFactory.java
deleted file mode 100644
index e8fe85493..000000000
--- a/org.eclipse.ice.io/src/org/eclipse/ice/io/hdf/HdfIOFactory.java
+++ /dev/null
@@ -1,1036 +0,0 @@
-/*******************************************************************************
- * 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:
- * Initial API and implementation and/or initial documentation - Jay Jay Billings,
- * Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
- * Claire Saunders, Matthew Wang, Anna Wojtowicz
- *******************************************************************************/
-package org.eclipse.ice.io.hdf;
-
-import java.io.File;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-import ncsa.hdf.hdf5lib.H5;
-import ncsa.hdf.hdf5lib.HDF5Constants;
-import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
-import ncsa.hdf.hdf5lib.exceptions.HDF5LibraryException;
-import ncsa.hdf.hdf5lib.structs.H5O_info_t;
-
-import org.eclipse.ice.datastructures.ICEObject.ICEObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- *
- * This class provides a base for implementing {@link IHdfIOFactory} and
- * includes many helpful methods for writing and reading HDF5 attributes,
- * datasets, groups, and more.
- *
- *
- * Sub-classes must override the following methods (no calls to
- * the super method necessary):
- *
- *
{@link #getSupportedClasses()}
- *
{@link #getTag(Class)}
- *
{@link #read(int, String)}
- *
{@link #writeObjectData(int, Object)}
- *
- * Note that this class cannot be abstract because it references an OSGi service
- * so that sub-classes have easy access to the {@link IHdfIORegistry}
- * implementation.
- *
- *
- * @author Jordan H. Deyton
- *
- */
-public class HdfIOFactory implements IHdfIOFactory {
-
- /**
- * Logger for handling event messages and other information.
- */
- private static final Logger logger = LoggerFactory
- .getLogger(HdfIOFactory.class);
-
- /**
- * The default rank of an attribute. This means an attribute is a 1D array.
- */
- private static final int attributeRank = 1;
- /**
- * The default data dimension array for all attributes. This just means that
- * an attribute is a 1D array with 1 element.
- */
- private static final long[] attributeDims = new long[] { 1 };
- /**
- * A buffer that contains a single double value. Helps avoid having to
- * create a new double array for double attributes.
- */
- private static final Double[] doubleAttributeBuffer = new Double[1];
- /**
- * A buffer that contains a single integer value. Helps avoid having to
- * create a new integer array for integer attributes.
- */
- private static final Integer[] integerAttributeBuffer = new Integer[1];
-
- /**
- * The IHdfIORegistry implementation that is running as an OSGi Declarative
- * Service.
- */
- private static IHdfIORegistry hdfIORegistry = null;
-
- // ---- Methods that sub-classes MUST override! ---- //
- /**
- * Sub-classes must override this method.
- */
- @Override
- public List> getSupportedClasses() {
- return new ArrayList>();
- }
-
- /**
- * Sub-classes must override this method.
- */
- @Override
- public String getTag(Class supportedClass) {
- return null;
- }
-
- /**
- * Sub-classes must override this method.
- */
- @Override
- public Object read(int groupId, String tag) throws NullPointerException,
- HDF5Exception, HDF5LibraryException {
- return null;
- }
-
- /**
- * Sub-classes must override this method. Fills out an HDF5 Group
- * with information regarding the specified object.
- *
- * @param groupId
- * The group for the object.
- * @param object
- * The object whose information is being written to the group.
- */
- public void writeObjectData(int groupId, Object object)
- throws NullPointerException, HDF5Exception, HDF5LibraryException {
- return;
- }
-
- // ------------------------------------------------- //
-
- // ---- HdfIORegistry operations. ---- //
- /**
- * Sets the {@link IHdfIORegistry} implementation that is running as an OSGi
- * Declarative Service.
- */
- public static void setHdfIORegistry(IHdfIORegistry registry) {
- if (registry != null) {
- hdfIORegistry = registry;
- logger.info("HdfIOFactory message: " + "Registry set successfully!");
- } else {
- logger.info("HdfIOFactory message: "
- + "Failed to set the registry.");
- }
-
- return;
- }
-
- /**
- * Unsets the {@link IHdfIORegistry} implementation. This happens only when
- * the bundle has shut down.
- */
- public static void unsetHdfIORegistry(IHdfIORegistry registry) {
- hdfIORegistry = null;
- }
-
- /**
- * Gets the {@link IHdfIORegistry} implementation that is running as an OSGi
- * Declarative Service.
- *
- * @return The current implementation of the IHdfIORegistry.
- */
- public static IHdfIORegistry getHdfIORegistry() {
- return hdfIORegistry;
- }
-
- // ----------------------------------- //
-
- // ---- Intercept the write method to force writing tag Attributes. ---- //
- /**
- * When writing an object to an HDF5 file, we must create a tag Attribute.
- * This operation enforces this requirement. It also creates a group named
- * with the object's toString() value. Sub-classes should instead implement
- * {@link #writeObjectData(int, Object)}.
- */
- @Override
- public void write(int parentGroupId, Object object)
- throws NullPointerException, HDF5Exception, HDF5LibraryException {
-
- if (object != null) {
- // Create the group.
- int groupId = createGroup(parentGroupId, object.toString());
-
- // Write the tag.
- writeTag(getTag(object.getClass()), groupId);
-
- // Write the object's info to the group.
- writeObjectData(groupId, object);
-
- // Close the group.
- closeGroup(groupId);
- }
-
- return;
- }
-
- // --------------------------------------------------------------------- //
-
- // ---- File writing and reading. ---- //
- /**
- * Writes several objectss to the file specified by the URI.
- *
- * @param uri
- * The URI of the file that will hold the objects.
- * @param objects
- * The objects that will be written to the file.
- */
- public final void writeObjects(URI uri, List