Permalink
Browse files

Fixed a bunch of minor todos. Made the fractal piece germ read-only, …

…so that it can only be modified by setGermString(). When the germ string is parsed, make sure there is at least one non-rest. Renamed MinorScale to NaturalMinorScale. Moved SheetMusicCreator to the notation package where it belongs.
  • Loading branch information...
1 parent ea767d6 commit 997b7fcbbcf99ab2ee83598cb105b93378038dd6 @myronmarston committed Jul 31, 2008
Showing with 3,151 additions and 3,395 deletions.
  1. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.AudioFileCreator.html
  2. +80 −97 FractalComposer/build/cobertura-report/com.myronmarston.music.Dynamic.html
  3. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.GermIsEmptyException.html
  4. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.IncorrectNoteStringException.html
  5. +8 −8 FractalComposer/build/cobertura-report/com.myronmarston.music.Instrument.html
  6. +40 −40 FractalComposer/build/cobertura-report/com.myronmarston.music.MidiNote.html
  7. +531 −588 FractalComposer/build/cobertura-report/com.myronmarston.music.Note.html
  8. +426 −290 FractalComposer/build/cobertura-report/com.myronmarston.music.NoteList.html
  9. +14 −14 FractalComposer/build/cobertura-report/com.myronmarston.music.NoteName.html
  10. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.NoteStringInvalidPartException.html
  11. +24 −20 ...usic.transformers.CopyTransformer.html → com.myronmarston.music.NoteStringOnlyRestException.html}
  12. +4 −4 FractalComposer/build/cobertura-report/com.myronmarston.music.NoteStringParseException.html
  13. +73 −73 FractalComposer/build/cobertura-report/com.myronmarston.music.OutputManager.html
  14. +20 −20 FractalComposer/build/cobertura-report/com.myronmarston.music.Tempo.html
  15. +2 −2 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.AbstractNotationElement.html
  16. +33 −33 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.Clef.html
  17. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.GuidoRunException.html
  18. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.LilypondRunException.html
  19. +20 −20 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.NotationDynamic.html
  20. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.NotationElement.html
  21. +43 −43 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.NotationElementList.html
  22. +43 −43 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.NotationNote.html
  23. +78 −78 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.Part.html
  24. +27 −27 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.PartSection.html
  25. +40 −40 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.Piece.html
  26. +260 −264 ...ronmarston.music.SheetMusicCreator.html → com.myronmarston.music.notation.SheetMusicCreator.html}
  27. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.Tuplet.html
  28. +6 −6 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.ChromaticScale.html
  29. +2 −2 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.HarmonicMinorScale.html
  30. +1 −1 ...alComposer/build/cobertura-report/com.myronmarston.music.scales.InvalidKeySignatureException.html
  31. +24 −24 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.KeySignature.html
  32. +5 −5 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.MajorPentatonicScale.html
  33. +5 −5 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.MajorScale.html
  34. +2 −2 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.MinorPentatonicScale.html
  35. +40 −44 ...myronmarston.music.scales.MinorScale.html → com.myronmarston.music.scales.NaturalMinorScale.html}
  36. +243 −289 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.Scale.html
  37. +5 −5 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.Tonality.html
  38. +13 −13 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.AbstractVoiceOrSection.html
  39. +15 −15 ...mposer/build/cobertura-report/com.myronmarston.music.settings.AbstractVoiceOrSectionSettings.html
  40. +491 −545 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.FractalPiece.html
  41. +1 −1 ...omposer/build/cobertura-report/com.myronmarston.music.settings.InvalidTimeSignatureException.html
  42. +1 −1 ...ser/build/cobertura-report/com.myronmarston.music.settings.NonPositiveTimeSignatureException.html
  43. +24 −24 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.Section.html
  44. +30 −30 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.SectionSettings.html
  45. +0 −187 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.SegmentSettings.html
  46. +38 −38 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.SelfSimilaritySettings.html
  47. +19 −19 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.TimeSignature.html
  48. +1 −1 ...bertura-report/com.myronmarston.music.settings.TimeSignatureDenominatorNotAPowerOf2Exception.html
  49. +22 −22 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.Voice.html
  50. +27 −27 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceOrSectionList.html
  51. +49 −49 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceSection.html
  52. +6 −6 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceSectionHashMap.html
  53. +15 −15 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceSectionHashMapKey.html
  54. +12 −12 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceSectionList.html
  55. +178 −193 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceSettings.html
  56. +12 −12 FractalComposer/build/cobertura-report/com.myronmarston.music.transformers.InversionTransformer.html
  57. +11 −11 FractalComposer/build/cobertura-report/com.myronmarston.music.transformers.OctaveTransformer.html
  58. +13 −13 ...talComposer/build/cobertura-report/com.myronmarston.music.transformers.RetrogradeTransformer.html
  59. +15 −15 ...poser/build/cobertura-report/com.myronmarston.music.transformers.RhythmicDurationTransformer.html
  60. +38 −38 ...omposer/build/cobertura-report/com.myronmarston.music.transformers.SelfSimilarityTransformer.html
  61. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.transformers.Transformer.html
  62. +12 −12 FractalComposer/build/cobertura-report/com.myronmarston.music.transformers.TransposeTransformer.html
