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
merge from 2_4_Release branch
[jalview.git]
/
src
/
org
/
biojava
/
dasobert
/
das2
/
Das2SourceImpl.java
diff --git
a/src/org/biojava/dasobert/das2/Das2SourceImpl.java
b/src/org/biojava/dasobert/das2/Das2SourceImpl.java
index
efdf40d
..
2f5a7ed
100755
(executable)
--- a/
src/org/biojava/dasobert/das2/Das2SourceImpl.java
+++ b/
src/org/biojava/dasobert/das2/Das2SourceImpl.java
@@
-24,8
+24,7
@@
package org.biojava.dasobert.das2;
import org.biojava.dasobert.dasregistry.*;
import org.biojava.dasobert.dasregistry.*;
-public class Das2SourceImpl
- extends Das1Source implements Das2Source
+public class Das2SourceImpl extends Das1Source implements Das2Source
{
{
@@
-38,8
+37,9
@@
public class Das2SourceImpl
capabilities = new Das2Capability[0];
}
capabilities = new Das2Capability[0];
}
- /** compare if two DasSources are identical
- *
+ /**
+ * compare if two DasSources are identical
+ *
*/
public boolean equals(DasSource other)
{
*/
public boolean equals(DasSource other)
{
@@
-49,13
+49,13
@@
public class Das2SourceImpl
return true;
}
return true;
}
- if ( (other == null) || (other.getClass() != this.getClass()))
+ if ((other == null) || (other.getClass() != this.getClass()))
{
return false;
}
// to compare if two Das2Sources are identical we do the following:
{
return false;
}
// to compare if two Das2Sources are identical we do the following:
- // we check the capabilities
+ // we check the capabilities
Das2SourceImpl d2o = (Das2SourceImpl) other;
Das2SourceImpl d2o = (Das2SourceImpl) other;
@@
-66,7
+66,7
@@
public class Das2SourceImpl
Das2Capability[] othercaps = d2o.getDas2Capabilities();
Das2Capability[] othercaps = d2o.getDas2Capabilities();
- if (! (capabilities.length == othercaps.length))
+ if (!(capabilities.length == othercaps.length))
{
return false;
}
{
return false;
}
@@
-89,7
+89,7
@@
public class Das2SourceImpl
}
}
}
}
- //TODO?
+ // TODO?
// should we add a check for coordinate systems?
// but we already check for the endpoints, that should be enough...
// should we add a check for coordinate systems?
// but we already check for the endpoints, that should be enough...
@@
-131,7
+131,7
@@
public class Das2SourceImpl
public String[] getCapabilities()
{
public String[] getCapabilities()
{
- //todo mark as not needed / not appropriate ...
+ // todo mark as not needed / not appropriate ...
return super.getCapabilities();
}
return super.getCapabilities();
}