git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Status is now in otherData of feature
[jalview.git]
/
src
/
jalview
/
datamodel
/
SequenceFeature.java
diff --git
a/src/jalview/datamodel/SequenceFeature.java
b/src/jalview/datamodel/SequenceFeature.java
index
b054ea1
..
3d8744f
100755
(executable)
--- a/
src/jalview/datamodel/SequenceFeature.java
+++ b/
src/jalview/datamodel/SequenceFeature.java
@@
-33,7
+33,6
@@
public class SequenceFeature
public float score;
\r
public String type;
\r
public String description;
\r
public float score;
\r
public String type;
\r
public String description;
\r
- public String status;
\r
Hashtable otherDetails;
\r
public java.util.Vector links;
\r
\r
Hashtable otherDetails;
\r
public java.util.Vector links;
\r
\r
@@
-52,11
+51,14
@@
public class SequenceFeature
{
\r
this.type = type;
\r
this.description = desc;
\r
{
\r
this.type = type;
\r
this.description = desc;
\r
- this.status = status;
\r
+ if(status!=null)
\r
+ setValue("status", status);
\r
+
\r
this.begin = begin;
\r
this.end = end;
\r
this.featureGroup = featureGroup;
\r
}
\r
this.begin = begin;
\r
this.end = end;
\r
this.featureGroup = featureGroup;
\r
}
\r
+
\r
public SequenceFeature(String type,
\r
String desc,
\r
int begin, int end,
\r
public SequenceFeature(String type,
\r
String desc,
\r
int begin, int end,
\r
@@
-65,7
+67,6
@@
public class SequenceFeature
{
\r
this.type = type;
\r
this.description = desc;
\r
{
\r
this.type = type;
\r
this.description = desc;
\r
- this.status = status;
\r
this.begin = begin;
\r
this.end = end;
\r
this.score = score;
\r
this.begin = begin;
\r
this.end = end;
\r
this.score = score;
\r
@@
-79,8
+80,8
@@
public class SequenceFeature
return false;
\r
\r
\r
return false;
\r
\r
\r
- if(!(type+description+status).equals
\r
- (sf.type+sf.description+sf.status))
\r
+ if(!(type+description).equals
\r
+ (sf.type+sf.description))
\r
return false;
\r
\r
return true;
\r
return false;
\r
\r
return true;
\r
@@
-147,21
+148,6
@@
public class SequenceFeature
description = desc;
\r
}
\r
\r
description = desc;
\r
}
\r
\r
- /**
\r
- * DOCUMENT ME!
\r
- *
\r
- * @return DOCUMENT ME!
\r
- */
\r
- public String getStatus()
\r
- {
\r
- return status;
\r
- }
\r
-
\r
- public void setStatus(String status)
\r
- {
\r
- this.status = status;
\r
- }
\r
-
\r
public String getFeatureGroup()
\r
{
\r
return featureGroup;
\r
public String getFeatureGroup()
\r
{
\r
return featureGroup;
\r