diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index f44a1c01..00000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.project b/.project index e7601bd3..28684245 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - january-local2 + january-forms-root diff --git a/org.eclipse.january.form.feature/pom.xml b/org.eclipse.january.form.feature/pom.xml index e5ff0672..c840d58e 100644 --- a/org.eclipse.january.form.feature/pom.xml +++ b/org.eclipse.january.form.feature/pom.xml @@ -16,9 +16,9 @@ org.eclipse.january.form.feature 2.1.0-SNAPSHOT - ../releng/org.eclipse.january.releng/pom.xml + ../releng/org.eclipse.january.forms.releng/pom.xml org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT eclipse-feature diff --git a/org.eclipse.january.form.test/pom.xml b/org.eclipse.january.form.test/pom.xml index b600bd1c..34fa6696 100644 --- a/org.eclipse.january.form.test/pom.xml +++ b/org.eclipse.january.form.test/pom.xml @@ -16,9 +16,9 @@ org.eclipse.january.form.test 2.1.0-SNAPSHOT - ../releng/org.eclipse.january.releng/pom.xml + ../releng/org.eclipse.january.forms.releng/pom.xml org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT eclipse-test-plugin diff --git a/org.eclipse.january.form.test/src/org/eclipse/january/datastructures/entry/test/TestableAbstractEntry.java b/org.eclipse.january.form.test/src/org/eclipse/january/datastructures/entry/test/TestableAbstractEntry.java index c5b9076e..6dfa5015 100644 --- a/org.eclipse.january.form.test/src/org/eclipse/january/datastructures/entry/test/TestableAbstractEntry.java +++ b/org.eclipse.january.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 getAllowedValues() { @@ -63,34 +66,50 @@ public List 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 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/org.eclipse.january.form.test/src/org/eclipse/january/datastructures/test/FakeJAXBClassProvider.java b/org.eclipse.january.form.test/src/org/eclipse/january/datastructures/test/FakeJAXBClassProvider.java index aa0193c5..1d4c21b4 100644 --- a/org.eclipse.january.form.test/src/org/eclipse/january/datastructures/test/FakeJAXBClassProvider.java +++ b/org.eclipse.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 getClasses() { @@ -40,9 +39,8 @@ public List 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/org.eclipse.january.form.test/src/org/eclipse/january/datastructures/test/IJAXBClassProviderTester.java b/org.eclipse.january.form.test/src/org/eclipse/january/datastructures/test/IJAXBClassProviderTester.java index 6b69f5e6..55b0db27 100644 --- a/org.eclipse.january.form.test/src/org/eclipse/january/datastructures/test/IJAXBClassProviderTester.java +++ b/org.eclipse.january.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/org.eclipse.january.form.test/src/org/eclipse/january/datastructures/test/ListComponentTester.java b/org.eclipse.january.form.test/src/org/eclipse/january/datastructures/test/ListComponentTester.java index dd2f2e2c..3bcd233c 100644 --- a/org.eclipse.january.form.test/src/org/eclipse/january/datastructures/test/ListComponentTester.java +++ b/org.eclipse.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 getElements() { @@ -555,8 +554,7 @@ public EventList getElements() { /* * (non-Javadoc) * - * @see - * org.eclipse.ice.datastructures.JanuaryObject.IElementSource#getTableFormat() + * @see org.eclipse.january.form.IElementSource#getTableFormat() */ @Override public TableFormat getTableFormat() { diff --git a/org.eclipse.january.form/pom.xml b/org.eclipse.january.form/pom.xml index f1003852..cd4725d8 100644 --- a/org.eclipse.january.form/pom.xml +++ b/org.eclipse.january.form/pom.xml @@ -15,9 +15,9 @@ org.eclipse.january.form 2.1.0-SNAPSHOT - ../releng/org.eclipse.january.releng/pom.xml + ../releng/org.eclipse.january.forms.releng/pom.xml org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT eclipse-plugin diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/AbstractEntry.java b/org.eclipse.january.form/src/org/eclipse/january/form/AbstractEntry.java index 691bbf04..12cc2b86 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/AbstractEntry.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/AbstractEntry.java @@ -57,9 +57,9 @@ public abstract class AbstractEntry implements IEntry { */ protected String objectName; /** - * The description of the JanuaryObject. This description should be different - * than the name of the JanuaryObject and should contain information that would - * be useful to a human user. + * The description of the JanuaryObject. This description should be + * different than the name of the JanuaryObject and should contain + * information that would be useful to a human user. * */ protected String objectDescription; @@ -142,7 +142,7 @@ public abstract class AbstractEntry implements IEntry { */ @XmlAttribute() protected boolean isSecret = false; - + /** * The Constructor * @@ -277,8 +277,8 @@ public void copy(AbstractEntry entity) { /** *

- * This protected operation notifies the listeners of the JanuaryObject that its - * state has changed. + * This protected operation notifies the listeners of the JanuaryObject that + * its state has changed. *

* */ @@ -311,7 +311,7 @@ public void run() { *

* * @return - *

+ *

* The new clone. *

*/ @@ -340,18 +340,27 @@ public boolean equals(Object otherObject) { castedOtherObject = (AbstractEntry) otherObject; // Check each member attribute retVal = (this.uniqueId == castedOtherObject.uniqueId) - && (this.objectName.equals(castedOtherObject.objectName)) - && (this.objectDescription.equals(castedOtherObject.objectDescription) - && (defaultValue != null ? this.defaultValue.equals(castedOtherObject.defaultValue) + && (this.objectName + .equals(castedOtherObject.objectName)) + && (this.objectDescription + .equals(castedOtherObject.objectDescription) + && (defaultValue != null + ? this.defaultValue.equals( + castedOtherObject.defaultValue) : castedOtherObject.defaultValue == null) - && (tag != null ? this.tag.equals(castedOtherObject.tag) + && (tag != null + ? this.tag.equals(castedOtherObject.tag) : castedOtherObject.tag == null) - && (comment != null ? this.comment.equals(castedOtherObject.comment) + && (comment != null + ? this.comment.equals( + castedOtherObject.comment) : castedOtherObject.comment == null) && (this.isReady == castedOtherObject.isReady) && (this.isModified == castedOtherObject.isModified) && (this.isRequired == castedOtherObject.isRequired) - && (contextId != null ? this.contextId.equals(castedOtherObject.contextId) + && (contextId != null + ? this.contextId.equals( + castedOtherObject.contextId) : castedOtherObject.contextId == null)); } } @@ -374,7 +383,8 @@ public int hashCode() { hash = 31 * hash + uniqueId; // If objectName is null, add 0, otherwise add String.hashcode() hash = 31 * hash + (null == objectName ? 0 : objectName.hashCode()); - hash = 31 * hash + (null == objectDescription ? 0 : objectDescription.hashCode()); + hash = 31 * hash + (null == objectDescription ? 0 + : objectDescription.hashCode()); hash = 31 * hash + (null == defaultValue ? 0 : defaultValue.hashCode()); hash = 31 * hash + (null == comment ? 0 : comment.hashCode()); hash = 31 * hash + (null == tag ? 0 : tag.hashCode()); @@ -436,15 +446,14 @@ public void unregister(IUpdateableListener listener) { /* * (non-Javadoc) * - * @see - * org.eclipse.ice.datastructures.entry.IEntry#setValue(java.lang.String) + * @see org.eclipse.january.form.IEntry#setValue(java.lang.String) */ @Override public boolean setValue(String newValue) { if (value != null && value.equals(newValue)) { return true; } - + if (newValue != null) { this.value = newValue; isModified = true; @@ -458,8 +467,7 @@ public boolean setValue(String newValue) { /* * (non-Javadoc) * - * @see - * org.eclipse.ice.datastructures.entry.IEntry#setValue(java.lang.String[]) + * @see org.eclipse.january.form.IEntry#setValue(java.lang.String[]) */ @Override public abstract boolean setValue(String... values); @@ -467,7 +475,7 @@ public boolean setValue(String newValue) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#getValue() + * @see org.eclipse.january.form.IEntry#getValue() */ @Override public String getValue() { @@ -477,7 +485,7 @@ public String getValue() { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#getValue(int) + * @see org.eclipse.january.form.IEntry#getValue(int) */ @Override public String getValue(int index) { @@ -487,7 +495,7 @@ public String getValue(int index) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#getValues() + * @see org.eclipse.january.form.IEntry#getValues() */ @Override public abstract String[] getValues(); @@ -495,7 +503,7 @@ public String getValue(int index) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#getDefaultValue() + * @see org.eclipse.january.form.IEntry#getDefaultValue() */ @Override public String getDefaultValue() { @@ -505,9 +513,7 @@ public String getDefaultValue() { /* * (non-Javadoc) * - * @see - * org.eclipse.ice.datastructures.entry.IEntry#setDefaultValue(java.lang. - * String) + * @see org.eclipse.january.form.IEntry#setDefaultValue(java.lang.String) */ @Override public void setDefaultValue(String value) { @@ -520,7 +526,7 @@ public void setDefaultValue(String value) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#getAllowedValues() + * @see org.eclipse.january.form.IEntry#getAllowedValues() */ @Override public abstract List getAllowedValues(); @@ -528,9 +534,7 @@ public void setDefaultValue(String value) { /* * (non-Javadoc) * - * @see - * org.eclipse.ice.datastructures.entry.IEntry#setAllowedValues(java.util. - * List) + * @see org.eclipse.january.form.IEntry#setAllowedValues(java.util.List) */ @Override public abstract void setAllowedValues(List values); @@ -538,7 +542,7 @@ public void setDefaultValue(String value) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#getComment() + * @see org.eclipse.january.form.IEntry#getComment() */ @Override public String getComment() { @@ -548,8 +552,7 @@ public String getComment() { /* * (non-Javadoc) * - * @see - * org.eclipse.ice.datastructures.entry.IEntry#setComment(java.lang.String) + * @see org.eclipse.january.form.IEntry#setComment(java.lang.String) */ @Override public void setComment(String comment) { @@ -559,7 +562,7 @@ public void setComment(String comment) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#getTag() + * @see org.eclipse.january.form.IEntry#getTag() */ @Override public String getTag() { @@ -569,7 +572,7 @@ public String getTag() { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#setTag(java.lang.String) + * @see org.eclipse.january.form.IEntry#setTag(java.lang.String) */ @Override public void setTag(String tag) { @@ -579,7 +582,7 @@ public void setTag(String tag) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#isReady() + * @see org.eclipse.january.form.IEntry#isReady() */ @Override public boolean isReady() { @@ -589,7 +592,7 @@ public boolean isReady() { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#isRequired() + * @see org.eclipse.january.form.IEntry#isRequired() */ @Override public boolean isRequired() { @@ -599,8 +602,9 @@ public boolean isRequired() { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#setReady(boolean) + * @see org.eclipse.january.form.IEntry#setReady(boolean) */ + @Override public void setReady(boolean ready) { isReady = ready; } @@ -608,8 +612,9 @@ public void setReady(boolean ready) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#setRequired(boolean) + * @see org.eclipse.january.form.IEntry#setRequired(boolean) */ + @Override public void setRequired(boolean required) { isRequired = required; } @@ -617,7 +622,7 @@ public void setRequired(boolean required) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#isModified() + * @see org.eclipse.january.form.IEntry#isModified() */ @Override public boolean isModified() { @@ -626,28 +631,30 @@ public boolean isModified() { /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.entry.IEntry#isSecret() + * + * @see org.eclipse.january.form.IEntry#isSecret() */ @Override public boolean isSecret() { return isSecret; } - + /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.entry.IEntry#setSecret(boolean) + * + * @see org.eclipse.january.form.IEntry#setSecret(boolean) */ @Override public void setSecret(boolean secret) { isSecret = secret; } - + /* * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.JanuaryObject.IUpdateableListener#update(org. - * eclipse.ice.datastructures.JanuaryObject.IUpdateable) + * org.eclipse.january.form.IUpdateableListener#update(org.eclipse.january. + * form.IUpdateable) */ @Override public abstract void update(IUpdateable component); @@ -655,7 +662,7 @@ public void setSecret(boolean secret) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#getContextId() + * @see org.eclipse.january.form.Identifiable#getContext() */ @Override public String getContext() { @@ -665,8 +672,7 @@ public String getContext() { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#setContextId(java.lang. - * String) + * @see org.eclipse.january.form.Identifiable#setContext(java.lang.String) */ @Override public void setContext(String id) { @@ -675,7 +681,8 @@ public void setContext(String id) { /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.entry.IEntry#getErrorMessage() + * + * @see org.eclipse.january.form.IEntry#getErrorMessage() */ @Override public String getErrorMessage() { diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/BreadthFirstTreeCompositeIterator.java b/org.eclipse.january.form/src/org/eclipse/january/form/BreadthFirstTreeCompositeIterator.java index c5010591..96a7e0c3 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/BreadthFirstTreeCompositeIterator.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/BreadthFirstTreeCompositeIterator.java @@ -36,8 +36,8 @@ * @author Jordan H. Deyton * */ -public class BreadthFirstTreeCompositeIterator extends - AbstractTreeCompositeIterator { +public class BreadthFirstTreeCompositeIterator + extends AbstractTreeCompositeIterator { /** * A queue used to maintain state information about the position of the @@ -81,7 +81,7 @@ public BreadthFirstTreeCompositeIterator(TreeComposite root) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.form.TreeCompositeIterator#hasNext() + * @see org.eclipse.january.form.AbstractTreeCompositeIterator#hasNext() */ @Override public boolean hasNext() { @@ -91,7 +91,7 @@ public boolean hasNext() { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.form.TreeCompositeIterator#next() + * @see org.eclipse.january.form.AbstractTreeCompositeIterator#next() */ @Override public TreeComposite next() { diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/ContinuousEntry.java b/org.eclipse.january.form/src/org/eclipse/january/form/ContinuousEntry.java index 9336cfd3..911e8f85 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/ContinuousEntry.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/ContinuousEntry.java @@ -19,11 +19,11 @@ import javax.xml.bind.annotation.XmlTransient; /** - * The ContinuousEntry is a DiscreteEntry that requires clients - * to set exactly 2 allowed values: the lower bound and upper bound of a - * range of continuous values that this IEntry stores. For example, setting - * 0 and 5 as the allowed values for this IEntry will allow clients to set this - * IEntry's value to anything between 0 and 5. + * The ContinuousEntry is a DiscreteEntry that requires clients to set exactly 2 + * allowed values: the lower bound and upper bound of a range of continuous + * values that this IEntry stores. For example, setting 0 and 5 as the allowed + * values for this IEntry will allow clients to set this IEntry's value to + * anything between 0 and 5. * * @author Alex McCaskey * @@ -38,7 +38,8 @@ public class ContinuousEntry extends DiscreteEntry { */ @XmlTransient protected String continuousErrMsg = "'${incorrectValue}' is an " - + "unacceptable value. The value must be between ${lowerBound} " + "and ${upperBound}."; + + "unacceptable value. The value must be between ${lowerBound} " + + "and ${upperBound}."; /** * The constructor @@ -46,23 +47,26 @@ public class ContinuousEntry extends DiscreteEntry { public ContinuousEntry() { super(); } - + /** * Convenience constructor + * * @param allowed */ public ContinuousEntry(String... allowed) { super(allowed); if (allowed.length > 2) { - throw new IllegalArgumentException("ContinuousEntry must be constructed " - + "with exactly 2 allowed values: the lower and upper bound of " - + "the range."); + throw new IllegalArgumentException( + "ContinuousEntry must be constructed " + + "with exactly 2 allowed values: the lower and upper bound of " + + "the range."); } } - + /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.entry.DiscreteEntry#clone() + * + * @see org.eclipse.january.form.DiscreteEntry#clone() */ @Override public Object clone() { @@ -73,7 +77,8 @@ public Object clone() { /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.entry.DiscreteEntry#setValue(java.lang.String) + * + * @see org.eclipse.january.form.DiscreteEntry#setValue(java.lang.String) */ @Override public boolean setValue(String newValue) { @@ -90,40 +95,51 @@ public boolean setValue(String newValue) { } catch (NumberFormatException | NullPointerException e) { // Replace the default error values with the ones for this Entry String error = continuousErrMsg; - error = error.replace("${incorrectValue}", newValue != null ? newValue : "null"); - error = error.replace("${lowerBound}", getAllowedValues().get(0)); - error = error.replace("${upperBound}", getAllowedValues().get(1)); + error = error.replace("${incorrectValue}", + newValue != null ? newValue : "null"); + error = error.replace("${lowerBound}", + getAllowedValues().get(0)); + error = error.replace("${upperBound}", + getAllowedValues().get(1)); this.errorMessage = error; return false; } // Set the value if it is within the bounds if (newValueDouble != null - && (newValueDouble.compareTo(lowerBound) != -1 && newValueDouble.compareTo(upperBound) != 1)) { + && (newValueDouble.compareTo(lowerBound) != -1 + && newValueDouble.compareTo(upperBound) != 1)) { this.value = newValue; errorMessage = null; return true; } else { // Replace the default error values with the ones for this Entry String error = continuousErrMsg; - error = error.replace("${incorrectValue}", newValue != null ? newValue : "null"); - error = error.replace("${lowerBound}", getAllowedValues().get(0)); - error = error.replace("${upperBound}", getAllowedValues().get(1)); + error = error.replace("${incorrectValue}", + newValue != null ? newValue : "null"); + error = error.replace("${lowerBound}", + getAllowedValues().get(0)); + error = error.replace("${upperBound}", + getAllowedValues().get(1)); this.errorMessage = error; return false; } } - - logger.info("ContinuousEntry must be initialized with an allowedValue list of size 2: the lower bound at index 0 and the upper bound at index 1."); + + logger.info( + "ContinuousEntry must be initialized with an allowedValue list of size 2: the lower bound at index 0 and the upper bound at index 1."); return false; } - + /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.entry.DiscreteEntry#accept(org.eclipse.ice.datastructures.entry.IEntryVisitor) + * + * @see + * org.eclipse.january.form.DiscreteEntry#accept(org.eclipse.january.form. + * IEntryVisitor) */ @Override public void accept(IEntryVisitor visitor) { visitor.visit(this); } - + } diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/DiscreteEntry.java b/org.eclipse.january.form/src/org/eclipse/january/form/DiscreteEntry.java index 7b0b127f..ed18872d 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/DiscreteEntry.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/DiscreteEntry.java @@ -72,7 +72,7 @@ public DiscreteEntry(String... allowed) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.AbstractEntry#clone() + * @see org.eclipse.january.form.AbstractEntry#clone() */ @Override public Object clone() { @@ -84,23 +84,20 @@ 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) { - throw new UnsupportedOperationException( - "Discrete only supports " + "the storage of one String value, not many, selected from " - + "a list of allowed values. " + "Therefore, this operation is not supported."); + throw new UnsupportedOperationException("Discrete only supports " + + "the storage of one String value, not many, selected from " + + "a list of allowed values. " + + "Therefore, this operation is not supported."); } /* * (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 newValue) { @@ -129,7 +126,8 @@ public boolean setValue(String newValue) { } // Replace with correct errors - error = error.replace("${incorrectValue}", newValue != null ? newValue : "null"); + error = error.replace("${incorrectValue}", + newValue != null ? newValue : "null"); error = error.replace(" ${allowedValues}", tempValues); this.errorMessage = error; return false; @@ -138,8 +136,7 @@ public boolean setValue(String newValue) { /* * (non-Javadoc) * - * @see - * org.eclipse.ice.datastructures.entry.AbstractEntry#getAllowedValues() + * @see org.eclipse.january.form.AbstractEntry#getAllowedValues() */ @Override public List getAllowedValues() { @@ -150,8 +147,7 @@ public List getAllowedValues() { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.entry.AbstractEntry#setAllowedValues(java. - * util.List) + * org.eclipse.january.form.AbstractEntry#setAllowedValues(java.util.List) */ @Override public void setAllowedValues(List values) { @@ -165,8 +161,8 @@ public void setAllowedValues(List values) { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.entry.AbstractEntry#update(org.eclipse.ice - * .datastructures.JanuaryObject.IUpdateable) + * org.eclipse.january.form.AbstractEntry#update(org.eclipse.january.form. + * IUpdateable) */ @Override public void update(IUpdateable component) { @@ -176,13 +172,14 @@ public void update(IUpdateable component) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.AbstractEntry#getValues() + * @see org.eclipse.january.form.AbstractEntry#getValues() */ @Override public String[] getValues() { - throw new UnsupportedOperationException( - "Discrete only supports " + "the storage of one String value, not many, selected from " - + "a list of allowed values. " + "Therefore, this operation is not supported."); + throw new UnsupportedOperationException("Discrete only supports " + + "the storage of one String value, not many, selected from " + + "a list of allowed values. " + + "Therefore, this operation is not supported."); } @@ -228,7 +225,7 @@ public void copy(DiscreteEntry entity) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.AbstractEntry#hashCode() + * @see org.eclipse.january.form.AbstractEntry#hashCode() */ @Override public int hashCode() { @@ -248,8 +245,8 @@ public int hashCode() { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.IEntry#accept(org.eclipse.ice. - * datastructures.entry.IEntryVisitor) + * @see org.eclipse.january.form.IEntry#accept(org.eclipse.january.form. + * IEntryVisitor) */ @Override public void accept(IEntryVisitor visitor) { diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/ExecutableEntry.java b/org.eclipse.january.form/src/org/eclipse/january/form/ExecutableEntry.java index 1bf6040f..81cf4504 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/ExecutableEntry.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/ExecutableEntry.java @@ -40,7 +40,7 @@ public class ExecutableEntry extends DiscreteEntry { private URI executableUri; /** - * A mapping holding allowed values to their URI counterparts. + * A mapping holding allowed values to their URI counterparts. */ private HashMap allowedValueToURI; @@ -51,9 +51,9 @@ public ExecutableEntry() { super(); allowedValueToURI = new HashMap(); } - + /** - * The constructor for discrete allowed values. + * The constructor for discrete allowed values. * * @param allowed */ @@ -64,12 +64,14 @@ public ExecutableEntry(String... allowed) { /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.entry.DiscreteEntry#setValue(java.lang.String[]) + * + * @see org.eclipse.january.form.DiscreteEntry#setValue(java.lang.String[]) */ @Override public boolean setValue(String... newValues) { URI uri = null; - if (newValues.length == 2 && (uri = URI.create(newValues[1])) != null && setValue(newValues[0])) { + if (newValues.length == 2 && (uri = URI.create(newValues[1])) != null + && setValue(newValues[0])) { allowedValueToURI.put(value, uri); executableUri = uri; return true; @@ -79,7 +81,8 @@ public boolean setValue(String... newValues) { /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.entry.DiscreteEntry#setValue(java.lang.String) + * + * @see org.eclipse.january.form.DiscreteEntry#setValue(java.lang.String) */ @Override public boolean setValue(String newValue) { @@ -87,12 +90,13 @@ public boolean setValue(String newValue) { executableUri = allowedValueToURI.get(newValue); return true; } - + return false; } - + /** - * Return the URI for the current application. + * Return the URI for the current application. + * * @return */ public URI getExecutableURI() { @@ -100,9 +104,9 @@ public URI getExecutableURI() { } /** - * This operations persists the ExecutableEntry to Eclipse Preferences. - * It constructs the key as the URI.toString and the value as the name - * of the corresponding executable. + * This operations persists the ExecutableEntry to Eclipse Preferences. It + * constructs the key as the URI.toString and the value as the name of the + * corresponding executable. * * @param prefId */ @@ -120,7 +124,8 @@ public void persistToPreferences(String prefId) { } /** - * This operation loads the ExecutableEntry from Eclipse Preferences. + * This operation loads the ExecutableEntry from Eclipse Preferences. + * * @param prefId */ public void loadFromPreferences(String prefId) { @@ -146,11 +151,11 @@ public void loadFromPreferences(String prefId) { setDefaultValue(allowedValues.get(0)); } } - /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.entry.DiscreteEntry#clone() + * + * @see org.eclipse.january.form.DiscreteEntry#clone() */ @Override public Object clone() { @@ -158,12 +163,12 @@ public Object clone() { entry.copy(this); return entry; } - /** * Copy the source entity's data into this object. * - * @param entity The Entry of which this object will be come a copy. + * @param entity + * The Entry of which this object will be come a copy. */ public void copy(ExecutableEntry entity) { @@ -172,27 +177,27 @@ public void copy(ExecutableEntry entity) { return; } - //Copy all data members + // Copy all data members super.copy(entity); executableUri = entity.executableUri; - - //Clear the current map + + // Clear the current map allowedValueToURI.clear(); - - //Copy in each value from the other map. - for(String value : entity.allowedValueToURI.keySet()){ + + // Copy in each value from the other map. + for (String value : entity.allowedValueToURI.keySet()) { allowedValueToURI.put(value, allowedValueToURI.get(value)); } - + return; } - + /* * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.entry.DiscreteEntry#accept(org.eclipse.ice - * .datastructures.entry.IEntryVisitor) + * org.eclipse.january.form.DiscreteEntry#accept(org.eclipse.january.form. + * IEntryVisitor) */ @Override public void accept(IEntryVisitor visitor) { diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/FileEntry.java b/org.eclipse.january.form/src/org/eclipse/january/form/FileEntry.java index d67ceca9..3e5113db 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/FileEntry.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/FileEntry.java @@ -41,7 +41,8 @@ */ @XmlRootElement(name = "FileEntry") @XmlAccessorType(XmlAccessType.FIELD) -public class FileEntry extends DiscreteEntry implements IResourceChangeListener { +public class FileEntry extends DiscreteEntry + implements IResourceChangeListener { /** * Reference to the selected file. @@ -89,13 +90,13 @@ public FileEntry(String fileType) { */ public FileEntry(String... files) { super(files); - contextId = "org.eclipse.ice.client.widgets.FileEntry"; + contextId = "org.eclipse.january.client.widgets.FileEntry"; } /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.DiscreteEntry#clone() + * @see org.eclipse.january.form.DiscreteEntry#clone() */ @Override public Object clone() { @@ -116,16 +117,15 @@ public void setProject(IProject projectSpace) { project = projectSpace; generateAllowedValues(); isModified = true; - ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE); + ResourcesPlugin.getWorkspace().addResourceChangeListener(this, + IResourceChangeEvent.POST_CHANGE); } } /* * (non-Javadoc) * - * @see - * org.eclipse.ice.datastructures.entry.DiscreteEntry#setValue(java.lang. - * String) + * @see org.eclipse.january.form.DiscreteEntry#setValue(java.lang.String) */ @Override public boolean setValue(String newValue) { @@ -157,15 +157,14 @@ public String getAbsoluteFilePath() { /* * (non-Javadoc) * - * @see - * org.eclipse.ice.datastructures.entry.DiscreteEntry#setValue(java.lang. - * String[]) + * @see org.eclipse.january.form.DiscreteEntry#setValue(java.lang.String[]) */ @Override public boolean setValue(String... values) { - throw new UnsupportedOperationException( - "FileEntry only supports " + "the storage of one String value, not many, selected from " - + "a list of files in the IProject space. " + "Therefore, this operation is not supported."); + throw new UnsupportedOperationException("FileEntry only supports " + + "the storage of one String value, not many, selected from " + + "a list of files in the IProject space. " + + "Therefore, this operation is not supported."); } @@ -186,7 +185,8 @@ private void generateAllowedValues() { IResource[] resources = project.members(); for (int i = 0; i < resources.length; i++) { // Only load files, not directories - if (resources[i].getType() == IResource.FILE && !resources[i].getName().startsWith(".")) { + if (resources[i].getType() == IResource.FILE + && !resources[i].getName().startsWith(".")) { allFiles.add(resources[i].getName()); } } @@ -209,7 +209,8 @@ private void generateAllowedValues() { } } catch (CoreException e) { // Complain - logger.info("FileEntry Message: " + "Unable to load project files!"); + logger.info("FileEntry Message: " + + "Unable to load project files!"); logger.error(getClass().getName() + " Exception!", e); } } @@ -259,7 +260,7 @@ public void copy(FileEntry entity) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.entry.AbstractEntry#hashCode() + * @see org.eclipse.january.form.DiscreteEntry#hashCode() */ @Override public int hashCode() { @@ -278,8 +279,8 @@ public int hashCode() { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.entry.DiscreteEntry#accept(org.eclipse.ice - * .datastructures.entry.IEntryVisitor) + * org.eclipse.january.form.DiscreteEntry#accept(org.eclipse.january.form. + * IEntryVisitor) */ @Override public void accept(IEntryVisitor visitor) { @@ -299,9 +300,12 @@ public void resourceChanged(IResourceChangeEvent event) { if (event.getType() == IResourceChangeEvent.POST_CHANGE) { try { event.getDelta().accept(new IResourceDeltaVisitor() { - public boolean visit(IResourceDelta delta) throws CoreException { + @Override + public boolean visit(IResourceDelta delta) + throws CoreException { IProject p = delta.getResource().getProject(); - if (p != null && p.getName().equals(project.getName())) { + if (p != null + && p.getName().equals(project.getName())) { generateAllowedValues(); notifyListeners(); } diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/Form.java b/org.eclipse.january.form/src/org/eclipse/january/form/Form.java index bd0b6361..cef95a4b 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/Form.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/Form.java @@ -56,7 +56,7 @@ public class Form extends JanuaryObject implements Composite { * */ @XmlElementWrapper - @XmlAnyElement(lax=true) + @XmlAnyElement(lax = true) private ArrayList componentList; /** @@ -105,7 +105,8 @@ public Form() { * Form. *

* - * @return

+ * @return + *

* The unique ID of the Item that the Form represents. *

*/ @@ -134,7 +135,8 @@ public void setItemID(int newItemID) { * the Form. *

* - * @return

+ * @return + *

* The list of Actions that can be performed for this Form when it * is processed or null if no such list was provided. *

@@ -169,7 +171,8 @@ public void setActionList(ArrayList actions) { * processed. *

* - * @return

+ * @return + *

* True if the Form is complete, valid and can be processed. *

*/ @@ -206,7 +209,8 @@ public void markReady(boolean ready) { *

* The other Form to which this Form should be compared. *

- * @return

+ * @return + *

* True if the Forms are equal, false otherwise. *

*/ @@ -273,7 +277,8 @@ public boolean equals(Object otherForm) { * This operation returns the hashcode value of the Form. *

* - * @return

+ * @return + *

* The hashcode of the Form. *

*/ @@ -308,7 +313,8 @@ public int hashCode() { * This operation provides a deep copy of the Form. *

* - * @return

+ * @return + *

* The deep-copy clone of this Form. *

*/ @@ -378,7 +384,9 @@ public void copy(Form otherForm) { /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.JanuaryObject.JanuaryObject#update(java.lang.String, java.lang.String) + * + * @see org.eclipse.january.form.JanuaryObject#update(java.lang.String, + * java.lang.String) */ @Override public void update(String updatedKey, String newValue) { @@ -416,8 +424,8 @@ public void addComponent(Component child) { notifyListeners(); } else { // Otherwise throw an error exception - throw new RuntimeException("Data components in Forms " - + " cannot be null."); + throw new RuntimeException( + "Data components in Forms " + " cannot be null."); } return; diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/GeometryComponent.java b/org.eclipse.january.form/src/org/eclipse/january/form/GeometryComponent.java index 98c8b2c0..96f6c80d 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/GeometryComponent.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/GeometryComponent.java @@ -54,8 +54,8 @@ public class GeometryComponent extends JanuaryObject /** *

- * This operation overrides the JanuaryObject.setName() operation and provides - * an update notification in addition to setting the name. + * This operation overrides the JanuaryObject.setName() operation and + * provides an update notification in addition to setting the name. *

* * @param name @@ -76,8 +76,8 @@ public void setName(String name) { /** *

- * This operation overrides the JanuaryObject.setId() operation and provides an - * update notification in addition to setting the id. + * This operation overrides the JanuaryObject.setId() operation and provides + * an update notification in addition to setting the id. *

* * @param id @@ -346,10 +346,10 @@ public void accept(IComponentVisitor visitor) { /* * (non-Javadoc) - * + * * @see - * org.eclipse.ice.datastructures.JanuaryObject.IUpdateableListener#update(org. - * eclipse.ice.datastructures.JanuaryObject.IUpdateable) + * org.eclipse.january.form.IUpdateableListener#update(org.eclipse.january. + * form.IUpdateable) */ @Override public void update(IUpdateable component) { diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/JanuaryJAXBClassProvider.java b/org.eclipse.january.form/src/org/eclipse/january/form/JanuaryJAXBClassProvider.java index efb6470f..5dfd6af2 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/JanuaryJAXBClassProvider.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/JanuaryJAXBClassProvider.java @@ -30,8 +30,7 @@ public class JanuaryJAXBClassProvider implements IJAXBClassProvider { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.jaxbclassprovider.IJAXBClassProvider# - * getClasses() + * @see org.eclipse.january.form.IJAXBClassProvider#getClasses() */ @Override public List getClasses() { @@ -65,8 +64,7 @@ public List 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/org.eclipse.january.form/src/org/eclipse/january/form/JanuaryObject.java b/org.eclipse.january.form/src/org/eclipse/january/form/JanuaryObject.java index 5269deae..b4491205 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/JanuaryObject.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/JanuaryObject.java @@ -16,31 +16,30 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlTransient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * JanuaryObject is the base class for all common, shared data structures in January - * with the notable exception of the JanuaryList. JanuaryObjects are uniquely - * identifiable by their identification numbers and are persistent; it realizes - * both the Identifiable and Persistable interfaces. JanuaryObject implements - * clone() for creating deep copies and also provides a public copy operation to - * copy into an existing JanuaryObject. JanuaryObjects can be marshalled and - * unmarshalled to XML using the loadFromXML() and persistToXML() operations - * from the Persistable interface. + * JanuaryObject is the base class for all common, shared data structures in + * January with the notable exception of the JanuaryList. JanuaryObjects are + * uniquely identifiable by their identification numbers and are persistent; it + * realizes both the Identifiable and Persistable interfaces. JanuaryObject + * implements clone() for creating deep copies and also provides a public copy + * operation to copy into an existing JanuaryObject. JanuaryObjects can be + * marshalled and unmarshalled to XML using the loadFromXML() and persistToXML() + * operations from the Persistable interface. *

* Operations are defined for most of the attributes and capabilities of the * JanuaryObject class, but some work is required by subclasses. Subclasses must - * override clone() if they extend JanuaryObject by adding attributes or the deep - * copy will fail. They should provide a custom implementation of copy() that is - * specific to their own type to do a deep copy (i.e. copy(a:myType) instead of - * copy(a:JanuaryObject)) since JanuaryObject.copy() will only copy the attributes of - * JanuaryObjects. They must also override the loadFromXML() operation to copy the - * XML data properly from the XMLLoader (because January uses JAXB to bind XML to - * JanuaryObjects and its subclasses). + * override clone() if they extend JanuaryObject by adding attributes or the + * deep copy will fail. They should provide a custom implementation of copy() + * that is specific to their own type to do a deep copy (i.e. copy(a:myType) + * instead of copy(a:JanuaryObject)) since JanuaryObject.copy() will only copy + * the attributes of JanuaryObjects. They must also override the loadFromXML() + * operation to copy the XML data properly from the XMLLoader (because January + * uses JAXB to bind XML to JanuaryObjects and its subclasses). *

*

* JanuaryObjects implement IUpdateable. The base class manages registering, @@ -61,9 +60,9 @@ public class JanuaryObject implements IUpdateable { /** * The context for this object. It should be used as described on - * {@link org.eclipse.january.form.Identifiable}. It is not - * persisted to XML because it only matters during runtime. It's default - * value is "january-default." + * {@link org.eclipse.january.form.Identifiable}. It is not persisted to XML + * because it only matters during runtime. It's default value is + * "january-default." */ @XmlTransient protected String context = "january-default"; @@ -79,9 +78,9 @@ public class JanuaryObject implements IUpdateable { protected String objectName; /** - * The description of the JanuaryObject. This description should be different - * than the name of the JanuaryObject and should contain information that would - * be useful to a human user. + * The description of the JanuaryObject. This description should be + * different than the name of the JanuaryObject and should contain + * information that would be useful to a human user. */ protected String objectDescription; @@ -218,8 +217,8 @@ public void copy(JanuaryObject entity) { } /** - * This protected operation notifies the listeners of the JanuaryObject that its - * state has changed. + * This protected operation notifies the listeners of the JanuaryObject that + * its state has changed. */ protected void notifyListeners() { @@ -365,7 +364,7 @@ public void unregister(IUpdateableListener listener) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.JanuaryObject.Identifiable#getContext() + * @see org.eclipse.january.form.Identifiable#getContext() */ @Override public String getContext() { @@ -375,9 +374,7 @@ public String getContext() { /* * (non-Javadoc) * - * @see - * org.eclipse.ice.datastructures.JanuaryObject.Identifiable#setContext(java. - * lang.String) + * @see org.eclipse.january.form.Identifiable#setContext(java.lang.String) */ @Override public void setContext(String context) { diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/JanuaryResource.java b/org.eclipse.january.form/src/org/eclipse/january/form/JanuaryResource.java index 981444cb..25189147 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/JanuaryResource.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/JanuaryResource.java @@ -28,8 +28,8 @@ /** *

- * The Resource class represents persistent data resources used by January and the - * other software packages with which it interacts. This includes files + * The Resource class represents persistent data resources used by January and + * the other software packages with which it interacts. This includes files * containing simulation input and output data, movies and plots, amongst * others. *

@@ -64,13 +64,13 @@ public class JanuaryResource extends JanuaryObject { * */ @XmlElementWrapper - @XmlAnyElement(lax=true) + @XmlAnyElement(lax = true) private ArrayList properties; /** *

- * An attribute that determines if JanuaryResouce is a picture or not. Can be - * set multiple times. + * An attribute that determines if JanuaryResouce is a picture or not. Can + * be set multiple times. *

* */ @@ -136,12 +136,15 @@ public JanuaryResource(File resourceFile) throws IOException { } - /* - * (non-Javadoc) + /** + *

+ * This operation returns the last modification date of the file. + *

* - * @see - * org.eclipse.ice.datastructures.resource.IResource#getLastModificationDate - * () + * @return + *

+ * The date. + *

*/ public String getLastModificationDate() { @@ -158,20 +161,31 @@ public String getLastModificationDate() { return retVal; } - /* - * (non-Javadoc) + /** + *

+ * This operations returns the contents of the Resource as an instance of + * File. + *

* - * @see org.eclipse.ice.datastructures.resource.IResource#getContents() + * @return + *

+ * The file. + *

*/ public File getContents() { return file; } - /* - * (non-Javadoc) + /** + *

+ * This operation returns the URI to the Resource. + *

* - * @see org.eclipse.ice.datastructures.resource.IResource#getPath() + * @return + *

+ * The path as a URL. + *

*/ public URI getPath() { if (this.file != null) { @@ -180,11 +194,13 @@ public URI getPath() { return path; } - /* - * (non-Javadoc) + /** + *

+ * This operation sets the path to the Resource and is an alternative to + * setContents(). It will reset the File handle if it is different. + *

* - * @see - * org.eclipse.ice.datastructures.resource.IResource#setPath(java.net.URI) + * @param path */ public void setPath(URI path) { @@ -202,22 +218,34 @@ public void setPath(URI path) { } - /* - * (non-Javadoc) + /** + *

+ * This operation associates a set of Entries with the resource that + * describe specific properties. The list of Entries is returned by + * reference and is not a deep copy, i.e. - changing one will change it on + * the resource. + *

* - * @see org.eclipse.ice.datastructures.resource.IResource#getProperties() + * @return + *

+ * The properties or null if there are no properties. + *

*/ public ArrayList getProperties() { return this.properties; } - /* - * (non-Javadoc) + /** + *

+ * This operation returns the set of Entries that describe specific + * properties of the resource. The properties can be set multiple times. + *

* - * @see - * org.eclipse.ice.datastructures.resource.IResource#setProperties(java.util - * .ArrayList) + * @param props + *

+ * The properties. + *

*/ public void setProperties(ArrayList props) { // If null return @@ -229,20 +257,30 @@ public void setProperties(ArrayList props) { } - /* - * (non-Javadoc) + /** + *

+ * This operation returns true if the ICEResource is an image and false if + * not based upon the isPicture attribute. + *

* - * @see org.eclipse.ice.datastructures.resource.IResource#isPictureType() + * @return + *

+ * True if this is a picture, false otherwise. + *

*/ public boolean isPictureType() { return this.isPicture; } - /* - * (non-Javadoc) + /** + *

+ * An operation that sets the isPicture attribute on ICEResource. + *

* - * @see - * org.eclipse.ice.datastructures.resource.IResource#setPictureType(boolean) + * @param isPicture + *

+ * Determines if ICEResource is a picture. + *

*/ @XmlTransient public void setPictureType(boolean isPicture) { @@ -250,12 +288,12 @@ public void setPictureType(boolean isPicture) { } - /* - * (non-Javadoc) + /** + * This operation performs a deep copy of the attributes of another + * ICEResource into the current ICEResource. * - * @see - * org.eclipse.ice.datastructures.resource.IResource#copy(org.eclipse.ice. - * datastructures.resource.JanuaryResource) + * @param otherResource + * The other ICEResource from which information should be copied. */ public void copy(JanuaryResource otherResource) { @@ -301,12 +339,12 @@ public Object clone() { /** * This operation is used to check equality between the JanuaryResource and - * another JanuaryResource. It returns true if the JanuaryResources are equal and - * false if they are not. + * another JanuaryResource. It returns true if the JanuaryResources are + * equal and false if they are not. * * @param otherJanuaryResource - * The other JanuaryResource to which this JanuaryResource should be - * compared. + * The other JanuaryResource to which this JanuaryResource should + * be compared. * @return True if the JanuaryResources are equal, false otherwise. */ @Override @@ -369,12 +407,19 @@ public int hashCode() { } - /* - * (non-Javadoc) + /** + *

+ * This operation sets the File which the Resource represents. The default + * values of the name, id and description for this class are the filename, 1 + * and the absolute path, respectively. + *

* - * @see - * org.eclipse.ice.datastructures.resource.IResource#setContents(java.io. - * File) + * @param resourceFile + *

+ * The file that the Resource should be created to represent. + *

+ * @throws IOException + * @throws NullPointerException */ @XmlTransient public void setContents(File resourceFile) diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/ListComponent.java b/org.eclipse.january.form/src/org/eclipse/january/form/ListComponent.java index a80cb93a..fb3669dc 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/ListComponent.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/ListComponent.java @@ -35,9 +35,9 @@ * Collections in a class that realizes January's additional requirements for * persistence, unique identification, and notifications. *

- * It implements the Component to match up with the January requirements and extends - * the TransformedList from GlazedLists to provide the generic, observable list - * capabilities. + * It implements the Component to match up with the January requirements and + * extends the TransformedList from GlazedLists to provide the generic, + * observable list capabilities. *

*

* It can be configured to provide a handle to an IElementSource that will @@ -549,7 +549,7 @@ public void removeListEventListener( /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.JanuaryObject.Identifiable#getContext() + * @see org.eclipse.january.form.Identifiable#getContext() */ @Override public String getContext() { @@ -559,9 +559,7 @@ public String getContext() { /* * (non-Javadoc) * - * @see - * org.eclipse.ice.datastructures.JanuaryObject.Identifiable#setContext(java. - * lang.String) + * @see org.eclipse.january.form.Identifiable#setContext(java.lang.String) */ @Override public void setContext(String context) { diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/MasterDetailsComponent.java b/org.eclipse.january.form/src/org/eclipse/january/form/MasterDetailsComponent.java index e8ae27a0..71b74e53 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/MasterDetailsComponent.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/MasterDetailsComponent.java @@ -56,9 +56,9 @@ * three ways: by the name, id or reference to the master itself. *

*

- * The MasterDetailsComponent is an JanuaryObject and is both uniquely identifiable - * and persistent to either XML or SQL. It implements the Component interface - * and can be visited and observed. + * The MasterDetailsComponent is an JanuaryObject and is both uniquely + * identifiable and persistent to either XML or SQL. It implements the Component + * interface and can be visited and observed. *

*

* The MasterDetailsComponent can be configured with a "header component." The @@ -66,8 +66,8 @@ * master-details pairs globally. For example, in the January MultiLauncher the * header contains an Entry to determine whether or not the jobs should be * launched sequentially or in parallel. This header is retrieved and set by - * calling get/setGlobalsComponent and it is referred to interchangeably as - * "the header" or "the globals" component. + * calling get/setGlobalsComponent and it is referred to interchangeably as "the + * header" or "the globals" component. *

*

* It is possible to generate a unique value for a particular master by calling @@ -208,8 +208,8 @@ public void setTemplates(ArrayList masterTypeList, // the templatelist has not been set, everything is okay. // Otherwise, return. if (!(!masterTypeList.isEmpty() && !detailList.isEmpty() - && (masterTypeList.size() == detailList.size()) && this.masterDetailsTemplateList - .isEmpty())) { + && (masterTypeList.size() == detailList.size()) + && this.masterDetailsTemplateList.isEmpty())) { return; } } @@ -289,7 +289,8 @@ public void setTemplates(ArrayList pairs) { *

* The id of the master whose details should be retrieved. *

- * @return

+ * @return + *

* The details block for the master with the specified id. *

*/ @@ -298,14 +299,16 @@ public DataComponent getDetails(int masterId) { // Return if the masterDetailsTemplateList is not set. // Also check if the masterId < 0 || masterId > this.counter // Faster boolean operations. - if (!(!this.masterDetailsTemplateList.isEmpty() && (masterId >= 0) && (masterId < this.counter))) { + if (!(!this.masterDetailsTemplateList.isEmpty() && (masterId >= 0) + && (masterId < this.counter))) { return null; } // Search to see if the id exists for (int i = 0; i < this.masterDetailsPairs.size(); i++) { // If the id is found, return the DataComponent - if (this.masterDetailsPairs.get(i).getMasterDetailsPairId() == masterId) { + if (this.masterDetailsPairs.get(i) + .getMasterDetailsPairId() == masterId) { return this.masterDetailsPairs.get(i).getDetails(); } } @@ -323,7 +326,8 @@ public DataComponent getDetails(int masterId) { * the master may be retrieved later by calling getMaster(). *

* - * @return

+ * @return + *

* The id of the new master instance. *

*/ @@ -371,7 +375,8 @@ public int addMaster() { *

* The id of the master that should be deleted. *

- * @return

+ * @return + *

* True if the master was deleted, false otherwise. *

*/ @@ -410,7 +415,8 @@ public boolean deleteMaster(int id) { *

* The id of the master that should be retrieved. *

- * @return

+ * @return + *

* The value of the instance of the master with the given id. *

*/ @@ -454,7 +460,8 @@ public String getMasterValue(int id) { *

* The new value of the master. *

- * @return

+ * @return + *

* True if setting the value was successful, false otherwise. *

*/ @@ -484,7 +491,8 @@ public boolean setMasterInstanceValue(int id, String value) { if (this.masterDetailsPairs.get(i).getMasterDetailsPairId() == id) { // Set the DataComponent // Get the DataComponent to copy - for (int j = 0; j < this.masterDetailsTemplateList.size(); j++) { + for (int j = 0; j < this.masterDetailsTemplateList + .size(); j++) { if (this.masterDetailsTemplateList.get(j).getMaster() .equals(value)) { // Clone another dataComponent @@ -527,7 +535,8 @@ public boolean setMasterInstanceValue(int id, String value) { * masters when setMasterInstanceValue() is called. *

* - * @return

+ * @return + *

* The list of values that may be assigned to masters. *

*/ @@ -560,7 +569,8 @@ public ArrayList getAllowedMasterValues() { * The other MasterDetailsComponent to which this component * should be compared. *

- * @return

+ * @return + *

* True if the MasterDetailsComponents are equal, false otherwise. *

*/ @@ -614,7 +624,8 @@ public boolean equals(Object otherMasterDetailsComponent) { * This operation returns the hashcode value of the MasterDetailsComponent. *

* - * @return

+ * @return + *

* The hashcode. *

*/ @@ -627,19 +638,13 @@ public int hashCode() { hash = 31 * hash + super.hashCode(); // Compute attributes - hash = 31 - * hash - + (null == this.allowedMasters ? 0 : this.allowedMasters - .hashCode()); + hash = 31 * hash + (null == this.allowedMasters ? 0 + : this.allowedMasters.hashCode()); hash = 31 * hash + (null == this.counter ? 0 : this.counter.hashCode()); - hash = 31 - * hash - + (null == this.masterDetailsPairs ? 0 - : this.masterDetailsPairs.hashCode()); - hash = 31 - * hash - + (null == this.masterDetailsTemplateList ? 0 - : this.masterDetailsTemplateList.hashCode()); + hash = 31 * hash + (null == this.masterDetailsPairs ? 0 + : this.masterDetailsPairs.hashCode()); + hash = 31 * hash + (null == this.masterDetailsTemplateList ? 0 + : this.masterDetailsTemplateList.hashCode()); hash = 31 * hash + (null == this.globals ? 0 : this.globals.hashCode()); return hash; @@ -671,17 +676,18 @@ public void copy(MasterDetailsComponent otherMasterDetailsComponent) { // Copy allowedMasters this.allowedMasters.clear(); - for (int i = 0; i < otherMasterDetailsComponent.allowedMasters.size(); i++) { - this.allowedMasters.add(otherMasterDetailsComponent.allowedMasters - .get(i)); + for (int i = 0; i < otherMasterDetailsComponent.allowedMasters + .size(); i++) { + this.allowedMasters + .add(otherMasterDetailsComponent.allowedMasters.get(i)); } // Copy MasterDetailsPairs this.masterDetailsPairs.clear(); for (int i = 0; i < otherMasterDetailsComponent.masterDetailsPairs .size(); i++) { - this.masterDetailsPairs - .add((MasterDetailsPair) otherMasterDetailsComponent.masterDetailsPairs + this.masterDetailsPairs.add( + (MasterDetailsPair) otherMasterDetailsComponent.masterDetailsPairs .get(i).clone()); } @@ -689,8 +695,8 @@ public void copy(MasterDetailsComponent otherMasterDetailsComponent) { this.masterDetailsTemplateList.clear(); for (int i = 0; i < otherMasterDetailsComponent.masterDetailsTemplateList .size(); i++) { - this.masterDetailsTemplateList - .add((MasterDetailsPair) otherMasterDetailsComponent.masterDetailsTemplateList + this.masterDetailsTemplateList.add( + (MasterDetailsPair) otherMasterDetailsComponent.masterDetailsTemplateList .get(i).clone()); } @@ -713,7 +719,8 @@ public void copy(MasterDetailsComponent otherMasterDetailsComponent) { * This operation provides a deep copy of the MasterDetailsComponent. *

* - * @return

+ * @return + *

* The deep-copy clone of this MasterDetailsComponent. *

*/ @@ -747,7 +754,8 @@ private void rectifyDetailsBlock(int id) { * Returns the number of MasterDetailsPairs in masterDetailsPairs list. *

* - * @return

+ * @return + *

* Number of masters. *

*/ @@ -761,7 +769,8 @@ public int numberOfMasters() { * been set. This should be reviewed by clients if it is not null. *

* - * @return

+ * @return + *

* A returned DataComponent globals value. *

*/ @@ -799,7 +808,8 @@ public void setGlobalsComponent(DataComponent globals) { *

* List index. *

- * @return

+ * @return + *

* A string value in masterDetailsPairs list. *

*/ @@ -825,7 +835,8 @@ public String getMasterAtIndex(int index) { *

* The index in the list. *

- * @return

+ * @return + *

* The returned DataComponent. *

*/ @@ -850,7 +861,8 @@ public DataComponent getDetailsAtIndex(int index) { *

* The unique masterDetailsPairId. *

- * @return

+ * @return + *

* The unique master value, equal to 'id + " " + value'. *

*/ @@ -884,7 +896,8 @@ public String getUniqueMasterValue(int id) { *

* The index in the list. *

- * @return

+ * @return + *

* The unique master value, equal to 'id + " " + value'. *

*/ @@ -910,7 +923,8 @@ public String getUniqueMasterValueAtIndex(int index) { *

* The index to be deleted. *

- * @return

+ * @return + *

* Status of deletion. *

*/ @@ -934,7 +948,8 @@ public boolean deleteMasterAtIndex(int index) { * If false, the buttons should be disabled. *

* - * @return

+ * @return + *

* The status *

*/ @@ -962,7 +977,9 @@ public void toggleAddRemoveButton(boolean toggle) { /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.JanuaryObject.JanuaryObject#update(java.lang.String, java.lang.String) + * + * @see org.eclipse.january.form.JanuaryObject#update(java.lang.String, + * java.lang.String) */ @Override public void update(String updatedKey, String newValue) { diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/MatrixComponent.java b/org.eclipse.january.form/src/org/eclipse/january/form/MatrixComponent.java index 4c7abeb9..c9155d2b 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/MatrixComponent.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/MatrixComponent.java @@ -107,7 +107,8 @@ public class MatrixComponent extends JanuaryObject implements Component { * Returns true if this is a MatrixComponent representing a square matrix. *

* - * @return

+ * @return + *

* A boolean for determining if a matrix is square or not. *

*/ @@ -126,7 +127,8 @@ public boolean isSquare() { * type is not undefined for this operation to work. *

* - * @return

+ * @return + *

* A value returned representing the row number that was added. *

*/ @@ -138,8 +140,10 @@ public int addRow() { } // Return if Continuous or Discrete and valueType not set - if ((this.valueType == AllowedValueType.Continuous && this.allowedValues == null) - || (this.valueType == AllowedValueType.Discrete && this.allowedValues == null)) { + if ((this.valueType == AllowedValueType.Continuous + && this.allowedValues == null) + || (this.valueType == AllowedValueType.Discrete + && this.allowedValues == null)) { return -1; } @@ -175,7 +179,8 @@ public int addRow() { * The allowed value type for MatrixComponent. *

*/ - public MatrixComponent(boolean isSquare, AllowedValueType allowedValueType) { + public MatrixComponent(boolean isSquare, + AllowedValueType allowedValueType) { this.isSquare = isSquare; this.valueType = allowedValueType; @@ -196,7 +201,8 @@ public MatrixComponent(boolean isSquare, AllowedValueType allowedValueType) { * work. *

* - * @return

+ * @return + *

* A number that represents the index of the row deleted. *

*/ @@ -212,7 +218,7 @@ public boolean deleteRow() { if (this.valueType == AllowedValueType.Continuous && this.allowedValues == null || this.valueType == AllowedValueType.Discrete - && this.allowedValues == null) { + && this.allowedValues == null) { return false; } @@ -259,7 +265,8 @@ public boolean deleteRow() { * This operation returns the number of rows that are stored in the matrix. *

* - * @return

+ * @return + *

* The number of rows. *

*/ @@ -274,7 +281,8 @@ public int numberOfRows() { * matrix. *

* - * @return

+ * @return + *

* The number of columns. *

*/ @@ -308,9 +316,10 @@ public void copy(MatrixComponent otherMatrixComponent) { this.allowedValues = otherMatrixComponent.allowedValues; } else { this.allowedValues = new ArrayList(); - for (int i = 0; i < otherMatrixComponent.allowedValues.size(); i++) { - this.allowedValues.add(otherMatrixComponent.allowedValues - .get(i)); + for (int i = 0; i < otherMatrixComponent.allowedValues + .size(); i++) { + this.allowedValues + .add(otherMatrixComponent.allowedValues.get(i)); } } if (otherMatrixComponent.elements == null) { @@ -338,7 +347,8 @@ public void copy(MatrixComponent otherMatrixComponent) { * This operation provides a deep copy of the MatrixComponent. *

* - * @return

+ * @return + *

* A clone of the TableComponent. *

*/ @@ -361,13 +371,14 @@ public Object clone() { *

* The TableComponent that should be checked for equality. *

- * @return

+ * @return + *

* True if the TableComponents are equal, false if not *

*/ @Override public boolean equals(Object otherMatrixComponent) { - + boolean retVal = true; // Check if they are the same reference in memory if (this == otherMatrixComponent) { @@ -406,7 +417,8 @@ public boolean equals(Object otherMatrixComponent) { * This operation returns the hashcode value of the MatrixComponent. *

* - * @return

+ * @return + *

* The hashcode *

*/ @@ -465,7 +477,8 @@ public int hashCode() { * set if the type is not undefined for this operation to work. *

* - * @return

+ * @return + *

* A value returned representing the column number that was added. *

*/ @@ -477,8 +490,10 @@ public int addColumn() { } // Return if Continuous or Discrete and valueType not set - if ((this.valueType == AllowedValueType.Continuous && this.allowedValues == null) - || (this.valueType == AllowedValueType.Discrete && this.allowedValues == null)) { + if ((this.valueType == AllowedValueType.Continuous + && this.allowedValues == null) + || (this.valueType == AllowedValueType.Discrete + && this.allowedValues == null)) { return -1; } @@ -502,7 +517,8 @@ public int addColumn() { * for this operation to work. *

* - * @return

+ * @return + *

* A number that represents the index of the column deleted. *

*/ @@ -515,8 +531,10 @@ public boolean deleteColumn() { } // Return if Continuous or Discrete and valueType not set - if ((this.valueType == AllowedValueType.Continuous && this.allowedValues == null) - || (this.valueType == AllowedValueType.Discrete && this.allowedValues == null)) { + if ((this.valueType == AllowedValueType.Continuous + && this.allowedValues == null) + || (this.valueType == AllowedValueType.Discrete + && this.allowedValues == null)) { return false; } @@ -577,7 +595,8 @@ public boolean deleteColumn() { *

* The value to be set. *

- * @return

+ * @return + *

* Returns true if operation was successful. False otherwise. *

*/ @@ -601,8 +620,10 @@ public boolean setElementValue(int rowIndex, int colIndex, Double value) { // Return if allowedValueType is not set // Return if Continuous or Discrete and valueType not set - if ((this.valueType == AllowedValueType.Continuous && this.allowedValues == null) - || (this.valueType == AllowedValueType.Discrete && this.allowedValues == null)) { + if ((this.valueType == AllowedValueType.Continuous + && this.allowedValues == null) + || (this.valueType == AllowedValueType.Discrete + && this.allowedValues == null)) { return false; } @@ -639,7 +660,8 @@ public boolean setElementValue(int rowIndex, int colIndex, Double value) { *

* The column index. *

- * @return

+ * @return + *

* The value at rowIndex, colIndex. *

*/ @@ -657,8 +679,10 @@ public Double getElementValue(int rowIndex, int colIndex) { // Return if the valueType is not set correctly // Return if Continuous or Discrete and valueType not set - if ((this.valueType == AllowedValueType.Continuous && this.allowedValues == null) - || (this.valueType == AllowedValueType.Discrete && this.allowedValues == null)) { + if ((this.valueType == AllowedValueType.Continuous + && this.allowedValues == null) + || (this.valueType == AllowedValueType.Discrete + && this.allowedValues == null)) { return null; } @@ -694,7 +718,8 @@ public void setAllowedValues(ArrayList values) { // Return if the allowedValues is continuous, but the values passed are // null - if (values.size() != 2 && this.valueType == AllowedValueType.Continuous) { + if (values.size() != 2 + && this.valueType == AllowedValueType.Continuous) { return; } @@ -772,7 +797,8 @@ public MatrixComponent(boolean isSquare) { *

* The index of the row. *

- * @return

+ * @return + *

* An arraylist of a row at index. *

*/ @@ -809,7 +835,8 @@ public ArrayList getRow(int index) { *

* The column index. *

- * @return

+ * @return + *

* An arraylist of columns. *

*/ @@ -956,7 +983,8 @@ private void resizeSquareMatrix(boolean addOrRemove) { * Returns true if the matrix can be resized. False otherwise. *

* - * @return

+ * @return + *

* A boolean to determine resizable attribute. *

*/ @@ -989,7 +1017,8 @@ public void setResizable(boolean resizable) { * Returns the January's AllowedValueType. If this is not set, returns null. *

* - * @return

+ * @return + *

* An ArrayList of doubles. *

*/ @@ -1005,7 +1034,8 @@ public AllowedValueType getAllowedValueType() { * undefined or not set, returns null. *

* - * @return

+ * @return + *

* An AllowedValueType. *

*/ @@ -1027,7 +1057,9 @@ public ArrayList getAllowedValues() { /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.JanuaryObject.JanuaryObject#update(java.lang.String, java.lang.String) + * + * @see org.eclipse.january.form.JanuaryObject#update(java.lang.String, + * java.lang.String) */ @Override public void update(String updatedKey, String newValue) { diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/PostOrderTreeCompositeIterator.java b/org.eclipse.january.form/src/org/eclipse/january/form/PostOrderTreeCompositeIterator.java index efc02371..c8879529 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/PostOrderTreeCompositeIterator.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/PostOrderTreeCompositeIterator.java @@ -35,8 +35,8 @@ * @author Jordan H. Deyton * */ -public class PostOrderTreeCompositeIterator extends - AbstractTreeCompositeIterator { +public class PostOrderTreeCompositeIterator + extends AbstractTreeCompositeIterator { /** * A stack used to maintain state information about the position of the @@ -88,7 +88,7 @@ public PostOrderTreeCompositeIterator(TreeComposite root) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.form.TreeCompositeIterator#hasNext() + * @see org.eclipse.january.form.AbstractTreeCompositeIterator#hasNext() */ @Override public boolean hasNext() { @@ -98,7 +98,7 @@ public boolean hasNext() { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.form.TreeCompositeIterator#next() + * @see org.eclipse.january.form.AbstractTreeCompositeIterator#next() */ @Override public TreeComposite next() { diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/PreOrderTreeCompositeIterator.java b/org.eclipse.january.form/src/org/eclipse/january/form/PreOrderTreeCompositeIterator.java index 198e6c2e..2a629255 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/PreOrderTreeCompositeIterator.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/PreOrderTreeCompositeIterator.java @@ -35,8 +35,8 @@ * @author Jordan H. Deyton * */ -public class PreOrderTreeCompositeIterator extends - AbstractTreeCompositeIterator { +public class PreOrderTreeCompositeIterator + extends AbstractTreeCompositeIterator { /** * A stack used to maintain state information about the position of the @@ -80,7 +80,7 @@ public PreOrderTreeCompositeIterator(TreeComposite root) { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.form.TreeCompositeIterator#hasNext() + * @see org.eclipse.january.form.AbstractTreeCompositeIterator#hasNext() */ @Override public boolean hasNext() { @@ -90,7 +90,7 @@ public boolean hasNext() { /* * (non-Javadoc) * - * @see org.eclipse.ice.datastructures.form.TreeCompositeIterator#next() + * @see org.eclipse.january.form.AbstractTreeCompositeIterator#next() */ @Override public TreeComposite next() { diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/ResourceComponent.java b/org.eclipse.january.form/src/org/eclipse/january/form/ResourceComponent.java index 780cfa98..e4636918 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/ResourceComponent.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/ResourceComponent.java @@ -19,10 +19,10 @@ /** * The ResourceComponent is a specialization of ListComponent that is used to - * manage a set of JanuaryResources. It is used, for example, to collect Resources - * for output data on a Form. JanuaryResources can be very easily added to - * ResourceComponents by calling the addResource() operation and the whole list - * of managed JanuaryResources can be retrieved with getResources(). + * manage a set of JanuaryResources. It is used, for example, to collect + * Resources for output data on a Form. JanuaryResources can be very easily + * added to ResourceComponents by calling the addResource() operation and the + * whole list of managed JanuaryResources can be retrieved with getResources(). * * * @@ -100,14 +100,15 @@ public Object clone() { /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.JanuaryObject.ListComponent#hashCode() + * + * @see org.eclipse.january.form.ListComponent#hashCode() */ @Override public int hashCode() { return super.hashCode(); - + } - + /** * This operation is used to check equality between the ResourceComponent * and another ResourceComponent. It returns true if the Components are diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/SelectiveComponentVisitor.java b/org.eclipse.january.form/src/org/eclipse/january/form/SelectiveComponentVisitor.java index 0073231f..191e4036 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/SelectiveComponentVisitor.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/SelectiveComponentVisitor.java @@ -15,9 +15,6 @@ *******************************************************************************/ package org.eclipse.january.form; -import java.util.HashMap; -import java.util.Map; - import org.eclipse.january.form.emf.EMFComponent; /** @@ -55,8 +52,8 @@ public abstract class SelectiveComponentVisitor implements IComponentVisitor { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor#visit - * (org.eclipse.ice.datastructures.form.DataComponent) + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .DataComponent) */ @Override public void visit(DataComponent component) { @@ -67,8 +64,8 @@ public void visit(DataComponent component) { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor#visit - * (org.eclipse.ice.datastructures.form.ResourceComponent) + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .ResourceComponent) */ @Override public void visit(ResourceComponent component) { @@ -79,8 +76,8 @@ public void visit(ResourceComponent component) { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor#visit - * (org.eclipse.ice.datastructures.form.TableComponent) + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .TableComponent) */ @Override public void visit(TableComponent component) { @@ -91,8 +88,8 @@ public void visit(TableComponent component) { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor#visit - * (org.eclipse.ice.datastructures.form.MatrixComponent) + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .MatrixComponent) */ @Override public void visit(MatrixComponent component) { @@ -103,8 +100,8 @@ public void visit(MatrixComponent component) { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor#visit - * (org.eclipse.ice.datastructures.form.geometry.GeometryComponent) + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .GeometryComponent) */ @Override public void visit(GeometryComponent component) { @@ -115,8 +112,8 @@ public void visit(GeometryComponent component) { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor#visit - * (org.eclipse.ice.datastructures.form.MasterDetailsComponent) + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .MasterDetailsComponent) */ @Override public void visit(MasterDetailsComponent component) { @@ -127,8 +124,8 @@ public void visit(MasterDetailsComponent component) { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor#visit - * (org.eclipse.ice.datastructures.form.TreeComposite) + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .TreeComposite) */ @Override public void visit(TreeComposite component) { @@ -139,8 +136,8 @@ public void visit(TreeComposite component) { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor#visit - * (org.eclipse.ice.datastructures.form.AdaptiveTreeComposite) + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .AdaptiveTreeComposite) */ @Override public void visit(AdaptiveTreeComposite component) { @@ -151,8 +148,8 @@ public void visit(AdaptiveTreeComposite component) { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor#visit - * (org.eclipse.ice.datastructures.componentVisitor.IReactorComponent) + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .IReactorComponent) */ @Override public void visit(IReactorComponent component) { @@ -163,8 +160,8 @@ public void visit(IReactorComponent component) { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor#visit - * (org.eclipse.ice.datastructures.form.TimeDataComponent) + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .TimeDataComponent) */ @Override public void visit(TimeDataComponent component) { @@ -175,8 +172,8 @@ public void visit(TimeDataComponent component) { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor#visit - * (org.eclipse.ice.datastructures.form.BatteryComponent) + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .emf.EMFComponent) */ @Override public void visit(EMFComponent component) { @@ -187,8 +184,8 @@ public void visit(EMFComponent component) { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor#visit( - * org.eclipse.ice.datastructures.JanuaryObject.ListComponent) + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .ListComponent) */ @Override public void visit(ListComponent component) { diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/StringEntry.java b/org.eclipse.january.form/src/org/eclipse/january/form/StringEntry.java index b5d2f8bd..8c0eff68 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/StringEntry.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/StringEntry.java @@ -20,9 +20,9 @@ import javax.xml.bind.annotation.XmlRootElement; /** - * The StringEntry is an AbstractEntry that only contains an - * undefined, String-valued value. It does not allow clients to set - * multiple values or specify allowed values. + * The StringEntry is an AbstractEntry that only contains an undefined, + * String-valued value. It does not allow clients to set multiple values or + * specify allowed values. * * @author Alex McCaskey * @@ -34,10 +34,11 @@ public class StringEntry extends AbstractEntry { public StringEntry() { super(); } - + /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.entry.AbstractEntry#clone() + * + * @see org.eclipse.january.form.AbstractEntry#clone() */ @Override public Object clone() { @@ -48,7 +49,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) { @@ -59,42 +61,52 @@ public boolean setValue(String... values) { /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.entry.AbstractEntry#getValues() + * + * @see org.eclipse.january.form.AbstractEntry#getValues() */ @Override public String[] getValues() { - throw new UnsupportedOperationException( - "Discrete only supports " + "the storage of one String value, not many, selected from " - + "a list of allowed values. " + "Therefore, this operation is not supported."); + throw new UnsupportedOperationException("Discrete only supports " + + "the storage of one String value, not many, selected from " + + "a list of allowed values. " + + "Therefore, this operation is not supported."); } /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.entry.AbstractEntry#getAllowedValues() + * + * @see org.eclipse.january.form.AbstractEntry#getAllowedValues() */ @Override public List getAllowedValues() { - throw new UnsupportedOperationException("StringEntry allows any String to " - + "be entered as the value. There are no allowed values. Therefore this " - + "operation is not supported."); + throw new UnsupportedOperationException( + "StringEntry allows any String to " + + "be entered as the value. There are no allowed values. Therefore this " + + "operation is not supported."); } /* * (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 values) { - throw new UnsupportedOperationException("StringEntry allows any String to " - + "be entered as the value. There are no allowed values. Therefore this " - + "operation is not supported."); + throw new UnsupportedOperationException( + "StringEntry allows any String to " + + "be entered as the value. There are no allowed values. Therefore this " + + "operation is not supported."); } /* * (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) { @@ -103,7 +115,9 @@ public void update(IUpdateable component) { /* * (non-Javadoc) - * @see org.eclipse.ice.datastructures.entry.IEntry#accept(org.eclipse.ice.datastructures.entry.IEntryVisitor) + * + * @see org.eclipse.january.form.IEntry#accept(org.eclipse.january.form. + * IEntryVisitor) */ @Override public void accept(IEntryVisitor visitor) { diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/TreeComposite.java b/org.eclipse.january.form/src/org/eclipse/january/form/TreeComposite.java index 478dd8e9..e4afbc53 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/TreeComposite.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/TreeComposite.java @@ -31,11 +31,11 @@ /** * The TreeComposite realizes the Composite interface to provide a multi-level - * hierarchical tree of January Components. TreeComposites are n-ary trees, meaning - * that they can have any number of children and data per node. A "sibling" is a - * TreeComposite on the same level of the tree as the current TreeComposite and - * a "child" is a subordinate TreeComposite contained in the set managed by the - * current TreeComposite. + * hierarchical tree of January Components. TreeComposites are n-ary trees, + * meaning that they can have any number of children and data per node. A + * "sibling" is a TreeComposite on the same level of the tree as the current + * TreeComposite and a "child" is a subordinate TreeComposite contained in the + * set managed by the current TreeComposite. *

*

* When a Component is added to a TreeComposite (keep in mind Composites are @@ -300,7 +300,7 @@ public void setParent(TreeComposite pNode) { *

* * @return - *

+ *

* The parent node. *

*/ @@ -314,7 +314,7 @@ public TreeComposite getParent() { *

* * @return - *

+ *

* The next child in the set of child TreeComposites or null if the * end of the set has been reached. *

@@ -417,7 +417,7 @@ && checkExemplars(cNode)) { *

* * @return - *

+ *

* The previous child in the set of child TreeComposites or null if * the iterator has returned to the beginning of the set. *

@@ -524,7 +524,7 @@ public void resetChildIterator() { * The index at which the desired child can be found. *

* @return - *

+ *

* The child or null if the index is out of bounds. *

*/ @@ -545,7 +545,7 @@ public TreeComposite getChildAtIndex(int index) { *

* * @return - *

+ *

* The next or "nearest right" sibling in the tree. *

*/ @@ -560,7 +560,7 @@ public TreeComposite getNextSibling() { *

* * @return - *

+ *

* The previous or "nearest left" sibling in the tree. *

*/ @@ -577,7 +577,7 @@ public TreeComposite getPreviousSibling() { *

* * @return - *

+ *

* The set of Components managed by the TreeComposite. *

*/ @@ -604,7 +604,7 @@ public int getNumberOfDataNodes() { *

* * @return - *

+ *

* The active data node or null if it has not been specified. *

*/ @@ -685,7 +685,7 @@ public void allowActiveDataNodes(boolean allow) { * compared. *

* @return - *

+ *

* True if the TreeComposites are equal, false otherwise. *

*/ @@ -731,7 +731,7 @@ public boolean equals(Object otherTreeComposite) { *

* * @return - *

+ *

* The hashcode. *

*/ @@ -899,7 +899,7 @@ public void copy(TreeComposite otherTreeComposite, boolean copyInPlace) { *

* * @return - *

+ *

* The deep-copy clone of this TreeComposite. *

*/ @@ -983,7 +983,7 @@ public void addChildExemplar(TreeComposite exemplar) { *

* * @return - *

+ *

* The set of exemplar child types ("set of exemplars"). *

*/ @@ -1001,7 +1001,7 @@ public ArrayList getChildExemplars() { *

* * @return - *

+ *

* True if the exemplars exist, false otherwise. *

*/ @@ -1016,7 +1016,7 @@ public boolean hasChildExemplars() { *

* * @return - *

+ *

* True if Active, false if not *

*/ @@ -1338,8 +1338,8 @@ public void visit(IReactorComponent component) { * (non-Javadoc) * * @see - * org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor#visit - * (org.eclipse.ice.datastructures.form.TimeDataComponent) + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .TimeDataComponent) */ @Override public void visit(TimeDataComponent component) { @@ -1413,12 +1413,26 @@ public void unregister(IUpdateableListener listener) { return; } + /* + * (non-Javadoc) + * + * @see + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .emf.EMFComponent) + */ @Override public void visit(EMFComponent component) { // TODO Auto-generated method stub } + /* + * (non-Javadoc) + * + * @see + * org.eclipse.january.form.IComponentVisitor#visit(org.eclipse.january.form + * .ListComponent) + */ @Override public void visit(ListComponent component) { // TODO Auto-generated method stub diff --git a/org.eclipse.january.form/src/org/eclipse/january/form/VizResource.java b/org.eclipse.january.form/src/org/eclipse/january/form/VizResource.java index 7862c70a..db9b94f9 100644 --- a/org.eclipse.january.form/src/org/eclipse/january/form/VizResource.java +++ b/org.eclipse.january.form/src/org/eclipse/january/form/VizResource.java @@ -30,7 +30,7 @@ * */ @XmlRootElement(name = "VizResource") -public class VizResource extends JanuaryResource{ +public class VizResource extends JanuaryResource { /** * The set of files contained associated with this resource @@ -97,15 +97,20 @@ public VizResource(File resourceFile, ArrayList children) } - /* (non-Javadoc) - * @see org.eclipse.ice.datastructures.resource.IVizResource#getChildrenResources() + /** + * Return any possible children VizResources. + * + * @return A list containing child viz resources. */ public ArrayList getChildrenResources() { return childrenResources; } - /* (non-Javadoc) - * @see org.eclipse.ice.datastructures.resource.IVizResource#setFileSet(java.lang.String[]) + /** + * Mutator for the file set + * + * @param fileSet + * The list of file names to add to the file set */ public void setFileSet(String[] fileSet) { for (String i : fileSet) @@ -113,44 +118,60 @@ public void setFileSet(String[] fileSet) { this.fileSet = fileSet; } - /* (non-Javadoc) - * @see org.eclipse.ice.datastructures.resource.IVizResource#setFileSetTitle(java.lang.String) + /** + * Set the fileSetTitle + * + * @param title + * The String to use as the file set ID */ public void setFileSetTitle(String title) { fileSetTitle = title; } - /* (non-Javadoc) - * @see org.eclipse.ice.datastructures.resource.IVizResource#getFileSet() + /** + * Accessor for the file set + * + * @return The list of file names in the file set */ + public String[] getFileSet() { return this.fileSet; } - /* (non-Javadoc) - * @see org.eclipse.ice.datastructures.resource.IVizResource#getFileSetTitle() + /** + * Accessor for the file set's title + * + * @return The title used to identify the file set */ public String getFileSetTitle() { return this.fileSetTitle; } - /* (non-Javadoc) - * @see org.eclipse.ice.datastructures.resource.IVizResource#setHost(java.lang.String) + /** + * Set the remote file flag + * + * @param name + * The new name of the host. If local, use "localhost". Any other + * hostname will be treated as remote. */ public void setHost(String name) { host = name; return; } - /* (non-Javadoc) - * @see org.eclipse.ice.datastructures.resource.IVizResource#getHost() + /** + * Retrieve the name of the host for this file. + * + * @return The String for the name of the host machine. */ public String getHost() { return host; } - /* (non-Javadoc) - * @see org.eclipse.ice.datastructures.resource.IVizResource#isRemote() + /** + * Retrieve the flag signifying if this file is on a remote machine or not. + * + * @return True if this resource is on a remote machine; false otherwise */ public boolean isRemote() { return !"localhost".equals(host); @@ -224,8 +245,12 @@ public int hashCode() { } - /* (non-Javadoc) - * @see org.eclipse.ice.datastructures.resource.IVizResource#copy(org.eclipse.ice.datastructures.resource.VizResource) + /** + * This operation performs a deep copy of the attributes of another + * VizResource into the current VizResource. + * + * @param otherResource + * The other VizResource from which information should be copied. */ public void copy(VizResource otherResource) { diff --git a/org.eclipse.january.geometry.dsl.iges.tests/pom.xml b/org.eclipse.january.geometry.dsl.iges.tests/pom.xml index bddc245d..d11bec21 100644 --- a/org.eclipse.january.geometry.dsl.iges.tests/pom.xml +++ b/org.eclipse.january.geometry.dsl.iges.tests/pom.xml @@ -4,9 +4,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - ../releng/org.eclipse.january.releng/pom.xml + ../releng/org.eclipse.january.forms.releng/pom.xml org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT org.eclipse.january.test.geometry.dsl.iges diff --git a/org.eclipse.january.geometry.dsl.iges/pom.xml b/org.eclipse.january.geometry.dsl.iges/pom.xml index 7488bd83..9d1e76f6 100644 --- a/org.eclipse.january.geometry.dsl.iges/pom.xml +++ b/org.eclipse.january.geometry.dsl.iges/pom.xml @@ -15,9 +15,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - ../releng/org.eclipse.january.releng/pom.xml + ../releng/org.eclipse.january.forms.releng/pom.xml org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT org.eclipse.january.geometry.dsl.iges diff --git a/org.eclipse.january.geometry.dsl.mtl/pom.xml b/org.eclipse.january.geometry.dsl.mtl/pom.xml index 82b7e391..5710a046 100644 --- a/org.eclipse.january.geometry.dsl.mtl/pom.xml +++ b/org.eclipse.january.geometry.dsl.mtl/pom.xml @@ -15,9 +15,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - ../releng/org.eclipse.january.releng/pom.xml + ../releng/org.eclipse.january.forms.releng/pom.xml org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT org.eclipse.january.geometry.dsl.mtl diff --git a/org.eclipse.january.geometry.dsl.obj.test/pom.xml b/org.eclipse.january.geometry.dsl.obj.test/pom.xml index ff5f56e5..af8ec2d3 100644 --- a/org.eclipse.january.geometry.dsl.obj.test/pom.xml +++ b/org.eclipse.january.geometry.dsl.obj.test/pom.xml @@ -4,9 +4,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - ../releng/org.eclipse.january.releng/pom.xml + ../releng/org.eclipse.january.forms.releng/pom.xml org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT org.eclipse.january.test.geometry.dsl.obj diff --git a/org.eclipse.january.geometry.dsl.obj/pom.xml b/org.eclipse.january.geometry.dsl.obj/pom.xml index a2b56af3..042223fc 100644 --- a/org.eclipse.january.geometry.dsl.obj/pom.xml +++ b/org.eclipse.january.geometry.dsl.obj/pom.xml @@ -15,9 +15,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - ../releng/org.eclipse.january.releng/pom.xml + ../releng/org.eclipse.january.forms.releng/pom.xml org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT org.eclipse.january.geometry.dsl.obj diff --git a/org.eclipse.january.geometry.dsl.obj/src/org/eclipse/january/geometry/dsl/obj/service/OBJGeometryImporterService.java b/org.eclipse.january.geometry.dsl.obj/src/org/eclipse/january/geometry/dsl/obj/service/OBJGeometryImporterService.java index 5e278ac0..c4babeef 100644 --- a/org.eclipse.january.geometry.dsl.obj/src/org/eclipse/january/geometry/dsl/obj/service/OBJGeometryImporterService.java +++ b/org.eclipse.january.geometry.dsl.obj/src/org/eclipse/january/geometry/dsl/obj/service/OBJGeometryImporterService.java @@ -30,7 +30,7 @@ public class OBJGeometryImporterService implements IGeometryImporterService { * (non-Javadoc) * * @see - * org.eclipse.eavp.viz.service.geometry.importers.IGeometryImporterService# + * org.eclipse.january.geometry.model.importer.IGeometryImporterService# * getName() */ @Override @@ -42,7 +42,7 @@ public String getName() { * (non-Javadoc) * * @see - * org.eclipse.eavp.viz.service.geometry.importers.IGeometryImporterService# + * org.eclipse.january.geometry.model.importer.IGeometryImporterService# * importFile(java.nio.file.Path) */ @Override @@ -54,7 +54,7 @@ public Geometry importFile(Path path) { * (non-Javadoc) * * @see - * org.eclipse.eavp.viz.service.geometry.importers.IGeometryImporterService# + * org.eclipse.january.geometry.model.importer.IGeometryImporterService# * getSupportedExtensions() */ @Override diff --git a/org.eclipse.january.geometry.dsl.vtk.tests/pom.xml b/org.eclipse.january.geometry.dsl.vtk.tests/pom.xml index a20f4732..69541cc3 100644 --- a/org.eclipse.january.geometry.dsl.vtk.tests/pom.xml +++ b/org.eclipse.january.geometry.dsl.vtk.tests/pom.xml @@ -4,12 +4,12 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - ../releng/org.eclipse.january.releng/pom.xml + ../releng/org.eclipse.january.forms.releng/pom.xml org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT - org.eclipse.eavp + org.eclipse.january org.eclipse.january.test.geometry.dsl.vtk eclipse-test-plugin diff --git a/org.eclipse.january.geometry.dsl.vtk/pom.xml b/org.eclipse.january.geometry.dsl.vtk/pom.xml index 51094f17..5b7be299 100644 --- a/org.eclipse.january.geometry.dsl.vtk/pom.xml +++ b/org.eclipse.january.geometry.dsl.vtk/pom.xml @@ -15,12 +15,12 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - ../releng/org.eclipse.january.releng/pom.xml + ../releng/org.eclipse.january.forms.releng/pom.xml org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT - org.eclipse.eavp + org.eclipse.january org.eclipse.january.geometry.dsl.vtk eclipse-plugin diff --git a/org.eclipse.january.geometry.dsl.vtk/src/org/eclipse/january/geometry/dsl/vtk/service/VTKGeometryImporterService.java b/org.eclipse.january.geometry.dsl.vtk/src/org/eclipse/january/geometry/dsl/vtk/service/VTKGeometryImporterService.java index d3464b76..5d001e79 100644 --- a/org.eclipse.january.geometry.dsl.vtk/src/org/eclipse/january/geometry/dsl/vtk/service/VTKGeometryImporterService.java +++ b/org.eclipse.january.geometry.dsl.vtk/src/org/eclipse/january/geometry/dsl/vtk/service/VTKGeometryImporterService.java @@ -31,7 +31,7 @@ public class VTKGeometryImporterService implements IGeometryImporterService { * (non-Javadoc) * * @see - * org.eclipse.eavp.viz.service.geometry.importers.IGeometryImporterService# + * org.eclipse.january.geometry.model.importer.IGeometryImporterService# * getName() */ @Override @@ -43,7 +43,7 @@ public String getName() { * (non-Javadoc) * * @see - * org.eclipse.eavp.viz.service.geometry.importers.IGeometryImporterService# + * org.eclipse.january.geometry.model.importer.IGeometryImporterService# * importFile(java.nio.file.Path) */ @Override @@ -55,7 +55,7 @@ public Geometry importFile(Path path) { * (non-Javadoc) * * @see - * org.eclipse.eavp.viz.service.geometry.importers.IGeometryImporterService# + * org.eclipse.january.geometry.model.importer.IGeometryImporterService# * getSupportedExtensions() */ @Override @@ -66,4 +66,3 @@ public Set getSupportedExtensions() { } } - diff --git a/org.eclipse.january.geometry.model.tests/pom.xml b/org.eclipse.january.geometry.model.tests/pom.xml index 952ed241..f019236a 100644 --- a/org.eclipse.january.geometry.model.tests/pom.xml +++ b/org.eclipse.january.geometry.model.tests/pom.xml @@ -4,9 +4,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - ../releng/org.eclipse.january.releng/pom.xml + ../releng/org.eclipse.january.forms.releng/pom.xml org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT org.eclipse.january.geometry.model.tests diff --git a/org.eclipse.january.geometry.model/pom.xml b/org.eclipse.january.geometry.model/pom.xml index 6a75fa75..413ea97f 100644 --- a/org.eclipse.january.geometry.model/pom.xml +++ b/org.eclipse.january.geometry.model/pom.xml @@ -15,9 +15,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - ../releng/org.eclipse.january.releng/pom.xml + ../releng/org.eclipse.january.forms.releng/pom.xml org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT org.eclipse.january.geometry.model diff --git a/org.eclipse.january.geometry.model/src/org/eclipse/january/geometry/model/importer/BasicGeometryImporterServiceFactory.java b/org.eclipse.january.geometry.model/src/org/eclipse/january/geometry/model/importer/BasicGeometryImporterServiceFactory.java index 5d8b5110..df92f658 100644 --- a/org.eclipse.january.geometry.model/src/org/eclipse/january/geometry/model/importer/BasicGeometryImporterServiceFactory.java +++ b/org.eclipse.january.geometry.model/src/org/eclipse/january/geometry/model/importer/BasicGeometryImporterServiceFactory.java @@ -37,7 +37,7 @@ public BasicGeometryImporterServiceFactory() { /* * (non-Javadoc) * - * @see org.eclipse.eavp.viz.service.geometry.importers. + * @see org.eclipse.january.geometry.model.importer. * IGeometryImporterServiceFactory#get(java.lang.String) */ @Override @@ -48,7 +48,7 @@ public IGeometryImporterService get(String name) { /* * (non-Javadoc) * - * @see org.eclipse.eavp.viz.service.geometry.importers. + * @see org.eclipse.january.geometry.model.importer. * IGeometryImporterServiceFactory#getAll() */ @Override @@ -59,9 +59,9 @@ public Collection getAll() { /* * (non-Javadoc) * - * @see org.eclipse.eavp.viz.service.geometry.importers. - * IGeometryImporterServiceFactory#register(org.eclipse.eavp.viz.service. - * geometry.importers.IGeometryImporterService) + * @see org.eclipse.january.geometry.model.importer. + * IGeometryImporterServiceFactory#register(org.eclipse.january.geometry. + * model.importer.IGeometryImporterService) */ @Override public void register(IGeometryImporterService service) { @@ -81,9 +81,9 @@ public void start() { /* * (non-Javadoc) * - * @see org.eclipse.eavp.viz.service.geometry.importers. - * IGeometryImporterServiceFactory#unregister(org.eclipse.eavp.viz.service. - * geometry.importers.IGeometryImporterService) + * @see org.eclipse.january.geometry.model.importer. + * IGeometryImporterServiceFactory#unregister(org.eclipse.january.geometry. + * model.importer.IGeometryImporterService) */ @Override public void unregister(IGeometryImporterService service) { diff --git a/org.eclipse.january.geometry.model/src/org/eclipse/january/geometry/service/STLGeometryImporterService.java b/org.eclipse.january.geometry.model/src/org/eclipse/january/geometry/service/STLGeometryImporterService.java index 3e459ff2..89e39f37 100644 --- a/org.eclipse.january.geometry.model/src/org/eclipse/january/geometry/service/STLGeometryImporterService.java +++ b/org.eclipse.january.geometry.model/src/org/eclipse/january/geometry/service/STLGeometryImporterService.java @@ -30,7 +30,7 @@ public class STLGeometryImporterService implements IGeometryImporterService { * (non-Javadoc) * * @see - * org.eclipse.eavp.viz.service.geometry.importers.IGeometryImporterService# + * org.eclipse.january.geometry.model.importer.IGeometryImporterService# * getName() */ @Override @@ -42,7 +42,7 @@ public String getName() { * (non-Javadoc) * * @see - * org.eclipse.eavp.viz.service.geometry.importers.IGeometryImporterService# + * org.eclipse.january.geometry.model.importer.IGeometryImporterService# * importFile(java.nio.file.Path) */ @Override @@ -54,7 +54,7 @@ public Geometry importFile(Path path) { * (non-Javadoc) * * @see - * org.eclipse.eavp.viz.service.geometry.importers.IGeometryImporterService# + * org.eclipse.january.geometry.model.importer.IGeometryImporterService# * getSupportedExtensions() */ @Override diff --git a/pom.xml b/pom.xml index 0bccc954..8cb59932 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,6 @@ pom - releng/org.eclipse.january.releng + releng/org.eclipse.january.forms.releng diff --git a/releng/org.eclipse.january.releng.p2/.gitignore b/releng/org.eclipse.january.forms.releng.p2/.gitignore similarity index 100% rename from releng/org.eclipse.january.releng.p2/.gitignore rename to releng/org.eclipse.january.forms.releng.p2/.gitignore diff --git a/releng/org.eclipse.january.releng.p2/.project b/releng/org.eclipse.january.forms.releng.p2/.project similarity index 78% rename from releng/org.eclipse.january.releng.p2/.project rename to releng/org.eclipse.january.forms.releng.p2/.project index cd4fea07..3663dcc7 100644 --- a/releng/org.eclipse.january.releng.p2/.project +++ b/releng/org.eclipse.january.forms.releng.p2/.project @@ -1,6 +1,6 @@ - org.eclipse.january.releng.p2 + org.eclipse.january.forms.releng.p2 diff --git a/releng/org.eclipse.january.releng.p2/category.xml b/releng/org.eclipse.january.forms.releng.p2/category.xml similarity index 100% rename from releng/org.eclipse.january.releng.p2/category.xml rename to releng/org.eclipse.january.forms.releng.p2/category.xml diff --git a/releng/org.eclipse.january.releng.p2/pom.xml b/releng/org.eclipse.january.forms.releng.p2/pom.xml similarity index 81% rename from releng/org.eclipse.january.releng.p2/pom.xml rename to releng/org.eclipse.january.forms.releng.p2/pom.xml index 2b731f24..0c3dfd99 100644 --- a/releng/org.eclipse.january.releng.p2/pom.xml +++ b/releng/org.eclipse.january.forms.releng.p2/pom.xml @@ -13,12 +13,12 @@ 4.0.0 - org.eclipse.january.releng.p2 + org.eclipse.january.forms.releng.p2 eclipse-repository org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT - ../org.eclipse.january.releng + ../org.eclipse.january.forms.releng diff --git a/releng/org.eclipse.january.releng.target/.gitignore b/releng/org.eclipse.january.forms.releng.target/.gitignore similarity index 100% rename from releng/org.eclipse.january.releng.target/.gitignore rename to releng/org.eclipse.january.forms.releng.target/.gitignore diff --git a/releng/org.eclipse.january.releng.target/.project b/releng/org.eclipse.january.forms.releng.target/.project similarity index 76% rename from releng/org.eclipse.january.releng.target/.project rename to releng/org.eclipse.january.forms.releng.target/.project index 08ecdac3..6f4df4bf 100644 --- a/releng/org.eclipse.january.releng.target/.project +++ b/releng/org.eclipse.january.forms.releng.target/.project @@ -1,6 +1,6 @@ - org.eclipse.january.releng.target + org.eclipse.january.forms.releng.target diff --git a/releng/org.eclipse.january.releng.target/org.eclipse.january.releng.target.target b/releng/org.eclipse.january.forms.releng.target/org.eclipse.january.forms.releng.target.target similarity index 100% rename from releng/org.eclipse.january.releng.target/org.eclipse.january.releng.target.target rename to releng/org.eclipse.january.forms.releng.target/org.eclipse.january.forms.releng.target.target diff --git a/releng/org.eclipse.january.releng.target/org.eclipse.january.releng.target.tpd b/releng/org.eclipse.january.forms.releng.target/org.eclipse.january.forms.releng.target.tpd similarity index 100% rename from releng/org.eclipse.january.releng.target/org.eclipse.january.releng.target.tpd rename to releng/org.eclipse.january.forms.releng.target/org.eclipse.january.forms.releng.target.tpd diff --git a/releng/org.eclipse.january.releng.target/pom.xml b/releng/org.eclipse.january.forms.releng.target/pom.xml similarity index 81% rename from releng/org.eclipse.january.releng.target/pom.xml rename to releng/org.eclipse.january.forms.releng.target/pom.xml index b389661c..d9c9cf9b 100644 --- a/releng/org.eclipse.january.releng.target/pom.xml +++ b/releng/org.eclipse.january.forms.releng.target/pom.xml @@ -13,12 +13,12 @@ 4.0.0 - org.eclipse.january.releng.target + org.eclipse.january.forms.releng.target eclipse-target-definition org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT - ../org.eclipse.january.releng + ../org.eclipse.january.forms.releng diff --git a/releng/org.eclipse.january.releng/.gitignore b/releng/org.eclipse.january.forms.releng/.gitignore similarity index 100% rename from releng/org.eclipse.january.releng/.gitignore rename to releng/org.eclipse.january.forms.releng/.gitignore diff --git a/releng/org.eclipse.january.releng/.project b/releng/org.eclipse.january.forms.releng/.project similarity index 94% rename from releng/org.eclipse.january.releng/.project rename to releng/org.eclipse.january.forms.releng/.project index 2bb5e2bc..9937f700 100644 --- a/releng/org.eclipse.january.releng/.project +++ b/releng/org.eclipse.january.forms.releng/.project @@ -1,6 +1,6 @@ - org.eclipse.january.releng + org.eclipse.january.forms.releng diff --git a/releng/org.eclipse.january.releng/pom.xml b/releng/org.eclipse.january.forms.releng/pom.xml similarity index 96% rename from releng/org.eclipse.january.releng/pom.xml rename to releng/org.eclipse.january.forms.releng/pom.xml index e388363c..f4d33ff6 100644 --- a/releng/org.eclipse.january.releng/pom.xml +++ b/releng/org.eclipse.january.forms.releng/pom.xml @@ -14,7 +14,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.eclipse.january - org.eclipse.january.releng + org.eclipse.january.forms.releng 2.1.0-SNAPSHOT pom @@ -64,7 +64,7 @@ org.eclipse.january - org.eclipse.january.releng.target + org.eclipse.january.forms.releng.target 2.1.0-SNAPSHOT @@ -199,8 +199,8 @@ ../../org.eclipse.january.geometry.dsl.vtk.tests - ../org.eclipse.january.releng.target - ../org.eclipse.january.releng.p2 + ../org.eclipse.january.forms.releng.target + ../org.eclipse.january.forms.releng.p2