Merge pull request #3 from SmithRWORNL/master

Removed references to ICE
eclipse-january · May 24, 2017 · 46bc60b · 46bc60b
2 parents 97ba947 + 131caf6
commit 46bc60b
Show file tree

Hide file tree

Showing 83 changed files with 692 additions and 686 deletions.
diff --git a/org.eclipse.january.form.test/META-INF/MANIFEST.MF b/org.eclipse.january.form.test/META-INF/MANIFEST.MF
@@ -21,6 +21,6 @@ Import-Package: ca.odell.glazedlists,
  org.osgi.util.tracker;version="1.5.0",
  org.slf4j;version="1.7.2"
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ice.datastructures.test
+Export-Package: org.eclipse.january.datastructures.test
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse January
diff --git a/...tures/entry/test/AbstractEntryTester.java → ...tures/entry/test/AbstractEntryTester.java b/...tures/entry/test/AbstractEntryTester.java → ...tures/entry/test/AbstractEntryTester.java
@@ -11,7 +11,7 @@
  *    Claire Saunders, Matthew Wang, Anna Wojtowicz
  *     
  *******************************************************************************/
-package org.eclipse.ice.datastructures.entry.test;
+package org.eclipse.january.datastructures.entry.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -27,7 +27,7 @@
 import javax.xml.bind.JAXBException;
 
 import org.eclipse.january.form.AbstractEntry;
-import org.eclipse.january.form.ICEJAXBHandler;
+import org.eclipse.january.form.JanuaryJAXBHandler;
 import org.junit.Test;
 
 /**
@@ -59,10 +59,10 @@ public void checkBasicProperties() {
 		entry = new TestableAbstractEntry();
 
 		// Check the already set stuff
-		assertEquals("ICE Entry", entry.getName());
+		assertEquals("January Entry", entry.getName());
 		assertEquals("default", entry.getContext());
 		assertEquals("",entry.getDefaultValue());
-		assertEquals("ICE Entry", entry.getDescription());
+		assertEquals("January Entry", entry.getDescription());
 		assertEquals(1, entry.getId());
 		assertEquals("", entry.getComment());
 		assertEquals("", entry.getTag());
@@ -214,7 +214,7 @@ public void checkXMLPersistence() {
 
 		// Local declarations
 		TestableAbstractEntry entry2;
-		ICEJAXBHandler xmlHandler = new ICEJAXBHandler();
+		JanuaryJAXBHandler xmlHandler = new JanuaryJAXBHandler();
 		ArrayList<Class> classList = new ArrayList<Class>();
 		classList.add(TestableAbstractEntry.class);
 

diff --git a/...res/entry/test/ContinuousEntryTester.java → ...res/entry/test/ContinuousEntryTester.java b/...res/entry/test/ContinuousEntryTester.java → ...res/entry/test/ContinuousEntryTester.java
@@ -11,7 +11,7 @@
  *    Claire Saunders, Matthew Wang, Anna Wojtowicz
  *     
  *******************************************************************************/
-package org.eclipse.ice.datastructures.entry.test;
+package org.eclipse.january.datastructures.entry.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

diff --git a/...tures/entry/test/DiscreteEntryTester.java → ...tures/entry/test/DiscreteEntryTester.java b/...tures/entry/test/DiscreteEntryTester.java → ...tures/entry/test/DiscreteEntryTester.java
@@ -11,7 +11,7 @@
  *    Claire Saunders, Matthew Wang, Anna Wojtowicz
  *     
  *******************************************************************************/
-package org.eclipse.ice.datastructures.entry.test;
+package org.eclipse.january.datastructures.entry.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -28,7 +28,7 @@
 import javax.xml.bind.JAXBException;
 
 import org.eclipse.january.form.DiscreteEntry;
-import org.eclipse.january.form.ICEJAXBHandler;
+import org.eclipse.january.form.JanuaryJAXBHandler;
 import org.junit.Test;
 
 /**
@@ -214,7 +214,7 @@ public void checkXMLPersistence() {
 		List<String> allowed = new ArrayList<String>();
 		allowed.add("true");
 		allowed.add("false");
-		ICEJAXBHandler xmlHandler = new ICEJAXBHandler();
+		JanuaryJAXBHandler xmlHandler = new JanuaryJAXBHandler();
 		ArrayList<Class> classList = new ArrayList<Class>();
 		classList.add(DiscreteEntry.class);
 

diff --git a/...tructures/entry/test/FileEntryTester.java → ...tructures/entry/test/FileEntryTester.java b/...tructures/entry/test/FileEntryTester.java → ...tructures/entry/test/FileEntryTester.java
@@ -11,7 +11,7 @@
  *    Claire Saunders, Matthew Wang, Anna Wojtowicz
  *
  *******************************************************************************/
