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
removed some uncheck warnings
[jalview.git]
/
forester
/
java
/
src
/
org
/
forester
/
go
/
BasicGoRelationship.java
diff --git
a/forester/java/src/org/forester/go/BasicGoRelationship.java
b/forester/java/src/org/forester/go/BasicGoRelationship.java
index
69d612f
..
d539947
100644
(file)
--- a/
forester/java/src/org/forester/go/BasicGoRelationship.java
+++ b/
forester/java/src/org/forester/go/BasicGoRelationship.java
@@
-21,7
+21,7
@@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
//
// Contact: phylosoft @ gmail . com
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
//
// Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
package org.forester.go;
package org.forester.go;
@@
-49,6
+49,12
@@
public class BasicGoRelationship implements GoRelationship {
else if ( type.toLowerCase().equals( POSITIVELY_REGULATES_STR ) ) {
_type = Type.POSITIVELY_REGULATES;
}
else if ( type.toLowerCase().equals( POSITIVELY_REGULATES_STR ) ) {
_type = Type.POSITIVELY_REGULATES;
}
+ else if ( type.toLowerCase().equals( HAS_PART_STR ) ) {
+ _type = Type.HAS_PART;
+ }
+ else if ( type.toLowerCase().equals( OCCURS_IN_STR ) ) {
+ _type = Type.OCCURS_IN;
+ }
else {
throw new IllegalArgumentException( "unknown GO relationship type: " + type );
}
else {
throw new IllegalArgumentException( "unknown GO relationship type: " + type );
}
@@
-77,8
+83,8
@@
public class BasicGoRelationship implements GoRelationship {
/**
* Based on value and type.
/**
* Based on value and type.
- *
- *
+ *
+ *
*/
@Override
public boolean equals( final Object o ) {
*/
@Override
public boolean equals( final Object o ) {
@@
-124,8
+130,14
@@
public class BasicGoRelationship implements GoRelationship {
case REGULATES:
sb.append( REGULATES_STR );
break;
case REGULATES:
sb.append( REGULATES_STR );
break;
+ case HAS_PART:
+ sb.append( HAS_PART_STR );
+ break;
+ case OCCURS_IN:
+ sb.append( OCCURS_IN_STR );
+ break;
default:
default:
- new AssertionError( "unknown type: " + getType() );
+ new IllegalStateException( "unknown type: " + getType() );
}
sb.append( ": " );
sb.append( getGoId().toString() );
}
sb.append( ": " );
sb.append( getGoId().toString() );