Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ PairwiseSequenceAlignerType.LOCAL, new SimpleGapPenalty(),
}

proteinIndex = proteinIndex + seq.length();
if (startIndex != null && endIndex != null && startIndex != endIndex) {
if (startIndex != null && endIndex != null && !startIndex.equals(endIndex)) {
CDSSequence cdsSequence = cdsSequenceList.get(i);
String hitLabel = "";
if (transcriptSequence.getStrand() == Strand.POSITIVE) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ private boolean domainsAvailable() {
return false;

// Re-download old copies of "latest"
if(updateFrequency != null && requestedVersion == DEFAULT_VERSION ) {
if(updateFrequency != null && requestedVersion.equals(DEFAULT_VERSION) ) {
long mod = f.lastModified();
// Time of last update
Date lastUpdate = new Date();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ private void formBondAltlocAware(Group g1, String name1, Group g2, String name2,
for (Atom a2:a2s) {
if (a1.getAltLoc() != null && a2.getAltLoc()!=null &&
a1.getAltLoc()!=' ' && a2.getAltLoc()!=' ' &&
a1.getAltLoc() != a2.getAltLoc()) {
!a1.getAltLoc().equals(a2.getAltLoc())) {
logger.debug("Skipping bond between atoms with differently named alt locs {} (altLoc '{}') -- {} (altLoc '{}')",
a1.toString(), a1.getAltLoc(), a2.toString(), a2.getAltLoc());
continue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ private List<Integer> getPermutation(Matrix4d transformation) {
int permutation = -1;
double minDistSq = Double.MAX_VALUE;
for (int j = 0; j < centers.size(); j++) {
if (seqClusterId.get(i) == seqClusterId.get(j)) {
if (seqClusterId.get(i) != null && seqClusterId.get(i).equals(seqClusterId.get(j))) {
if (!used[j]) {
double dSq = tCenter.distanceSquared(centers.get(j));
if (dSq < minDistSq && dSq <= rmsdThresholdSq) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ private boolean isAllowedPermutation(List<Integer> permutation) {
int selfaligned = 0;
for (int i = 0; i < permutation.size(); i++) {
int j = permutation.get(i);
if ( seqClusterId.get(i) != seqClusterId.get(j)) {
if ( seqClusterId.get(i) != null && !seqClusterId.get(i).equals(seqClusterId.get(j))) {
return false;
}
if(i == j ) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ private boolean isAllowedPermuation(List<Integer> permutation) {
List<Integer> seqClusterId = subunits.getClusterIds();
for (int i = 0; i < permutation.size(); i++) {
int j = permutation.get(i);
if (seqClusterId.get(i) != seqClusterId.get(j)) {
if (seqClusterId.get(i) != null && !seqClusterId.get(i).equals(seqClusterId.get(j))) {
return false;
}
}
Expand Down