From: Jim Procter Date: Mon, 17 Nov 2014 14:38:37 +0000 (+0000) Subject: formatting X-Git-Tag: Jalview_2_9~149^2~8 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fd3e9637614543e5e6f039a0ad10dd5c59b6136f;p=jalview.git formatting --- diff --git a/src/jalview/datamodel/Alignment.java b/src/jalview/datamodel/Alignment.java index c1f3c2a..4057773 100755 --- a/src/jalview/datamodel/Alignment.java +++ b/src/jalview/datamodel/Alignment.java @@ -147,7 +147,9 @@ public class Alignment implements AlignmentI public SequenceI[] getSequencesArray() { if (sequences == null) + { return null; + } synchronized (sequences) { return sequences.toArray(new SequenceI[sequences.size()]); @@ -211,7 +213,9 @@ public class Alignment implements AlignmentI } } if (hiddenSequences != null) + { hiddenSequences.adjustHeightSequenceAdded(); + } } /** @@ -245,7 +249,9 @@ public class Alignment implements AlignmentI public void finalize() { if (getDataset() != null) + { getDataset().removeAlignmentRef(); + } dataset = null; sequences = null; @@ -754,7 +760,9 @@ public class Alignment implements AlignmentI continue; } if (tIndex < temp.length) + { temp[tIndex++] = annotations[i]; + } } if (swap) @@ -1171,7 +1179,9 @@ public class Alignment implements AlignmentI public void setProperty(Object key, Object value) { if (alignmentProperties == null) + { alignmentProperties = new Hashtable(); + } alignmentProperties.put(key, value); } @@ -1180,9 +1190,13 @@ public class Alignment implements AlignmentI public Object getProperty(Object key) { if (alignmentProperties != null) + { return alignmentProperties.get(key); + } else + { return null; + } } @Override @@ -1204,7 +1218,9 @@ public class Alignment implements AlignmentI public void addCodonFrame(AlignedCodonFrame codons) { if (codons == null) + { return; + } if (codonFrameList == null) { codonFrameList = new AlignedCodonFrame[] @@ -1238,15 +1254,21 @@ public class Alignment implements AlignmentI public AlignedCodonFrame[] getCodonFrame(SequenceI seq) { if (seq == null || codonFrameList == null) + { return null; + } Vector cframes = new Vector(); for (int f = 0; f < codonFrameList.length; f++) { if (codonFrameList[f].involvesSequence(seq)) + { cframes.addElement(codonFrameList[f]); + } } if (cframes.size() == 0) + { return null; + } AlignedCodonFrame[] cfr = new AlignedCodonFrame[cframes.size()]; cframes.copyInto(cfr); return cfr; @@ -1273,7 +1295,9 @@ public class Alignment implements AlignmentI public boolean removeCodonFrame(AlignedCodonFrame codons) { if (codons == null || codonFrameList == null) + { return false; + } boolean removed = false; int i = 0, iSize = codonFrameList.length; while (i < iSize)