Sorry, we could not display the entire diff because it was too big.
View
2 FractalComposer/build/cobertura-report/com.myronmarston.music.AudioFileCreator.html
@@ -411,6 +411,6 @@
<td class="src"><pre class="src">&nbsp;}</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/30/08 6:40 PM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/31/08 10:57 AM.</div>
</body>
</html>
View
177 FractalComposer/build/cobertura-report/com.myronmarston.music.Dynamic.html
@@ -12,7 +12,7 @@
<div class="separator">&nbsp;</div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="com.myronmarston.music.Dynamic.html">Dynamic</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">90%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:90px"><span class="text">27/30</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">75%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:75px"><span class="text">12/16</span></div></div></td></tr></table></td><td class="value"><span class="hidden">0.0;</span>0</td></tr>
+ <tr><td><a href="com.myronmarston.music.Dynamic.html">Dynamic</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">97%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:96px"><span class="text">32/33</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">86%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:85px"><span class="text">12/14</span></div></div></td></tr></table></td><td class="value"><span class="hidden">0.0;</span>0</td></tr>
</table>
<div class="separator">&nbsp;</div>
@@ -69,7 +69,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> * @author Myron</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;26</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;27</td> <td class="nbHitsCovered">&nbsp;2424</td> <td class="src"><pre class="src">&nbsp;<span class="keyword">public</span> enum Dynamic {</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;27</td> <td class="nbHitsCovered">&nbsp;2466</td> <td class="src"><pre class="src">&nbsp;<span class="keyword">public</span> enum Dynamic {</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;28</td> <td class="nbHitsCovered">&nbsp;30</td> <td class="src"><pre class="src">&nbsp; PPP(1),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;29</td> <td class="nbHitsCovered">&nbsp;30</td> <td class="src"><pre class="src">&nbsp; PP(2),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;30</td> <td class="nbHitsCovered">&nbsp;30</td> <td class="src"><pre class="src">&nbsp; P(3),</pre></td></tr>
@@ -83,156 +83,139 @@
<tr> <td class="numLine">&nbsp;37</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> <span class="keyword">final</span> <span class="keyword">int</span> dynamicLevel;</pre></td></tr>
<tr> <td class="numLine">&nbsp;38</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> <span class="keyword">final</span> <span class="keyword">int</span> midiVolume;</pre></td></tr>
+ <td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> <span class="keyword">final</span> <span class="keyword">int</span> midiVolume; </pre></td></tr>
<tr> <td class="numLine">&nbsp;39</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> <span class="keyword">static</span> String regexPattern;</pre></td></tr>
-<tr> <td class="numLine">&nbsp;40</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">int</span> MIDI_VOLUME_PER_LEVEL = 15;</pre></td></tr>
-<tr> <td class="numLine">&nbsp;41</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;40</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">int</span> ADDITIONAL_OFFSET = -4;</pre></td></tr>
+<tr> <td class="numLine">&nbsp;41</td> <td class="nbHits">&nbsp;</td>
+ <td class="src"><pre class="src">&nbsp; </pre></td></tr>
<tr> <td class="numLine">&nbsp;42</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;43</td> <td class="nbHitsCovered">&nbsp;240</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> Dynamic(<span class="keyword">int</span> dynamicLevel) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;44</td> <td class="nbHitsCovered">&nbsp;240</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.dynamicLevel = dynamicLevel;</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;45</td> <td class="nbHitsCovered">&nbsp;240</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.midiVolume = (dynamicLevel * MIDI_VOLUME_PER_LEVEL) + ADDITIONAL_OFFSET;</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;46</td> <td class="nbHitsCovered">&nbsp;240</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
+ <td class="src"><pre class="src">&nbsp; <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;43</td> <td class="nbHitsCovered">&nbsp;8</td> <td class="src"><pre class="src">&nbsp;<span class="comment"> * Regular expression pattern that can be used to parse a dynamic in a </span></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;44</td> <td class="nbHitsCovered">&nbsp;8</td> <td class="src"><pre class="src">&nbsp;<span class="comment"> * note string.</span></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;45</td> <td class="nbHitsCovered">&nbsp;8</td> <td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;46</td> <td class="nbHitsCovered">&nbsp;37</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">static</span> String REGEX_PATTERN = <span class="string">"(?:,(.*))?"</span>;</pre></td></tr>
<tr> <td class="numLine">&nbsp;47</td> <td class="nbHits">&nbsp;</td>
+ <td class="src"><pre class="src">&nbsp;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;48</td> <td class="nbHitsCovered">&nbsp;232</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> Dynamic(<span class="keyword">int</span> dynamicLevel) {</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;49</td> <td class="nbHitsCovered">&nbsp;232</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.dynamicLevel = dynamicLevel;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;50</td> <td class="nbHitsCovered">&nbsp;232</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.midiVolume = (dynamicLevel * MIDI_VOLUME_PER_LEVEL) + ADDITIONAL_OFFSET;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;51</td> <td class="nbHitsCovered">&nbsp;232</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
+<tr> <td class="numLine">&nbsp;52</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
-<tr> <td class="numLine">&nbsp;48</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;53</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;49</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> * Gets the midi volume for this dynamic.</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;50</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLineCover">&nbsp;54</td> <td class="nbHitsCovered">&nbsp;25</td> <td class="src"><pre class="src">&nbsp;<span class="comment"> * Gets the midi volume for this dynamic.</span></pre></td></tr>
+<tr> <td class="numLine">&nbsp;55</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * </span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;51</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;56</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * @return midi volume</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;52</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;57</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;53</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;58</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">int</span> getMidiVolume() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;54</td> <td class="nbHitsCovered">&nbsp;563</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">this</span>.midiVolume;</pre></td></tr>
-<tr> <td class="numLine">&nbsp;55</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLineCover">&nbsp;59</td> <td class="nbHitsCovered">&nbsp;708</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">this</span>.midiVolume;</pre></td></tr>
+<tr> <td class="numLine">&nbsp;60</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
-<tr> <td class="numLine">&nbsp;56</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;61</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;</pre></td></tr>
-<tr> <td class="numLine">&nbsp;57</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;62</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;58</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;63</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * Gets the dynamic level for this dynamic.</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;59</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;64</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * </span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;60</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;65</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * @return this dynamic level</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;61</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;66</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;62</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;67</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">int</span> getDynamicLevel() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;63</td> <td class="nbHitsUncovered">&nbsp;0</td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp; <span class="keyword">return</span> dynamicLevel;</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;64</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLineCover">&nbsp;68</td> <td class="nbHitsUncovered">&nbsp;0</td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp; <span class="keyword">return</span> dynamicLevel;</span></pre></td></tr>
+<tr> <td class="numLine">&nbsp;69</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; } </pre></td></tr>
-<tr> <td class="numLine">&nbsp;65</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;70</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
-<tr> <td class="numLine">&nbsp;66</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;71</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;67</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;72</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * Gets the dynamic that matches the given dynamic level.</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;68</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;73</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * </span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;69</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;74</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * @param dynamicLevel the dynamic level</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;70</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;75</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * @return the dynamic that matches the given dynamic level</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;71</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;76</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;72</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;77</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> <span class="keyword">static</span> Dynamic getDynamicForDynamicLevel(<span class="keyword">int</span> dynamicLevel) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;73</td> <td class="nbHitsCovered">&nbsp;2293</td> <td class="src"><pre class="src">&nbsp; Dynamic d = Dynamic.values()[dynamicLevel - 1];</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;74</td> <td class="nbHitsUncovered"><a title="Line 74: Conditional coverage 50% (2/4) [each condition: 50%, 50%].">&nbsp;2293</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 74: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">assert</span> d.dynamicLevel == dynamicLevel : d;</a></span></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;75</td> <td class="nbHitsCovered">&nbsp;2293</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> d;</pre></td></tr>
-<tr> <td class="numLine">&nbsp;76</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLineCover">&nbsp;78</td> <td class="nbHitsCovered">&nbsp;2291</td> <td class="src"><pre class="src">&nbsp; Dynamic d = Dynamic.values()[dynamicLevel - 1];</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;79</td> <td class="nbHitsUncovered"><a title="Line 79: Conditional coverage 50% (2/4) [each condition: 50%, 50%].">&nbsp;2291</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 79: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">assert</span> d.dynamicLevel == dynamicLevel : d;</a></span></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;80</td> <td class="nbHitsCovered">&nbsp;2291</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> d;</pre></td></tr>
+<tr> <td class="numLine">&nbsp;81</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
-<tr> <td class="numLine">&nbsp;77</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;82</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
-<tr> <td class="numLine">&nbsp;78</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;83</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;79</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;84</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * Gets the Dynamic in whose range the given midiVolume falls.</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;80</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;85</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * </span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;81</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;86</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * @param midiVolume the midi volume</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;82</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;87</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * @return the dynamic for this volume, or null if the midiVolume falls </span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;83</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;88</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * outside of the acceptable range</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;84</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;89</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;85</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;90</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">static</span> Dynamic getDynamicForMidiVolume(<span class="keyword">int</span> midiVolume) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;86</td> <td class="nbHitsCovered"><a title="Line 86: Conditional coverage 100% (4/4) [each condition: 100%, 100%].">&nbsp;2327</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 86: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (midiVolume &lt;= MidiNote.MIN_VELOCITY || midiVolume &gt; MidiNote.MAX_VELOCITY) <span class="keyword">return</span> <span class="keyword">null</span>;</a></pre></td></tr>
-<tr> <td class="numLine">&nbsp;87</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLineCover">&nbsp;91</td> <td class="nbHitsCovered"><a title="Line 91: Conditional coverage 100% (4/4) [each condition: 100%, 100%].">&nbsp;2325</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 91: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (midiVolume &lt;= MidiNote.MIN_VELOCITY || midiVolume &gt; MidiNote.MAX_VELOCITY) <span class="keyword">return</span> <span class="keyword">null</span>;</a></pre></td></tr>
+<tr> <td class="numLine">&nbsp;92</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;88</td> <td class="nbHitsCovered">&nbsp;2293</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">int</span> dynamicLevel = (midiVolume - (MIDI_VOLUME_PER_LEVEL + ADDITIONAL_OFFSET)) / MIDI_VOLUME_PER_LEVEL + 1;</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;89</td> <td class="nbHitsCovered">&nbsp;2293</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> getDynamicForDynamicLevel(dynamicLevel);</pre></td></tr>
-<tr> <td class="numLine">&nbsp;90</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLineCover">&nbsp;93</td> <td class="nbHitsCovered">&nbsp;2291</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">int</span> dynamicLevel = (midiVolume - (MIDI_VOLUME_PER_LEVEL + ADDITIONAL_OFFSET)) / MIDI_VOLUME_PER_LEVEL + 1;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;94</td> <td class="nbHitsCovered">&nbsp;2291</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> getDynamicForDynamicLevel(dynamicLevel);</pre></td></tr>
+<tr> <td class="numLine">&nbsp;95</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
-<tr> <td class="numLine">&nbsp;91</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;96</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
-<tr> <td class="numLine">&nbsp;92</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;97</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;93</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;98</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * Gets a list of possible dynamic values.</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;94</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;99</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * </span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;95</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;100</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * @return a string containing a list of possible dynamic values</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;96</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;101</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;97</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLine">&nbsp;102</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">static</span> String getDynamicExampleString() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;98</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; StringBuilder str = <span class="keyword">new</span> StringBuilder();</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;99</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; Dynamic[] values = Dynamic.values(); <span class="comment">// cache the array...</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;100</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLineCover">&nbsp;103</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; StringBuilder str = <span class="keyword">new</span> StringBuilder();</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;104</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; Dynamic[] values = Dynamic.values(); <span class="comment">// cache the array...</span></pre></td></tr>
+<tr> <td class="numLine">&nbsp;105</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;101</td> <td class="nbHitsCovered"><a title="Line 101: Conditional coverage 100% (2/2).">&nbsp;9</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 101: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i &lt; values.length; i++) {</a></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;102</td> <td class="nbHitsCovered">&nbsp;8</td> <td class="src"><pre class="src">&nbsp; str.append(values[i].toString()); </pre></td></tr>
-<tr> <td class="numLine">&nbsp;103</td> <td class="nbHits">&nbsp;</td>
+<tr> <td class="numLineCover">&nbsp;106</td> <td class="nbHitsCovered"><a title="Line 106: Conditional coverage 100% (2/2).">&nbsp;9</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 106: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i &lt; values.length; i++) {</a></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;107</td> <td class="nbHitsCovered">&nbsp;8</td> <td class="src"><pre class="src">&nbsp; str.append(values[i].toString()); </pre></td></tr>
+<tr> <td class="numLine">&nbsp;108</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;104</td> <td class="nbHitsCovered"><a title="Line 104: Conditional coverage 100% (2/2).">&nbsp;8</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 104: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (i == values.length - 2) str.append(<span class="string">" or "</span>); </a></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;105</td> <td class="nbHitsCovered"><a title="Line 105: Conditional coverage 100% (2/2).">&nbsp;7</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 105: Conditional coverage 100% (2/2)."> <span class="keyword">else</span> <span class="keyword">if</span> (i &lt; values.length - 2) str.append(<span class="string">", "</span>); </a></pre></td></tr>
-<tr> <td class="numLine">&nbsp;106</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
-<tr> <td class="numLine">&nbsp;107</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp; </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;108</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> str.toString(); </pre></td></tr>
-<tr> <td class="numLine">&nbsp;109</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
-<tr> <td class="numLine">&nbsp;110</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp; </pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;109</td> <td class="nbHitsCovered"><a title="Line 109: Conditional coverage 100% (2/2).">&nbsp;8</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 109: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (i == values.length - 2) str.append(<span class="string">" or "</span>); </a></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;110</td> <td class="nbHitsCovered"><a title="Line 110: Conditional coverage 100% (2/2).">&nbsp;7</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 110: Conditional coverage 100% (2/2)."> <span class="keyword">else</span> <span class="keyword">if</span> (i &lt; values.length - 2) str.append(<span class="string">", "</span>); </a></pre></td></tr>
<tr> <td class="numLine">&nbsp;111</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp; <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;112</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> * Gets a regular expression pattern string based on this dynamic enum that </span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;113</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> * can be used to parse a note string.</span></pre></td></tr>
+ <td class="src"><pre class="src">&nbsp; </pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;113</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> str.toString(); </pre></td></tr>
<tr> <td class="numLine">&nbsp;114</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> * </span></pre></td></tr>
+ <td class="src"><pre class="src">&nbsp; } </pre></td></tr>
<tr> <td class="numLine">&nbsp;115</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> * @return a regular expression pattern string</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;116</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;117</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">static</span> String getRegexPattern() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;118</td> <td class="nbHitsUncovered"><a title="Line 118: Conditional coverage 0% (0/2).">&nbsp;0</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 118: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (regexPattern == <span class="keyword">null</span>) regexPattern = <span class="string">"(?:,(.*))?"</span>; </a></span></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;119</td> <td class="nbHitsUncovered">&nbsp;0</td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp; <span class="keyword">return</span> regexPattern;</span></pre></td></tr>
-<tr> <td class="numLine">&nbsp;120</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp; } </pre></td></tr>
-<tr> <td class="numLine">&nbsp;121</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp; </pre></td></tr>
-<tr> <td class="numLine">&nbsp;122</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;}</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/30/08 6:40 PM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/31/08 10:57 AM.</div>
</body>
</html>
View
2 FractalComposer/build/cobertura-report/com.myronmarston.music.GermIsEmptyException.html
@@ -89,6 +89,6 @@
<td class="src"><pre class="src">&nbsp;}</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/30/08 6:40 PM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/31/08 10:57 AM.</div>
</body>
</html>
View
2 ...lComposer/build/cobertura-report/com.myronmarston.music.IncorrectNoteStringException.html
@@ -95,6 +95,6 @@
<td class="src"><pre class="src">&nbsp;}</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/30/08 6:40 PM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/31/08 10:57 AM.</div>
</body>
</html>
View
16 FractalComposer/build/cobertura-report/com.myronmarston.music.Instrument.html
@@ -206,7 +206,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span> </pre></td></tr>
<tr> <td class="numLine">&nbsp;106</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">static</span> Instrument getInstrument(String name) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;107</td> <td class="nbHitsCovered">&nbsp;1543</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> INSTRUMENT_MAP.get(name.trim().toLowerCase(Locale.ENGLISH));</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;107</td> <td class="nbHitsCovered">&nbsp;1573</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> INSTRUMENT_MAP.get(name.trim().toLowerCase(Locale.ENGLISH));</pre></td></tr>
<tr> <td class="numLine">&nbsp;108</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;109</td> <td class="nbHits">&nbsp;</td>
@@ -223,7 +223,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;115</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> String getName() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;116</td> <td class="nbHitsCovered">&nbsp;253</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">this</span>.midiInstrument.getName().trim();</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;116</td> <td class="nbHitsCovered">&nbsp;259</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">this</span>.midiInstrument.getName().trim();</pre></td></tr>
<tr> <td class="numLine">&nbsp;117</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;118</td> <td class="nbHits">&nbsp;</td>
@@ -278,22 +278,22 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;144</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> MidiEvent getProgramChangeMidiEvent(<span class="keyword">int</span> midiChannel) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;145</td> <td class="nbHitsUncovered"><a title="Line 145: Conditional coverage 50% (2/4) [each condition: 50%, 50%].">&nbsp;142</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 145: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (midiChannel &lt; MidiNote.MIN_CHANNEL || midiChannel &gt; MidiNote.MAX_CHANNEL) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;145</td> <td class="nbHitsUncovered"><a title="Line 145: Conditional coverage 50% (2/4) [each condition: 50%, 50%].">&nbsp;141</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 145: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (midiChannel &lt; MidiNote.MIN_CHANNEL || midiChannel &gt; MidiNote.MAX_CHANNEL) {</a></span></pre></td></tr>
<tr> <td class="numLineCover">&nbsp;146</td> <td class="nbHitsUncovered">&nbsp;0</td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp; <span class="keyword">throw</span> <span class="keyword">new</span> IllegalArgumentException(String.format(<span class="string">"The midi channel must be between %d and %d."</span>, MidiNote.MIN_CHANNEL, MidiNote.MAX_CHANNEL));</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;147</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; } </pre></td></tr>
<tr> <td class="numLine">&nbsp;148</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;149</td> <td class="nbHitsCovered">&nbsp;142</td> <td class="src"><pre class="src">&nbsp; ShortMessage msg = <span class="keyword">new</span> ShortMessage();</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;149</td> <td class="nbHitsCovered">&nbsp;141</td> <td class="src"><pre class="src">&nbsp; ShortMessage msg = <span class="keyword">new</span> ShortMessage();</pre></td></tr>
<tr> <td class="numLine">&nbsp;150</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;151</td> <td class="nbHitsCovered">&nbsp;142</td> <td class="src"><pre class="src">&nbsp; msg.setMessage(ShortMessage.PROGRAM_CHANGE, midiChannel, <span class="keyword">this</span>.midiInstrument.getPatch().getProgram(), midiChannel);</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;151</td> <td class="nbHitsCovered">&nbsp;141</td> <td class="src"><pre class="src">&nbsp; msg.setMessage(ShortMessage.PROGRAM_CHANGE, midiChannel, <span class="keyword">this</span>.midiInstrument.getPatch().getProgram(), midiChannel);</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;152</td> <td class="nbHitsUncovered">&nbsp;0</td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp; } <span class="keyword">catch</span> (InvalidMidiDataException ex) {</span></pre></td></tr>
<tr> <td class="numLineCover">&nbsp;153</td> <td class="nbHitsUncovered">&nbsp;0</td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp; <span class="keyword">throw</span> <span class="keyword">new</span> UndeclaredThrowableException(ex, <span class="string">"The program change midi event could not be created for an unknown reason. This indicates a programming error."</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;154</td> <td class="nbHitsCovered">&nbsp;142</td> <td class="src"><pre class="src">&nbsp; } </pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;154</td> <td class="nbHitsCovered">&nbsp;141</td> <td class="src"><pre class="src">&nbsp; } </pre></td></tr>
<tr> <td class="numLine">&nbsp;155</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;156</td> <td class="nbHitsCovered">&nbsp;142</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">new</span> MidiEvent(msg, 0);</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;156</td> <td class="nbHitsCovered">&nbsp;141</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">new</span> MidiEvent(msg, 0);</pre></td></tr>
<tr> <td class="numLine">&nbsp;157</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;158</td> <td class="nbHits">&nbsp;</td>
@@ -321,6 +321,6 @@
<td class="src"><pre class="src">&nbsp;}</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/30/08 6:40 PM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/31/08 10:57 AM.</div>
</body>
</html>
View
80 FractalComposer/build/cobertura-report/com.myronmarston.music.MidiNote.html
@@ -249,10 +249,10 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> * for each parameter.</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;122</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;123</td> <td class="nbHitsCovered">&nbsp;2363</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> MidiNote() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;124</td> <td class="nbHitsCovered">&nbsp;2363</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.setChannel(DEFAULT_CHANNEL);</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;125</td> <td class="nbHitsCovered">&nbsp;2363</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.setVelocity(DEFAULT_VELOCITY);</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;126</td> <td class="nbHitsCovered">&nbsp;2363</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;123</td> <td class="nbHitsCovered">&nbsp;2362</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> MidiNote() {</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;124</td> <td class="nbHitsCovered">&nbsp;2362</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.setChannel(DEFAULT_CHANNEL);</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;125</td> <td class="nbHitsCovered">&nbsp;2362</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.setVelocity(DEFAULT_VELOCITY);</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;126</td> <td class="nbHitsCovered">&nbsp;2362</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;127</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
<tr> <td class="numLine">&nbsp;128</td> <td class="nbHits">&nbsp;</td>
@@ -267,7 +267,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;133</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">int</span> getPitch() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;134</td> <td class="nbHitsCovered">&nbsp;13338</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> pitch;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;134</td> <td class="nbHitsCovered">&nbsp;13334</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> pitch;</pre></td></tr>
<tr> <td class="numLine">&nbsp;135</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;136</td> <td class="nbHits">&nbsp;</td>
@@ -284,9 +284,9 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;142</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">void</span> setPitch(<span class="keyword">int</span> pitch) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;143</td> <td class="nbHitsCovered"><a title="Line 143: Conditional coverage 100% (2/2).">&nbsp;2363</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 143: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.pitch != pitch) clearNoteEvents();</a></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;144</td> <td class="nbHitsCovered">&nbsp;2363</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.pitch = pitch; </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;145</td> <td class="nbHitsCovered">&nbsp;2363</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;143</td> <td class="nbHitsCovered"><a title="Line 143: Conditional coverage 100% (2/2).">&nbsp;2362</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 143: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.pitch != pitch) clearNoteEvents();</a></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;144</td> <td class="nbHitsCovered">&nbsp;2362</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.pitch = pitch; </pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;145</td> <td class="nbHitsCovered">&nbsp;2362</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;146</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
<tr> <td class="numLine">&nbsp;147</td> <td class="nbHits">&nbsp;</td>
@@ -301,7 +301,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;152</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">long</span> getDuration() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;153</td> <td class="nbHitsCovered">&nbsp;2305</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> duration;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;153</td> <td class="nbHitsCovered">&nbsp;2304</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> duration;</pre></td></tr>
<tr> <td class="numLine">&nbsp;154</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;155</td> <td class="nbHits">&nbsp;</td>
@@ -318,9 +318,9 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;161</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">void</span> setDuration(<span class="keyword">long</span> duration) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;162</td> <td class="nbHitsUncovered"><a title="Line 162: Conditional coverage 50% (1/2).">&nbsp;2363</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 162: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.duration != duration) clearNoteEvents();</a></span></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;163</td> <td class="nbHitsCovered">&nbsp;2363</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.duration = duration; </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;164</td> <td class="nbHitsCovered">&nbsp;2363</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;162</td> <td class="nbHitsUncovered"><a title="Line 162: Conditional coverage 50% (1/2).">&nbsp;2362</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 162: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.duration != duration) clearNoteEvents();</a></span></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;163</td> <td class="nbHitsCovered">&nbsp;2362</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.duration = duration; </pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;164</td> <td class="nbHitsCovered">&nbsp;2362</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;165</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
<tr> <td class="numLine">&nbsp;166</td> <td class="nbHits">&nbsp;</td>
@@ -335,7 +335,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;171</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">long</span> getStartTime() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;172</td> <td class="nbHitsCovered">&nbsp;4568</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> startTime;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;172</td> <td class="nbHitsCovered">&nbsp;4566</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> startTime;</pre></td></tr>
<tr> <td class="numLine">&nbsp;173</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; } </pre></td></tr>
<tr> <td class="numLine">&nbsp;174</td> <td class="nbHits">&nbsp;</td>
@@ -352,9 +352,9 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;180</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">void</span> setStartTime(<span class="keyword">long</span> startTime) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;181</td> <td class="nbHitsUncovered"><a title="Line 181: Conditional coverage 50% (1/2).">&nbsp;2363</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 181: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.startTime != startTime) clearNoteEvents();</a></span></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;182</td> <td class="nbHitsCovered">&nbsp;2363</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.startTime = startTime; </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;183</td> <td class="nbHitsCovered">&nbsp;2363</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;181</td> <td class="nbHitsUncovered"><a title="Line 181: Conditional coverage 50% (1/2).">&nbsp;2362</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 181: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.startTime != startTime) clearNoteEvents();</a></span></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;182</td> <td class="nbHitsCovered">&nbsp;2362</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.startTime = startTime; </pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;183</td> <td class="nbHitsCovered">&nbsp;2362</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;184</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;</pre></td></tr>
<tr> <td class="numLine">&nbsp;185</td> <td class="nbHits">&nbsp;</td>
@@ -369,7 +369,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;190</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">int</span> getVelocity() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;191</td> <td class="nbHitsCovered">&nbsp;2305</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> velocity;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;191</td> <td class="nbHitsCovered">&nbsp;2304</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> velocity;</pre></td></tr>
<tr> <td class="numLine">&nbsp;192</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;193</td> <td class="nbHits">&nbsp;</td>
@@ -386,9 +386,9 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;199</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">void</span> setVelocity(<span class="keyword">int</span> velocity) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;200</td> <td class="nbHitsCovered"><a title="Line 200: Conditional coverage 100% (2/2).">&nbsp;4726</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 200: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.velocity != velocity) clearNoteEvents();</a></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;201</td> <td class="nbHitsCovered">&nbsp;4726</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.velocity = velocity; </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;202</td> <td class="nbHitsCovered">&nbsp;4726</td> <td class="src"><pre class="src">&nbsp; } </pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;200</td> <td class="nbHitsCovered"><a title="Line 200: Conditional coverage 100% (2/2).">&nbsp;4724</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 200: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.velocity != velocity) clearNoteEvents();</a></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;201</td> <td class="nbHitsCovered">&nbsp;4724</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.velocity = velocity; </pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;202</td> <td class="nbHitsCovered">&nbsp;4724</td> <td class="src"><pre class="src">&nbsp; } </pre></td></tr>
<tr> <td class="numLine">&nbsp;203</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
<tr> <td class="numLine">&nbsp;204</td> <td class="nbHits">&nbsp;</td>
@@ -403,7 +403,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;209</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">int</span> getChannel() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;210</td> <td class="nbHitsCovered">&nbsp;4529</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> channel;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;210</td> <td class="nbHitsCovered">&nbsp;4527</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> channel;</pre></td></tr>
<tr> <td class="numLine">&nbsp;211</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;212</td> <td class="nbHits">&nbsp;</td>
@@ -420,10 +420,10 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;218</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">void</span> setChannel(<span class="keyword">int</span> channel) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;219</td> <td class="nbHitsUncovered"><a title="Line 219: Conditional coverage 75% (3/4) [each condition: 50%, 100%].">&nbsp;4727</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 219: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> <span class="keyword">if</span> (channel &lt; MIN_CHANNEL || channel &gt; MAX_CHANNEL) <span class="keyword">throw</span> <span class="keyword">new</span> IllegalArgumentException(String.format(<span class="string">"The channel must be between %d and %d."</span>, MIN_CHANNEL, MAX_CHANNEL));</a></span></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;220</td> <td class="nbHitsCovered"><a title="Line 220: Conditional coverage 100% (2/2).">&nbsp;4726</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 220: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.channel != channel) clearNoteEvents();</a></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;221</td> <td class="nbHitsCovered">&nbsp;4726</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.channel = channel; </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;222</td> <td class="nbHitsCovered">&nbsp;4726</td> <td class="src"><pre class="src">&nbsp; } </pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;219</td> <td class="nbHitsUncovered"><a title="Line 219: Conditional coverage 75% (3/4) [each condition: 50%, 100%].">&nbsp;4725</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 219: Conditional coverage 75% (3/4) [each condition: 50%, 100%]."> <span class="keyword">if</span> (channel &lt; MIN_CHANNEL || channel &gt; MAX_CHANNEL) <span class="keyword">throw</span> <span class="keyword">new</span> IllegalArgumentException(String.format(<span class="string">"The channel must be between %d and %d."</span>, MIN_CHANNEL, MAX_CHANNEL));</a></span></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;220</td> <td class="nbHitsCovered"><a title="Line 220: Conditional coverage 100% (2/2).">&nbsp;4724</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 220: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">this</span>.channel != channel) clearNoteEvents();</a></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;221</td> <td class="nbHitsCovered">&nbsp;4724</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.channel = channel; </pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;222</td> <td class="nbHitsCovered">&nbsp;4724</td> <td class="src"><pre class="src">&nbsp; } </pre></td></tr>
<tr> <td class="numLine">&nbsp;223</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
<tr> <td class="numLine">&nbsp;224</td> <td class="nbHits">&nbsp;</td>
@@ -444,8 +444,8 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;232</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> MidiEvent getNoteOnEvent() <span class="keyword">throws</span> InvalidMidiDataException {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;233</td> <td class="nbHitsUncovered"><a title="Line 233: Conditional coverage 50% (1/2).">&nbsp;2263</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 233: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (noteOnEvent == <span class="keyword">null</span>) createNoteEvents(); </a></span></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;234</td> <td class="nbHitsCovered">&nbsp;2263</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> noteOnEvent;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;233</td> <td class="nbHitsUncovered"><a title="Line 233: Conditional coverage 50% (1/2).">&nbsp;2262</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 233: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (noteOnEvent == <span class="keyword">null</span>) createNoteEvents(); </a></span></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;234</td> <td class="nbHitsCovered">&nbsp;2262</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> noteOnEvent;</pre></td></tr>
<tr> <td class="numLine">&nbsp;235</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;236</td> <td class="nbHits">&nbsp;</td>
@@ -468,8 +468,8 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;245</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> MidiEvent getNoteOffEvent() <span class="keyword">throws</span> InvalidMidiDataException {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;246</td> <td class="nbHitsUncovered"><a title="Line 246: Conditional coverage 50% (1/2).">&nbsp;2263</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 246: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (noteOffEvent == <span class="keyword">null</span>) createNoteEvents();</a></span></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;247</td> <td class="nbHitsCovered">&nbsp;2263</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> noteOffEvent;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;246</td> <td class="nbHitsUncovered"><a title="Line 246: Conditional coverage 50% (1/2).">&nbsp;2262</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 246: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (noteOffEvent == <span class="keyword">null</span>) createNoteEvents();</a></span></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;247</td> <td class="nbHitsCovered">&nbsp;2262</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> noteOffEvent;</pre></td></tr>
<tr> <td class="numLine">&nbsp;248</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;249</td> <td class="nbHits">&nbsp;</td>
@@ -501,9 +501,9 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;263</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> <span class="keyword">void</span> clearNoteEvents() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;264</td> <td class="nbHitsCovered">&nbsp;10328</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.noteOnEvent = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;265</td> <td class="nbHitsCovered">&nbsp;10328</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.noteOffEvent = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;266</td> <td class="nbHitsCovered">&nbsp;10328</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;264</td> <td class="nbHitsCovered">&nbsp;10324</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.noteOnEvent = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;265</td> <td class="nbHitsCovered">&nbsp;10324</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.noteOffEvent = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;266</td> <td class="nbHitsCovered">&nbsp;10324</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;267</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
<tr> <td class="numLine">&nbsp;268</td> <td class="nbHits">&nbsp;</td>
@@ -520,7 +520,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;274</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> <span class="keyword">void</span> createNoteEvents() <span class="keyword">throws</span> InvalidMidiDataException {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;275</td> <td class="nbHitsCovered">&nbsp;2263</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.noteOnEvent = createNoteEvent(</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;275</td> <td class="nbHitsCovered">&nbsp;2262</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.noteOnEvent = createNoteEvent(</pre></td></tr>
<tr> <td class="numLine">&nbsp;276</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; ShortMessage.NOTE_ON, </pre></td></tr>
<tr> <td class="numLine">&nbsp;277</td> <td class="nbHits">&nbsp;</td>
@@ -533,7 +533,7 @@
<td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.getStartTime()); </pre></td></tr>
<tr> <td class="numLine">&nbsp;281</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;282</td> <td class="nbHitsCovered">&nbsp;2263</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.noteOffEvent = createNoteEvent(</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;282</td> <td class="nbHitsCovered">&nbsp;2262</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.noteOffEvent = createNoteEvent(</pre></td></tr>
<tr> <td class="numLine">&nbsp;283</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; ShortMessage.NOTE_OFF, </pre></td></tr>
<tr> <td class="numLine">&nbsp;284</td> <td class="nbHits">&nbsp;</td>
@@ -544,7 +544,7 @@
<td class="src"><pre class="src">&nbsp; 0, <span class="comment">// velocity should always be 0 for note off events</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;287</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.getStartTime() + <span class="keyword">this</span>.getDuration());</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;288</td> <td class="nbHitsCovered">&nbsp;2263</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;288</td> <td class="nbHitsCovered">&nbsp;2262</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;289</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
<tr> <td class="numLine">&nbsp;290</td> <td class="nbHits">&nbsp;</td>
@@ -559,16 +559,16 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span> </pre></td></tr>
<tr> <td class="numLine">&nbsp;295</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> <span class="keyword">static</span> MidiEvent createNoteEvent(<span class="keyword">int</span> command, <span class="keyword">int</span> channel, <span class="keyword">int</span> pitch, <span class="keyword">int</span> velocity, <span class="keyword">long</span> tick) <span class="keyword">throws</span> javax.sound.midi.InvalidMidiDataException { </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;296</td> <td class="nbHitsCovered">&nbsp;4526</td> <td class="src"><pre class="src">&nbsp; ShortMessage message = <span class="keyword">new</span> ShortMessage(); </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;297</td> <td class="nbHitsCovered">&nbsp;4526</td> <td class="src"><pre class="src">&nbsp; message.setMessage(command, channel, pitch, velocity);</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;298</td> <td class="nbHitsCovered">&nbsp;4526</td> <td class="src"><pre class="src">&nbsp; MidiEvent event = <span class="keyword">new</span> MidiEvent(message, tick);</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;299</td> <td class="nbHitsCovered">&nbsp;4526</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> event;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;296</td> <td class="nbHitsCovered">&nbsp;4524</td> <td class="src"><pre class="src">&nbsp; ShortMessage message = <span class="keyword">new</span> ShortMessage(); </pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;297</td> <td class="nbHitsCovered">&nbsp;4524</td> <td class="src"><pre class="src">&nbsp; message.setMessage(command, channel, pitch, velocity);</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;298</td> <td class="nbHitsCovered">&nbsp;4524</td> <td class="src"><pre class="src">&nbsp; MidiEvent event = <span class="keyword">new</span> MidiEvent(message, tick);</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;299</td> <td class="nbHitsCovered">&nbsp;4524</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> event;</pre></td></tr>
<tr> <td class="numLine">&nbsp;300</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; } </pre></td></tr>
<tr> <td class="numLine">&nbsp;301</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;}</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/30/08 6:40 PM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/31/08 10:57 AM.</div>
</body>
</html>
View
1,119 FractalComposer/build/cobertura-report/com.myronmarston.music.Note.html
531 additions, 588 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
716 FractalComposer/build/cobertura-report/com.myronmarston.music.NoteList.html
426 additions, 290 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
28 FractalComposer/build/cobertura-report/com.myronmarston.music.NoteName.html
@@ -214,7 +214,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;125</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">int</span> getNormalizedNoteNumber() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;126</td> <td class="nbHitsCovered">&nbsp;18198</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">this</span>.normalizedNoteNumber;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;126</td> <td class="nbHitsCovered">&nbsp;18594</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">this</span>.normalizedNoteNumber;</pre></td></tr>
<tr> <td class="numLine">&nbsp;127</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;128</td> <td class="nbHits">&nbsp;</td>
@@ -233,7 +233,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;135</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">int</span> getNoteNumber() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;136</td> <td class="nbHitsCovered">&nbsp;3900</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">this</span>.noteNumber;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;136</td> <td class="nbHitsCovered">&nbsp;4009</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">this</span>.noteNumber;</pre></td></tr>
<tr> <td class="numLine">&nbsp;137</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;138</td> <td class="nbHits">&nbsp;</td>
@@ -252,7 +252,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;145</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">int</span> getMidiPitchNumberAtOctave(<span class="keyword">int</span> octave) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;146</td> <td class="nbHitsCovered">&nbsp;7916</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">this</span>.pitchNumberAtOctaveZero + (Scale.NUM_CHROMATIC_PITCHES_PER_OCTAVE * octave);</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;146</td> <td class="nbHitsCovered">&nbsp;8044</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">this</span>.pitchNumberAtOctaveZero + (Scale.NUM_CHROMATIC_PITCHES_PER_OCTAVE * octave);</pre></td></tr>
<tr> <td class="numLine">&nbsp;147</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;148</td> <td class="nbHits">&nbsp;</td>
@@ -273,7 +273,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;156</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">int</span> getLetterNumber() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;157</td> <td class="nbHitsCovered">&nbsp;11492</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> letterNumber;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;157</td> <td class="nbHitsCovered">&nbsp;11796</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> letterNumber;</pre></td></tr>
<tr> <td class="numLine">&nbsp;158</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; } </pre></td></tr>
<tr> <td class="numLine">&nbsp;159</td> <td class="nbHits">&nbsp;</td>
@@ -292,14 +292,14 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;166</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">char</span> getLetter(<span class="keyword">boolean</span> lowerCase) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;167</td> <td class="nbHitsCovered"><a title="Line 167: Conditional coverage 100% (2/2).">&nbsp;2414</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 167: Conditional coverage 100% (2/2)."> String letterStr = </a></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;167</td> <td class="nbHitsCovered"><a title="Line 167: Conditional coverage 100% (2/2).">&nbsp;2412</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 167: Conditional coverage 100% (2/2)."> String letterStr = </a></pre></td></tr>
<tr> <td class="numLine">&nbsp;168</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; (lowerCase ? </pre></td></tr>
<tr> <td class="numLine">&nbsp;169</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.toString().toLowerCase(Locale.ENGLISH) : </pre></td></tr>
<tr> <td class="numLine">&nbsp;170</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.toString().toUpperCase(Locale.ENGLISH));</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;171</td> <td class="nbHitsCovered">&nbsp;2414</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> letterStr.charAt(0);</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;171</td> <td class="nbHitsCovered">&nbsp;2412</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> letterStr.charAt(0);</pre></td></tr>
<tr> <td class="numLine">&nbsp;172</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;173</td> <td class="nbHits">&nbsp;</td>
@@ -318,7 +318,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;180</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">int</span> getMajorKeySharpsOrFlats() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;181</td> <td class="nbHitsCovered">&nbsp;4661</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> majorKeySharpsOrFlats;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;181</td> <td class="nbHitsCovered">&nbsp;4671</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> majorKeySharpsOrFlats;</pre></td></tr>
<tr> <td class="numLine">&nbsp;182</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;183</td> <td class="nbHits">&nbsp;</td>
@@ -364,7 +364,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;204</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">int</span> getPositiveIntervalSize(NoteName other) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;205</td> <td class="nbHitsCovered">&nbsp;5679</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> MathHelper.getNormalizedValue(other.getLetterNumber() - <span class="keyword">this</span>.getLetterNumber(), NoteName.NUM_LETTER_NAMES); </pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;205</td> <td class="nbHitsCovered">&nbsp;5831</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> MathHelper.getNormalizedValue(other.getLetterNumber() - <span class="keyword">this</span>.getLetterNumber(), NoteName.NUM_LETTER_NAMES); </pre></td></tr>
<tr> <td class="numLine">&nbsp;206</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;207</td> <td class="nbHits">&nbsp;</td>
@@ -429,7 +429,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;240</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">int</span> getPositiveChromaticSteps(NoteName other) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;241</td> <td class="nbHitsCovered">&nbsp;4272</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> MathHelper.getNormalizedValue(other.getNormalizedNoteNumber() - <span class="keyword">this</span>.getNormalizedNoteNumber(), Scale.NUM_CHROMATIC_PITCHES_PER_OCTAVE); </pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;241</td> <td class="nbHitsCovered">&nbsp;4383</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> MathHelper.getNormalizedValue(other.getNormalizedNoteNumber() - <span class="keyword">this</span>.getNormalizedNoteNumber(), Scale.NUM_CHROMATIC_PITCHES_PER_OCTAVE); </pre></td></tr>
<tr> <td class="numLine">&nbsp;242</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; } </pre></td></tr>
<tr> <td class="numLine">&nbsp;243</td> <td class="nbHits">&nbsp;</td>
@@ -438,7 +438,7 @@
<td class="src"><pre class="src">&nbsp; @Override</pre></td></tr>
<tr> <td class="numLine">&nbsp;245</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> String toString() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;246</td> <td class="nbHitsCovered">&nbsp;3777</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">super</span>.toString().replace(<span class="string">'s'</span>, <span class="string">'#'</span>);</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;246</td> <td class="nbHitsCovered">&nbsp;3774</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">super</span>.toString().replace(<span class="string">'s'</span>, <span class="string">'#'</span>);</pre></td></tr>
<tr> <td class="numLine">&nbsp;247</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; } </pre></td></tr>
<tr> <td class="numLine">&nbsp;248</td> <td class="nbHits">&nbsp;</td>
@@ -491,12 +491,12 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;274</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> NoteName getNaturalNoteNameForLetterNumber(<span class="keyword">int</span> letterNumber) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;275</td> <td class="nbHitsUncovered"><a title="Line 275: Conditional coverage 88% (7/8).">&nbsp;2290</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 275: Conditional coverage 88% (7/8)."> <span class="keyword">switch</span> (MathHelper.getNormalizedValue(<span class="keyword">this</span>.letterNumber + letterNumber, NUM_LETTER_NAMES)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;275</td> <td class="nbHitsUncovered"><a title="Line 275: Conditional coverage 88% (7/8).">&nbsp;2289</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 275: Conditional coverage 88% (7/8)."> <span class="keyword">switch</span> (MathHelper.getNormalizedValue(<span class="keyword">this</span>.letterNumber + letterNumber, NUM_LETTER_NAMES)) {</a></span></pre></td></tr>
<tr> <td class="numLineCover">&nbsp;276</td> <td class="nbHitsCovered">&nbsp;271</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">case</span> 0: <span class="keyword">return</span> NoteName.C;</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;277</td> <td class="nbHitsCovered">&nbsp;217</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">case</span> 1: <span class="keyword">return</span> NoteName.D;</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;278</td> <td class="nbHitsCovered">&nbsp;221</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">case</span> 2: <span class="keyword">return</span> NoteName.E;</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;279</td> <td class="nbHitsCovered">&nbsp;299</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">case</span> 3: <span class="keyword">return</span> NoteName.F;</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;280</td> <td class="nbHitsCovered">&nbsp;639</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">case</span> 4: <span class="keyword">return</span> NoteName.G;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;280</td> <td class="nbHitsCovered">&nbsp;638</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">case</span> 4: <span class="keyword">return</span> NoteName.G;</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;281</td> <td class="nbHitsCovered">&nbsp;305</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">case</span> 5: <span class="keyword">return</span> NoteName.A;</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;282</td> <td class="nbHitsCovered">&nbsp;338</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">case</span> 6: <span class="keyword">return</span> NoteName.B;</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;283</td> <td class="nbHitsUncovered">&nbsp;0</td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp; <span class="keyword">default</span>: <span class="keyword">throw</span> <span class="keyword">new</span> AssertionError(<span class="string">"Unexpected normalized letter number value. There is a programming error somewhere."</span>);</span></pre></td></tr>
@@ -522,7 +522,7 @@
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">static</span> NoteName getNoteName(String str) {</pre></td></tr>
<tr> <td class="numLine">&nbsp;294</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="comment">// convert to upper case so that the case doesn't matter...</span></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;295</td> <td class="nbHitsCovered">&nbsp;3908</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> NOTE_NAME_HASH.get(str.toUpperCase(Locale.ENGLISH));</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;295</td> <td class="nbHitsCovered">&nbsp;4017</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> NOTE_NAME_HASH.get(str.toUpperCase(Locale.ENGLISH));</pre></td></tr>
<tr> <td class="numLine">&nbsp;296</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; } </pre></td></tr>
<tr> <td class="numLine">&nbsp;297</td> <td class="nbHits">&nbsp;</td>
@@ -560,6 +560,6 @@
<td class="src"><pre class="src">&nbsp;}</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/30/08 6:40 PM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/31/08 10:57 AM.</div>
</body>
</html>
View
2 ...omposer/build/cobertura-report/com.myronmarston.music.NoteStringInvalidPartException.html
@@ -173,6 +173,6 @@
<td class="src"><pre class="src">&nbsp;}</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/30/08 6:40 PM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/31/08 10:57 AM.</div>
</body>
</html>
View
44 ...n.music.transformers.CopyTransformer.html → ...on.music.NoteStringOnlyRestException.html
@@ -8,11 +8,11 @@
<script type="text/javascript" src="js/popup.js"></script>
</head>
<body>
-<h5>Coverage Report - com.myronmarston.music.transformers.CopyTransformer</h5>
+<h5>Coverage Report - com.myronmarston.music.NoteStringOnlyRestException</h5>
<div class="separator">&nbsp;</div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="com.myronmarston.music.transformers.CopyTransformer.html">CopyTransformer</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
+ <tr><td><a href="com.myronmarston.music.NoteStringOnlyRestException.html">NoteStringOnlyRestException</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">100%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.0;</span>1</td></tr>
</table>
<div class="separator">&nbsp;</div>
@@ -22,11 +22,11 @@
<tr> <td class="numLine">&nbsp;2</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * Copyright 2008, Myron Marston &lt;myron DOT marston AT gmail DOT com&gt;</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;3</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src">&nbsp;<span class="comment"> * </span></pre></td></tr>
<tr> <td class="numLine">&nbsp;4</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * This file is part of Fractal Composer.</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;5</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src">&nbsp;<span class="comment"> * </span></pre></td></tr>
<tr> <td class="numLine">&nbsp;6</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * Fractal Composer is free software: you can redistribute it and/or modify</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;7</td> <td class="nbHits">&nbsp;</td>
@@ -36,7 +36,7 @@
<tr> <td class="numLine">&nbsp;9</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * at your option any later version.</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;10</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src">&nbsp;<span class="comment"> * </span></pre></td></tr>
<tr> <td class="numLine">&nbsp;11</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * Fractal Composer is distributed in the hope that it will be useful,</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;12</td> <td class="nbHits">&nbsp;</td>
@@ -46,7 +46,7 @@
<tr> <td class="numLine">&nbsp;14</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * GNU General Public License for more details.</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;15</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src">&nbsp;<span class="comment"> * </span></pre></td></tr>
<tr> <td class="numLine">&nbsp;16</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * You should have received a copy of the GNU General Public License</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;17</td> <td class="nbHits">&nbsp;</td>
@@ -56,39 +56,43 @@
<tr> <td class="numLine">&nbsp;19</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;</pre></td></tr>
<tr> <td class="numLine">&nbsp;20</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="keyword">package</span> com.myronmarston.music.transformers;</pre></td></tr>
+ <td class="src"><pre class="src">&nbsp;<span class="keyword">package</span> com.myronmarston.music;</pre></td></tr>
<tr> <td class="numLine">&nbsp;21</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;</pre></td></tr>
<tr> <td class="numLine">&nbsp;22</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;23</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> * Creates a copy of the input. It uses the octave transformer and </span></pre></td></tr>
+ <td class="src"><pre class="src">&nbsp;<span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;24</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> * transforms it zero octaves.</span></pre></td></tr>
+ <td class="src"><pre class="src">&nbsp;<span class="comment"> * @author Myron</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;25</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> * </span></pre></td></tr>
+ <td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;26</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> * @author Myron</span></pre></td></tr>
+ <td class="src"><pre class="src">&nbsp;<span class="keyword">public</span> <span class="keyword">class</span> NoteStringOnlyRestException <span class="keyword">extends</span> NoteStringParseException {</pre></td></tr>
<tr> <td class="numLine">&nbsp;27</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src">&nbsp; <span class="comment">// Used to serialize the class. Change this if the class has a change significant enough to change the way the class is serialized.</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;28</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="keyword">public</span> <span class="keyword">class</span> CopyTransformer <span class="keyword">extends</span> OctaveTransformer {</pre></td></tr>
+ <td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">long</span> serialVersionUID = 1L;</pre></td></tr>
<tr> <td class="numLine">&nbsp;29</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp; </pre></td></tr>
+ <td class="src"><pre class="src">&nbsp;</pre></td></tr>
<tr> <td class="numLine">&nbsp;30</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;31</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * Constructor.</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;32</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src">&nbsp;<span class="comment"> * </span></pre></td></tr>
<tr> <td class="numLine">&nbsp;33</td> <td class="nbHits">&nbsp;</td>
- <td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> CopyTransformer() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;34</td> <td class="nbHitsCovered">&nbsp;135</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">super</span>(0);</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;35</td> <td class="nbHitsCovered">&nbsp;135</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
-<tr> <td class="numLine">&nbsp;36</td> <td class="nbHits">&nbsp;</td>
+ <td class="src"><pre class="src">&nbsp;<span class="comment"> * @param noteString the invalid note string</span></pre></td></tr>
+<tr> <td class="numLine">&nbsp;34</td> <td class="nbHits">&nbsp;</td>
+ <td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine">&nbsp;35</td> <td class="nbHits">&nbsp;</td>
+ <td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> NoteStringOnlyRestException(String noteString) {</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;36</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">super</span>(noteString, String.format(<span class="string">"Error: the note string '%s' must contain at least one note that is not a rest."</span>, noteString));</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;37</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; } </pre></td></tr>
+<tr> <td class="numLine">&nbsp;38</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;}</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 5/28/08 11:21 AM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 7/31/08 10:57 AM.</div>
</body>
</html>