Merge pull request #5 to fix #4 from SmithRWORNL/master

Cleaned up code
eclipse-january · May 25, 2017 · a4bf4cb · a4bf4cb
2 parents 46bc60b + 92d0909
commit a4bf4cb
Show file tree

Hide file tree

Showing 56 changed files with 709 additions and 522 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.project b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>january-local2</name>
+	<name>january-forms-root</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/org.eclipse.january.form.feature/pom.xml b/org.eclipse.january.form.feature/pom.xml
@@ -16,9 +16,9 @@
 	<artifactId>org.eclipse.january.form.feature</artifactId>
 	<version>2.1.0-SNAPSHOT</version>
 	<parent>
-		<relativePath>../releng/org.eclipse.january.releng/pom.xml</relativePath>
+		<relativePath>../releng/org.eclipse.january.forms.releng/pom.xml</relativePath>
 		<groupId>org.eclipse.january</groupId>
-		<artifactId>org.eclipse.january.releng</artifactId>
+		<artifactId>org.eclipse.january.forms.releng</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<packaging>eclipse-feature</packaging>

diff --git a/org.eclipse.january.form.test/pom.xml b/org.eclipse.january.form.test/pom.xml
@@ -16,9 +16,9 @@
 	<artifactId>org.eclipse.january.form.test</artifactId>
 	<version>2.1.0-SNAPSHOT</version>
 	<parent>
-		<relativePath>../releng/org.eclipse.january.releng/pom.xml</relativePath>
+		<relativePath>../releng/org.eclipse.january.forms.releng/pom.xml</relativePath>
 		<groupId>org.eclipse.january</groupId>
-		<artifactId>org.eclipse.january.releng</artifactId>
+		<artifactId>org.eclipse.january.forms.releng</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<packaging>eclipse-test-plugin</packaging>

