[MOBY-guts] biomoby commit
Martin Senger
senger at pub.open-bio.org
Thu May 19 15:57:26 UTC 2005
senger
Thu May 19 11:57:26 EDT 2005
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data
In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/shared/data
Modified Files:
MobyDataBytes.java MobyDataComposite.java
MobyDataDateTime.java MobyDataFloat.java MobyDataInt.java
MobyDataObject.java MobyDataObjectSet.java MobyDataString.java
MobyDataXref.java
Log Message:
moby-live/Java/src/main/org/biomoby/shared/data MobyDataBytes.java,1.1,1.2 MobyDataComposite.java,1.1,1.2 MobyDataDateTime.java,1.1,1.2 MobyDataFloat.java,1.1,1.2 MobyDataInt.java,1.1,1.2 MobyDataObject.java,1.1,1.2 MobyDataObjectSet.java,1.1,1.2 MobyDataString.java,1.1,1.2 MobyDataXref.java,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBytes.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBytes.java 2005/05/12 04:59:49 1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBytes.java 2005/05/19 15:57:26 1.2
@@ -27,7 +27,7 @@
/**
* Construct the object using a DOM fragment.
*
- * @throw IllegalArgumentException if the element is not a text-base64 tag
+ * @throws IllegalArgumentException if the element is not a text-base64 tag
*/
public MobyDataBytes(org.w3c.dom.Element element) throws IllegalArgumentException{
this(getName(element), getTextContents(element));
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java 2005/05/12 04:59:49 1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java 2005/05/19 15:57:26 1.2
@@ -28,7 +28,7 @@
/**
* Construct the object using a DOM fragment.
*
- * @throw IllegalArgumentException if the element is not a MobyObject tag
+ * @throws IllegalArgumentException if the element is not a MobyObject tag
*/
public MobyDataComposite(org.w3c.dom.Element element) throws IllegalArgumentException{
this(new MobyDataType(element.getLocalName()), getName(element), getNamespace(element), getId(element));
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java 2005/05/12 04:59:49 1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java 2005/05/19 15:57:26 1.2
@@ -31,7 +31,7 @@
/**
* Construct the object using a DOM fragment.
*
- * @throw IllegalArgumentException if the element is not a DateTime tag, or the text children of the element do not encode a valid ISO8601 date/time
+ * @throws IllegalArgumentException if the element is not a DateTime tag, or the text children of the element do not encode a valid ISO8601 date/time
*/
public MobyDataDateTime(org.w3c.dom.Element element) throws IllegalArgumentException{
this(getName(element), getTextContents(element));
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java 2005/05/12 04:59:49 1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java 2005/05/19 15:57:26 1.2
@@ -23,7 +23,7 @@
/**
* Construct the object using a DOM fragment.
*
- * @throw IllegalArgumentException if the element is not a Float tag
+ * @throws IllegalArgumentException if the element is not a Float tag
*/
public MobyDataFloat(org.w3c.dom.Element element) throws IllegalArgumentException{
this(getName(element), getTextContents(element));
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java 2005/05/12 04:59:49 1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java 2005/05/19 15:57:26 1.2
@@ -23,7 +23,7 @@
/**
* Construct the object using a DOM fragment.
*
- * @throw IllegalArgumentException if the element is not a Integer tag
+ * @throws IllegalArgumentException if the element is not a Integer tag
*/
public MobyDataInt(org.w3c.dom.Element element) throws IllegalArgumentException{
this(getName(element), getTextContents(element));
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java 2005/05/12 04:59:49 1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java 2005/05/19 15:57:26 1.2
@@ -45,7 +45,7 @@
/**
* Construct the object using a DOM fragment.
*
- * @throw IllegalArgumentException if the element is not an Object tag
+ * @throws IllegalArgumentException if the element is not an Object tag
*/
public MobyDataObject(Element element) throws IllegalArgumentException{
this(getNamespace(element).getName(), getId(element));
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSet.java 2005/05/12 04:59:49 1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSet.java 2005/05/19 15:57:26 1.2
@@ -52,7 +52,7 @@
/**
* Creates a collection with a name, initializing the members with the given array
*
- * @throw NullPointerException if the input array is null, or contains null elements
+ * @throws NullPointerException if the input array is null, or contains null elements
*/
public MobyDataObjectSet(String name, MobyDataObject[] values) throws NullPointerException{
this(name);
@@ -64,8 +64,8 @@
*
* @param c usually another MobyDataObjectSet, or a Vector of MobyDataObjects
*
- * @throw ClassCastException if a member of the input collection is not a MobyDataObject
- * @throw NullPointerException if the collection or one of its members is a null object
+ * @throws ClassCastException if a member of the input collection is not a MobyDataObject
+ * @throws NullPointerException if the collection or one of its members is a null object
*/
public MobyDataObjectSet(String name, Collection c) throws ClassCastException, NullPointerException{
this(name);
@@ -75,7 +75,7 @@
/**
* Replace whatever is in the collection right now with the values in the input array.
*
- * @throw NullPointerException if the input array is null, or contains null elements
+ * @throws NullPointerException if the input array is null, or contains null elements
*/
public void setElements(MobyDataObject[] values) throws NullPointerException{
if(values == null){
@@ -139,8 +139,8 @@
/**
* Add a single MobyDataObject to the collection.
*
- * @throw ClassCastException if the input is not a MobyDataObject
- * @throw NullPointerException if the input is a null object
+ * @throws ClassCastException if the input is not a MobyDataObject
+ * @throws NullPointerException if the input is a null object
*/
public boolean add(Object mdsi) throws ClassCastException, NullPointerException{
checkInputClass("add", mdsi);
@@ -153,8 +153,8 @@
* (usually a MobyDataObjectSet, or a Vector of MobyDataObjects)
* to this collection.
*
- * @throw ClassCastException if a member of the input collection is not a MobyDataObject
- * @throw NullPointerException if the collection or one of its members is a null object
+ * @throws ClassCastException if a member of the input collection is not a MobyDataObject
+ * @throws NullPointerException if the collection or one of its members is a null object
* @return true if the collection changes as a result of the operation
*/
public boolean addAll(Collection c) throws ClassCastException, NullPointerException{
@@ -172,8 +172,8 @@
/**
* @return true if this collection contains an element with the exact same value (equivalent in MOBY XML representation, including name)
- * @throw ClassCastException if the input is not a MobyDataObject
- * @throw NullPointerException if the input is a null object
+ * @throws ClassCastException if the input is not a MobyDataObject
+ * @throws NullPointerException if the input is a null object
*/
public boolean contains(Object mdsi) throws ClassCastException, NullPointerException{
checkInputClass("check for the presence of", mdsi);
@@ -183,8 +183,8 @@
/**
* @return true if each element in the input collection returns true when contains(Object o) is called
- * @throw ClassCastException if a member of the input collection is not a MobyDataObject
- * @throw NullPointerException if the collection or one of its members is a null object
+ * @throws ClassCastException if a member of the input collection is not a MobyDataObject
+ * @throws NullPointerException if the collection or one of its members is a null object
*/
public boolean containsAll(Collection c) throws ClassCastException, NullPointerException{
checkCollectionClass("check for presence of", c);
@@ -198,8 +198,8 @@
* to convert into an array for sorting.
*
* @return true if and only if the input object is a MobyDataObjectSet, and the two collections contain exactly equal elements from a MOBY XML perspective
- * @throw ClassCastException if the input is not a Collection of MobyDataObjects
- * @throw NullPointerException if the input is a null object
+ * @throws ClassCastException if the input is not a Collection of MobyDataObjects
+ * @throws NullPointerException if the input is a null object
*/
public boolean equals(Object set) throws ClassCastException, NullPointerException{
if(!(set instanceof Collection)){
@@ -259,8 +259,8 @@
*
* @param mdsi the MobyDataObject whose value equivalent (not object reference) is to be removed
* @return true if the element was found and removed
- * @throw ClassCastException if the input is not a MobyDataObject
- * @throw NullPointerException if the input is a null object
+ * @throws ClassCastException if the input is not a MobyDataObject
+ * @throws NullPointerException if the input is a null object
*/
public boolean remove(Object mdsi) throws ClassCastException, NullPointerException{
checkInputClass("remove", mdsi);
@@ -272,8 +272,8 @@
* Set theory subtraction operator implementation.
*
* @return true if this collection changed as a result of the call
- * @throw ClassCastException if a member of the input collection is not a MobyDataObject
- * @throw NullPointerException if the collection or one of its members is a null object
+ * @throws ClassCastException if a member of the input collection is not a MobyDataObject
+ * @throws NullPointerException if the collection or one of its members is a null object
*/
public boolean removeAll(Collection c) throws ClassCastException, NullPointerException{
checkCollectionClass("remove", c);
@@ -285,8 +285,8 @@
* Set theory intersection operator implementation.
*
* @return true if this collection changed as a result of the call
- * @throw ClassCastException if a member of the input collection is not a MobyDataObject
- * @throw NullPointerException if the collection or one of its members is a null object
+ * @throws ClassCastException if a member of the input collection is not a MobyDataObject
+ * @throws NullPointerException if the collection or one of its members is a null object
*/
public boolean retainAll(Collection c){
checkCollectionClass("intersect", c);
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java 2005/05/12 04:59:49 1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java 2005/05/19 15:57:26 1.2
@@ -18,7 +18,7 @@
/**
* Construct the object using a DOM fragment.
*
- * @throw IllegalArgumentException if the element is not a String tag
+ * @throws IllegalArgumentException if the element is not a String tag
*/
public MobyDataString(org.w3c.dom.Element element) throws IllegalArgumentException{
this(getName(element), getTextContents(element));
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataXref.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataXref.java 2005/05/12 04:59:49 1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataXref.java 2005/05/19 15:57:26 1.2
@@ -261,8 +261,8 @@
// If we are a service provider it should look like an Xref
if(isCRIBXML){
MobyService service = getService();
- MobyNamespace[] namespaces = getNamespaces();
- return "<Xref namespace='"+(namespaces == null ? null : namespaces[0])+
+ MobyNamespace[] myNamespaces = getNamespaces();
+ return "<Xref namespace='"+(myNamespaces == null ? null : myNamespaces[0])+
"' id='"+getId()+
"' authURI='"+(service == null ? null : service.getAuthority())+
"' serviceName='"+(service == null ? null : service.getName()) +
More information about the MOBY-guts
mailing list