-package org.eclipse.ice.datastructures.entry.test;
+package org.eclipse.january.datastructures.entry.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -35,7 +35,7 @@
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.january.form.FileEntry;
-import org.eclipse.january.form.ICEJAXBHandler;
+import org.eclipse.january.form.JanuaryJAXBHandler;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -278,7 +278,7 @@ public void checkXMLPersistence() {
 
 		// Local declarations
 		FileEntry entry2;
-		ICEJAXBHandler xmlHandler = new ICEJAXBHandler();
+		JanuaryJAXBHandler xmlHandler = new JanuaryJAXBHandler();
 		ArrayList<Class> classList = new ArrayList<Class>();
 		classList.add(FileEntry.class);
 

diff --git a/...uctures/entry/test/StringEntryTester.java → ...uctures/entry/test/StringEntryTester.java b/...uctures/entry/test/StringEntryTester.java → ...uctures/entry/test/StringEntryTester.java
@@ -11,7 +11,7 @@
  *    Claire Saunders, Matthew Wang, Anna Wojtowicz
  *     
  *******************************************************************************/
-package org.eclipse.ice.datastructures.entry.test;
+package org.eclipse.january.datastructures.entry.test;
 
 import static org.junit.Assert.assertTrue;
 

diff --git a/...res/entry/test/TestableAbstractEntry.java → ...res/entry/test/TestableAbstractEntry.java b/...res/entry/test/TestableAbstractEntry.java → ...res/entry/test/TestableAbstractEntry.java
@@ -11,7 +11,7 @@
  *    Claire Saunders, Matthew Wang, Anna Wojtowicz
  *     
  *******************************************************************************/
-package org.eclipse.ice.datastructures.entry.test;
+package org.eclipse.january.datastructures.entry.test;
 
 import java.util.List;
 
@@ -73,7 +73,7 @@ public void setAllowedValues(List<String> values) {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.ice.datastructures.entry.AbstractEntry#update(org.eclipse.ice.datastructures.ICEObject.IUpdateable)
+	 * @see org.eclipse.ice.datastructures.entry.AbstractEntry#update(org.eclipse.ice.datastructures.JanuaryObject.IUpdateable)
 	 */
 	@Override
 	public void update(IUpdateable component) {

diff --git a/...res/test/AdaptiveTreeCompositeTester.java → ...res/test/AdaptiveTreeCompositeTester.java b/...res/test/AdaptiveTreeCompositeTester.java → ...res/test/AdaptiveTreeCompositeTester.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.datastructures.test;
+package org.eclipse.january.datastructures.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -26,7 +26,7 @@
 import javax.xml.bind.JAXBException;
 
 import org.eclipse.january.form.AdaptiveTreeComposite;
-import org.eclipse.january.form.ICEJAXBHandler;
+import org.eclipse.january.form.JanuaryJAXBHandler;
 import org.eclipse.january.form.IUpdateable;
 import org.eclipse.january.form.SelectiveComponentVisitor;
 import org.eclipse.january.form.TreeComposite;
@@ -321,7 +321,7 @@ public void checkLoadingFromXML() throws NullPointerException, JAXBException, IO
 		ArrayList<TreeComposite> typesList;
 		ByteArrayOutputStream outputStream;
 		ByteArrayInputStream inputStream;
-		ICEJAXBHandler xmlHandler = new ICEJAXBHandler();
+		JanuaryJAXBHandler xmlHandler = new JanuaryJAXBHandler();
 		ArrayList<Class> classList = new ArrayList<Class>();
 		classList.add(AdaptiveTreeComposite.class);
 

diff --git a/...uctures/test/BasicVisitHandlerTester.java → ...uctures/test/BasicVisitHandlerTester.java b/...uctures/test/BasicVisitHandlerTester.java → ...uctures/test/BasicVisitHandlerTester.java
@@ -9,7 +9,7 @@
  *   Initial API and implementation and/or initial documentation - 
  *   Jay Jay Billings
  *******************************************************************************/
-package org.eclipse.ice.datastructures.test;
+package org.eclipse.january.datastructures.test;
 
 import static org.junit.Assert.*;
 

diff --git a/...astructures/test/DataComponentTester.java → ...astructures/test/DataComponentTester.java b/...astructures/test/DataComponentTester.java → ...astructures/test/DataComponentTester.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.datastructures.test;
+package org.eclipse.january.datastructures.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -27,7 +27,7 @@
 import javax.xml.bind.JAXBException;
 
 import org.eclipse.january.form.DataComponent;
-import org.eclipse.january.form.ICEJAXBHandler;
+import org.eclipse.january.form.JanuaryJAXBHandler;
 import org.eclipse.january.form.IEntry;
 import org.eclipse.january.form.StringEntry;
 import org.junit.Test;
@@ -68,7 +68,7 @@ public class DataComponentTester {
 	/**
 	 * <p>
 	 * This operation tests the construction of the DataComponent class and the
-	 * functionality inherited from ICEObject.
+	 * functionality inherited from JanuaryObject.
 	 * </p>
 	 */
 	@Test
@@ -408,7 +408,7 @@ public void checkEquality() {
 			unEqualComponent.addEntry(entries.get(i));
 		}
 
-		// Set ICEObject data
+		// Set JanuaryObject data
 		component.setId(1);
 		equalComponent.setId(1);
 		transitiveComponent.setId(1);
@@ -572,7 +572,7 @@ public void checkLoadingFromXML() throws NullPointerException, JAXBException, IO
 		String name = "September 1st 2011";
 		String description = "The 1st day of the ninth month in the year of "
 				+ "our Lord 2011";
-		ICEJAXBHandler xmlHandler = new ICEJAXBHandler();
+		JanuaryJAXBHandler xmlHandler = new JanuaryJAXBHandler();
 		ArrayList<Class> classList = new ArrayList<Class>();
 		classList.add(DataComponent.class);
 		classList.add(StringEntry.class);

diff --git a/...tastructures/test/EMFComponentTester.java → ...tastructures/test/EMFComponentTester.java b/...tastructures/test/EMFComponentTester.java → ...tastructures/test/EMFComponentTester.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.datastructures.test;
+package org.eclipse.january.datastructures.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -33,7 +33,7 @@
 
 import org.eclipse.january.form.BreadthFirstTreeCompositeIterator;
 import org.eclipse.january.form.DataComponent;
-import org.eclipse.january.form.ICEJAXBHandler;
+import org.eclipse.january.form.JanuaryJAXBHandler;
 import org.eclipse.january.form.TreeComposite;
 import org.eclipse.january.form.emf.EMFComponent;
 import org.eclipse.january.form.emf.EMFTreeComposite;
@@ -385,7 +385,7 @@ public void checkEquality() {
 		EMFComponent transitiveComponent = new EMFComponent(
 				new File(filePath1));
 
-		// Set ICEObject data
+		// Set JanuaryObject data
 		component.setId(1);
 		equalComponent.setId(1);
 		transitiveComponent.setId(1);
@@ -477,13 +477,13 @@ public void checkLoadingFromXML()
 		int id = 5;
 		String name = "Bob";
 		String description = "I am Bob! 1.0";
-		ICEJAXBHandler xmlHandler = new ICEJAXBHandler();
+		JanuaryJAXBHandler xmlHandler = new JanuaryJAXBHandler();
 		ArrayList<Class> classList = new ArrayList<Class>();
 		classList.add(EMFComponent.class);
 
 		emfComponent = new EMFComponent();
 
-		// set ICEObject info
+		// set JanuaryObject info
 		emfComponent.setId(id);
 		emfComponent.setName(name);
 		emfComponent.setDescription(description);

diff --git a/...e/datastructures/test/EMFEntryTester.java → ...y/datastructures/test/EMFEntryTester.java b/...e/datastructures/test/EMFEntryTester.java → ...y/datastructures/test/EMFEntryTester.java
@@ -9,7 +9,7 @@
  *    Alex McCaskey (UT-Battelle, LLC.) - initial API and implementation and/or initial documentation
  *   Jay Jay Billings (UT-Battelle, LLC.) - modified to use ICETests directory
  *******************************************************************************/
-package org.eclipse.ice.datastructures.test;
+package org.eclipse.january.datastructures.test;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

diff --git a/...ructures/test/EMFTreeCompositeTester.java → ...ructures/test/EMFTreeCompositeTester.java b/...ructures/test/EMFTreeCompositeTester.java → ...ructures/test/EMFTreeCompositeTester.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.datastructures.test;
+package org.eclipse.january.datastructures.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

diff --git a/...tructures/test/FakeJAXBClassProvider.java → ...tructures/test/FakeJAXBClassProvider.java b/...tructures/test/FakeJAXBClassProvider.java → ...tructures/test/FakeJAXBClassProvider.java
@@ -9,7 +9,7 @@
  *   Initial API and implementation and/or initial documentation -
  *   Jay Jay Billings
  *******************************************************************************/
-package org.eclipse.ice.datastructures.test;
+package org.eclipse.january.datastructures.test;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...e/ice/datastructures/test/FormTester.java → ...nuary/datastructures/test/FormTester.java b/...e/ice/datastructures/test/FormTester.java → ...nuary/datastructures/test/FormTester.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.datastructures.test;
+package org.eclipse.january.datastructures.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -29,9 +29,9 @@
 import org.eclipse.january.form.Component;
 import org.eclipse.january.form.DataComponent;
 import org.eclipse.january.form.Form;
-import org.eclipse.january.form.ICEJAXBClassProvider;
-import org.eclipse.january.form.ICEJAXBHandler;
-import org.eclipse.january.form.ICEResource;
+import org.eclipse.january.form.JanuaryJAXBClassProvider;
+import org.eclipse.january.form.JanuaryJAXBHandler;
+import org.eclipse.january.form.JanuaryResource;
 import org.eclipse.january.form.IEntry;
 import org.eclipse.january.form.ResourceComponent;
 import org.eclipse.january.form.StringEntry;
@@ -64,7 +64,7 @@ public class FormTester {
 
 	/**
 	 * This operation tests the Form by calling the constructor and checking the
-	 * getters and setters for the operations inherited from ICEObject.
+	 * getters and setters for the operations inherited from JanuaryObject.
 	 */
 	@Test
 	public void checkCreation() {
@@ -269,19 +269,19 @@ public void checkEquality() {
 		transitiveForm.setItemID(1);
 		unEqualForm.setItemID(2);
 
-		// Set Form ICEObject IDs
+		// Set Form JanuaryObject IDs
 		form.setId(22);
 		equalForm.setId(22);
 		transitiveForm.setId(22);
 		unEqualForm.setId(23);
 
-		// Set Form ICEObject Names
+		// Set Form JanuaryObject Names
 		form.setName("Form for Equals");
 		equalForm.setName("Form for Equals");
 		transitiveForm.setName("Form for Equals");
 		unEqualForm.setName("UnEqual Form");
 
-		// Set Form ICEObject descriptions
+		// Set Form JanuaryObject descriptions
 		form.setDescription("This is a Form");
 		equalForm.setDescription("This is a Form");
 		transitiveForm.setDescription("This is a Form");
@@ -519,11 +519,11 @@ public void checkXMLPersistence() throws NullPointerException, JAXBException, IO
 		// Local declarations
 		Form form, loadedForm = null;
 		ArrayList<String> actionList = new ArrayList<String>();
-		ICEJAXBHandler xmlHandler = new ICEJAXBHandler();
+		JanuaryJAXBHandler xmlHandler = new JanuaryJAXBHandler();
 		ArrayList<Class> classList = new ArrayList<Class>();
 
 		// Inform the JAXBContext of all relevant classes.
-		classList.addAll(new ICEJAXBClassProvider().getClasses());
+		classList.addAll(new JanuaryJAXBClassProvider().getClasses());
 
 		DataComponent dataComponent = new DataComponent();
 		DataComponent dataComponent2 = new DataComponent();
@@ -532,7 +532,7 @@ public void checkXMLPersistence() throws NullPointerException, JAXBException, IO
 		IEntry entry3 = new StringEntry();
 		IEntry entry4 = new StringEntry();
 
-		ArrayList<ICEResource> resources = new ArrayList<ICEResource>();
+		ArrayList<JanuaryResource> resources = new ArrayList<JanuaryResource>();
 
 		// Fill up actionList
 		actionList.add("Robots in Disguise");
@@ -595,16 +595,16 @@ public void checkXMLPersistence() throws NullPointerException, JAXBException, IO
 		// Create five test resources - this one themed after places where Bones
 		// lived
 		try {
-			resources.add(new ICEResource(file));
-			resources.add(new ICEResource(file2));
-			resources.add(new ICEResource(file3));
+			resources.add(new JanuaryResource(file));
+			resources.add(new JanuaryResource(file2));
+			resources.add(new JanuaryResource(file3));
 		} catch (Exception e) {
 			e.printStackTrace();
 			fail();
 		}
 
 		// Add the Resources to the ResourceComponent
-		for (ICEResource i : resources) {
+		for (JanuaryResource i : resources) {
 			outputComp.addResource(i);
 		}