git://source.jalview.org
/
vamsas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lost from new schema
[vamsas.git]
/
src
/
org
/
vamsas
/
objects
/
core
/
DataSetAnnotations.java
diff --git
a/src/org/vamsas/objects/core/DataSetAnnotations.java
b/src/org/vamsas/objects/core/DataSetAnnotations.java
index
60f2d84
..
cea5a3b
100644
(file)
--- a/
src/org/vamsas/objects/core/DataSetAnnotations.java
+++ b/
src/org/vamsas/objects/core/DataSetAnnotations.java
@@
-45,12
+45,22
@@
implements java.io.Serializable
/**
* Field _end
*/
/**
* Field _end
*/
- private java.lang.String _end;
+ private int _end;
+
+ /**
+ * keeps track of state for field: _end
+ */
+ private boolean _has_end;
/**
* Field _begin
*/
/**
* Field _begin
*/
- private java.lang.String _begin;
+ private int _begin;
+
+ /**
+ * keeps track of state for field: _begin
+ */
+ private boolean _has_begin;
/**
* Field _seqRef
/**
* Field _seqRef
@@
-154,6
+164,24
@@
implements java.io.Serializable
} //-- void addProvenance(int, org.vamsas.objects.core.Provenance)
/**
} //-- void addProvenance(int, org.vamsas.objects.core.Provenance)
/**
+ * Method deleteBegin
+ *
+ */
+ public void deleteBegin()
+ {
+ this._has_begin= false;
+ } //-- void deleteBegin()
+
+ /**
+ * Method deleteEnd
+ *
+ */
+ public void deleteEnd()
+ {
+ this._has_end= false;
+ } //-- void deleteEnd()
+
+ /**
* Method enumerateAnnotationElement
*
*
* Method enumerateAnnotationElement
*
*
@@
-201,19
+229,13
@@
implements java.io.Serializable
}
else if (temp._type != null)
return false;
}
else if (temp._type != null)
return false;
- if (this._end != null) {
- if (temp._end == null) return false;
- else if (!(this._end.equals(temp._end)))
- return false;
- }
- else if (temp._end != null)
+ if (this._end != temp._end)
return false;
return false;
- if (this._begin != null) {
- if (temp._begin == null) return false;
- else if (!(this._begin.equals(temp._begin)))
- return false;
- }
- else if (temp._begin != null)
+ if (this._has_end != temp._has_end)
+ return false;
+ if (this._begin != temp._begin)
+ return false;
+ if (this._has_begin != temp._has_begin)
return false;
if (this._seqRef != null) {
if (temp._seqRef == null) return false;
return false;
if (this._seqRef != null) {
if (temp._seqRef == null) return false;
@@
-313,13
+335,13
@@
implements java.io.Serializable
/**
* Returns the value of field 'begin'.
*
/**
* Returns the value of field 'begin'.
*
- * @return String
+ * @return int
* @return the value of field 'begin'.
*/
* @return the value of field 'begin'.
*/
- public java.lang.String getBegin()
+ public int getBegin()
{
return this._begin;
{
return this._begin;
- } //-- java.lang.String getBegin()
+ } //-- int getBegin()
/**
* Returns the value of field 'description'.
/**
* Returns the value of field 'description'.
@@
-335,13
+357,13
@@
implements java.io.Serializable
/**
* Returns the value of field 'end'.
*
/**
* Returns the value of field 'end'.
*
- * @return String
+ * @return int
* @return the value of field 'end'.
*/
* @return the value of field 'end'.
*/
- public java.lang.String getEnd()
+ public int getEnd()
{
return this._end;
{
return this._end;
- } //-- java.lang.String getEnd()
+ } //-- int getEnd()
/**
* Returns the value of field 'id'.
/**
* Returns the value of field 'id'.
@@
-436,6
+458,30
@@
implements java.io.Serializable
} //-- java.lang.String getType()
/**
} //-- java.lang.String getType()
/**
+ * Method hasBegin
+ *
+ *
+ *
+ * @return boolean
+ */
+ public boolean hasBegin()
+ {
+ return this._has_begin;
+ } //-- boolean hasBegin()
+
+ /**
+ * Method hasEnd
+ *
+ *
+ *
+ * @return boolean
+ */
+ public boolean hasEnd()
+ {
+ return this._has_end;
+ } //-- boolean hasEnd()
+
+ /**
* Method isValid
*
*
* Method isValid
*
*
@@
-568,10
+614,11
@@
implements java.io.Serializable
*
* @param begin the value of field 'begin'.
*/
*
* @param begin the value of field 'begin'.
*/
- public void setBegin(java.lang.String begin)
+ public void setBegin(int begin)
{
this._begin = begin;
{
this._begin = begin;
- } //-- void setBegin(java.lang.String)
+ this._has_begin = true;
+ } //-- void setBegin(int)
/**
* Sets the value of field 'description'.
/**
* Sets the value of field 'description'.
@@
-588,10
+635,11
@@
implements java.io.Serializable
*
* @param end the value of field 'end'.
*/
*
* @param end the value of field 'end'.
*/
- public void setEnd(java.lang.String end)
+ public void setEnd(int end)
{
this._end = end;
{
this._end = end;
- } //-- void setEnd(java.lang.String)
+ this._has_end = true;
+ } //-- void setEnd(int)
/**
* Sets the value of field 'id'.
/**
* Sets the value of field 'id'.