diff --git a/...ry.form.test/src/org/eclipse/january/datastructures/entry/test/TestableAbstractEntry.java b/...ry.form.test/src/org/eclipse/january/datastructures/entry/test/TestableAbstractEntry.java
@@ -35,7 +35,8 @@ public class TestableAbstractEntry extends AbstractEntry {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.ice.datastructures.entry.AbstractEntry#clone()
+	 * 
+	 * @see org.eclipse.january.form.AbstractEntry#clone()
 	 */
 	@Override
 	public Object clone() {
@@ -44,7 +45,8 @@ public Object clone() {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.ice.datastructures.entry.AbstractEntry#setValue(java.lang.String[])
+	 * 
+	 * @see org.eclipse.january.form.AbstractEntry#setValue(java.lang.String[])
 	 */
 	@Override
 	public boolean setValue(String... values) {
@@ -53,7 +55,8 @@ public boolean setValue(String... values) {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.ice.datastructures.entry.AbstractEntry#getAllowedValues()
+	 * 
+	 * @see org.eclipse.january.form.AbstractEntry#getAllowedValues()
 	 */
 	@Override
 	public List<String> getAllowedValues() {
@@ -63,34 +66,50 @@ public List<String> getAllowedValues() {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.ice.datastructures.entry.AbstractEntry#setAllowedValues(java.util.List)
+	 * 
+	 * @see
+	 * org.eclipse.january.form.AbstractEntry#setAllowedValues(java.util.List)
 	 */
 	@Override
 	public void setAllowedValues(List<String> values) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.ice.datastructures.entry.AbstractEntry#update(org.eclipse.ice.datastructures.JanuaryObject.IUpdateable)
+	 * 
+	 * @see
+	 * org.eclipse.january.form.AbstractEntry#update(org.eclipse.january.form.
+	 * IUpdateable)
 	 */
 	@Override
 	public void update(IUpdateable component) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.january.form.AbstractEntry#getValues()
+	 */
 	@Override
 	public String[] getValues() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.january.form.IEntry#accept(org.eclipse.january.form.
+	 * IEntryVisitor)
+	 */
 	@Override
 	public void accept(IEntryVisitor visitor) {
 		// TODO Auto-generated method stub
-		
+
 	}
-	
+
 }
diff --git a/....january.form.test/src/org/eclipse/january/datastructures/test/FakeJAXBClassProvider.java b/....january.form.test/src/org/eclipse/january/datastructures/test/FakeJAXBClassProvider.java
@@ -27,9 +27,8 @@ public class FakeJAXBClassProvider implements IJAXBClassProvider {
 
 	/*
 	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ice.datastructures.jaxbclassprovider.IJAXBClassProvider#
-	 * getClasses()
+	 * 
+	 * @see org.eclipse.january.form.IJAXBClassProvider#getClasses()
 	 */
 	@Override
 	public List<Class> getClasses() {
@@ -40,9 +39,8 @@ public List<Class> getClasses() {
 
 	/*
 	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ice.datastructures.jaxbclassprovider.IJAXBClassProvider#
-	 * getProviderName()
+	 * 
+	 * @see org.eclipse.january.form.IJAXBClassProvider#getProviderName()
 	 */
 	@Override
 	public String getProviderName() {

diff --git a/...nuary.form.test/src/org/eclipse/january/datastructures/test/IJAXBClassProviderTester.java b/...nuary.form.test/src/org/eclipse/january/datastructures/test/IJAXBClassProviderTester.java
@@ -36,9 +36,7 @@
 public class IJAXBClassProviderTester {
 
 	/**
-	 * Test for
-	 * {@link org.eclipse.january.form.IJAXBClassProvider}
-	 * .
+	 * Test for {@link org.eclipse.january.form.IJAXBClassProvider} .
 	 *
 	 * @throws CoreException
 	 * @throws BundleException
@@ -53,7 +51,7 @@ public void test() throws CoreException, BundleException,
 			ClassNotFoundException, URISyntaxException, FileNotFoundException {
 
 		IJAXBClassProvider[] jaxbProviders = null;
-		String id = "org.eclipse.ice.datastructures.jaxbClassProvider";
+		String id = "org.eclipse.january.datastructures.jaxbClassProvider";
 		IExtensionPoint point = Platform.getExtensionRegistry()
 				.getExtensionPoint(id);
 

diff --git a/...se.january.form.test/src/org/eclipse/january/datastructures/test/ListComponentTester.java b/...se.january.form.test/src/org/eclipse/january/datastructures/test/ListComponentTester.java
@@ -26,10 +26,10 @@
 
 import javax.xml.bind.JAXBException;
 
+import org.eclipse.january.form.IElementSource;
 import org.eclipse.january.form.JanuaryJAXBHandler;
 import org.eclipse.january.form.JanuaryObject;
 import org.eclipse.january.form.JanuaryResource;
-import org.eclipse.january.form.IElementSource;
 import org.eclipse.january.form.ListComponent;
 import org.eclipse.january.form.SelectiveComponentVisitor;
 import org.eclipse.january.form.VizResource;
@@ -544,8 +544,7 @@ public void checkTableFormat() {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.ice.datastructures.JanuaryObject.IElementSource#getElements()
+	 * @see org.eclipse.january.form.IElementSource#getElements()
 	 */
 	@Override
 	public EventList<Integer> getElements() {
@@ -555,8 +554,7 @@ public EventList<Integer> getElements() {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.ice.datastructures.JanuaryObject.IElementSource#getTableFormat()
+	 * @see org.eclipse.january.form.IElementSource#getTableFormat()
 	 */
 	@Override
 	public TableFormat<Integer> getTableFormat() {

diff --git a/org.eclipse.january.form/pom.xml b/org.eclipse.january.form/pom.xml
@@ -15,9 +15,9 @@
 	<artifactId>org.eclipse.january.form</artifactId>
 	<version>2.1.0-SNAPSHOT</version>
 	<parent>
-		<relativePath>../releng/org.eclipse.january.releng/pom.xml</relativePath>
+		<relativePath>../releng/org.eclipse.january.forms.releng/pom.xml</relativePath>
 		<groupId>org.eclipse.january</groupId>
-		<artifactId>org.eclipse.january.releng</artifactId>
+		<artifactId>org.eclipse.january.forms.releng</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<packaging>eclipse-plugin</packaging>