From 85df074d019218cea2b5182b876de6638e49aebb Mon Sep 17 00:00:00 2001 From: Myron Marston Date: Sat, 10 May 2008 00:02:49 +0000 Subject: [PATCH] Updated code and javadoc for move Fraction class to com.myronmarston.util package since JRuby has issues importing an edu package. --- .../concurrent/misc/class-use/Fraction.html | 534 ------------------ .../util/concurrent/misc/package-frame.html | 31 - .../util/concurrent/misc/package-summary.html | 156 ----- .../dl/util/concurrent/misc/package-tree.html | 153 ----- .../dl/util/concurrent/misc/package-use.html | 226 -------- .../dist/javadoc/allclasses-frame.html | 2 +- .../dist/javadoc/allclasses-noframe.html | 2 +- .../javadoc/com/myronmarston/music/Note.html | 48 +- .../com/myronmarston/music/NoteList.html | 12 +- .../music/class-use/MidiNote.html | 4 +- .../myronmarston/music/class-use/Note.html | 6 +- .../music/class-use/NoteList.html | 2 +- .../class-use/NoteStringParseException.html | 4 +- .../com/myronmarston/music/package-tree.html | 2 +- .../music/scales/class-use/Scale.html | 12 +- .../myronmarston/music/settings/Section.html | 4 +- .../myronmarston/music/settings/Voice.html | 10 +- .../music/settings/VoiceSection.html | 6 +- .../settings/class-use/SegmentSettings.html | 4 +- .../RhythmicDurationTransformer.html | 10 +- .../com/myronmarston/util/ClassHelper.html | 4 +- .../myronmarston/util}/Fraction.html | 146 ++--- .../com/myronmarston/util/MathHelper.html | 4 +- .../myronmarston/util/class-use/Fraction.html | 534 ++++++++++++++++++ .../com/myronmarston/util/package-frame.html | 2 + .../myronmarston/util/package-summary.html | 8 +- .../com/myronmarston/util/package-tree.html | 7 +- .../com/myronmarston/util/package-use.html | 85 ++- .../dist/javadoc/index-files/index-1.html | 4 +- .../dist/javadoc/index-files/index-11.html | 8 +- .../dist/javadoc/index-files/index-12.html | 16 +- .../dist/javadoc/index-files/index-14.html | 10 +- .../dist/javadoc/index-files/index-15.html | 2 +- .../dist/javadoc/index-files/index-16.html | 4 +- .../dist/javadoc/index-files/index-17.html | 12 +- .../dist/javadoc/index-files/index-2.html | 18 +- .../dist/javadoc/index-files/index-3.html | 16 +- .../dist/javadoc/index-files/index-4.html | 10 +- .../dist/javadoc/index-files/index-5.html | 8 +- .../dist/javadoc/index-files/index-6.html | 6 +- .../dist/javadoc/index-files/index-7.html | 4 +- .../dist/javadoc/index-files/index-8.html | 4 +- .../dist/javadoc/overview-frame.html | 2 - .../dist/javadoc/overview-summary.html | 4 - .../dist/javadoc/overview-tree.html | 4 +- FractalComposer/dist/javadoc/package-list | 1 - .../dist/javadoc/serialized-form.html | 6 +- .../src/com/myronmarston/music/Note.java | 2 +- .../src/com/myronmarston/music/NoteList.java | 2 +- .../music/settings/FractalPiece.java | 2 +- .../myronmarston/music/settings/Section.java | 2 +- .../myronmarston/music/settings/Voice.java | 2 +- .../music/settings/VoiceSection.java | 2 +- .../RhythmicDurationTransformer.java | 2 +- .../src/com/myronmarston/util/Fraction.java | 4 +- .../com/myronmarston/music/NoteListTest.java | 2 +- .../test/com/myronmarston/music/NoteTest.java | 2 +- .../myronmarston/music/scales/ScaleTest.java | 2 +- .../music/settings/FractalPieceTest.java | 2 +- .../music/settings/PieceTest.java | 2 +- .../music/settings/SectionTest.java | 2 +- .../music/settings/VoiceSectionTest.java | 2 +- .../music/settings/VoiceTest.java | 2 +- .../music/settings/XmlSerializationTest.java | 2 +- .../music/transformers/TransformerTest.java | 2 +- 65 files changed, 857 insertions(+), 1338 deletions(-) delete mode 100644 FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/class-use/Fraction.html delete mode 100644 FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-frame.html delete mode 100644 FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-summary.html delete mode 100644 FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-tree.html delete mode 100644 FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-use.html rename FractalComposer/dist/javadoc/{EDU/oswego/cs/dl/util/concurrent/misc => com/myronmarston/util}/Fraction.html (60%) create mode 100644 FractalComposer/dist/javadoc/com/myronmarston/util/class-use/Fraction.html diff --git a/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/class-use/Fraction.html b/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/class-use/Fraction.html deleted file mode 100644 index a3e4584..0000000 --- a/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/class-use/Fraction.html +++ /dev/null @@ -1,534 +0,0 @@ - - - - - - -Uses of Class edu.oswego.cs.dl.util.concurrent.misc.Fraction - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class   Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-
-

-Uses of Class
edu.oswego.cs.dl.util.concurrent.misc.Fraction

-
- - - - - - - - - - - - - - - - - - - - - -
-Packages that use Fraction
com.myronmarston.music  
com.myronmarston.music.settings  
com.myronmarston.music.transformers  
edu.oswego.cs.dl.util.concurrent.misc  
-  -

- - - - - -
-Uses of Fraction in com.myronmarston.music
-  -

- - - - - - - - - - - - - -
Methods in com.myronmarston.music that return Fraction
- FractionNote.getDuration() - -
-          Gets how long the note should last, in whole notes.
- FractionNoteList.getDuration() - -
-          Gets the total length of the note list.
-  -

- - - - - - - - - - - - - - - - - - - - - - - - - -
Methods in com.myronmarston.music with parameters of type Fraction
- MidiNoteNote.convertToMidiNote(Scale scale, - Fraction startTime, - int midiTickResolution, - int channel, - boolean keepExactPitch) - -
-          Converts the note to a Midi Note, that can then be used to get the - actual Midi note on and note off events.
- javax.sound.midi.TrackNoteList.createAndFillMidiTrack(javax.sound.midi.Sequence sequence, - Scale scale, - Fraction startTime) - -
-          Fills the given midi track with the notes from this NoteList.
-static NoteNote.createRest(Fraction duration) - -
-          Creates a note that is a rest.
-static NoteNote.parseNoteString(java.lang.String noteString, - Scale scale, - Fraction defaultDuration, - java.lang.Integer defaultVolume) - -
-          Parses a note string such as F#4,1/8,MF.
- voidNote.setDuration(Fraction duration) - -
-          Sets how long the note should last, in whole notes.
-  -

- - - - - - - - - - - -
Constructors in com.myronmarston.music with parameters of type Fraction
Note(int scaleStep, - int octave, - int chromaticAdjustment, - Fraction duration, - int volume) - -
-          Constructor.
Note(int scaleStep, - int octave, - int chromaticAdjustment, - Fraction duration, - int volume, - SegmentSettings segmentSettings) - -
-          Constructor.
-  -

- - - - - -
-Uses of Fraction in com.myronmarston.music.settings
-  -

- - - - - - - - - - - - - -
Methods in com.myronmarston.music.settings that return Fraction
- FractionSection.getDuration() - -
-          Gets the duration for this entire section.
- FractionVoice.getSpeedScaleFactor() - -
-          Gets the speed scale factor to apply to the germ for use by this voice.
-  -

- - - - - - - - - - - - - -
Methods in com.myronmarston.music.settings with parameters of type Fraction
- NoteListVoiceSection.getLengthenedVoiceSectionResult(Fraction length) - -
-          Returns the voice section result, set to a particular length by padding - it with repeats and/or rests as appropriate.
- voidVoice.setSpeedScaleFactor(Fraction val) - -
-          Sets the speed scale factor to apply to the germ for use by this voice.
-  -

- - - - - -
-Uses of Fraction in com.myronmarston.music.transformers
-  -

- - - - - - - - - -
Methods in com.myronmarston.music.transformers that return Fraction
- FractionRhythmicDurationTransformer.getScaleFactor() - -
-          Gets the scale factor.
-  -

- - - - - - - - -
Constructors in com.myronmarston.music.transformers with parameters of type Fraction
RhythmicDurationTransformer(Fraction scaleFactor) - -
-          Constructor.
-  -

- - - - - -
-Uses of Fraction in edu.oswego.cs.dl.util.concurrent.misc
-  -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Methods in edu.oswego.cs.dl.util.concurrent.misc that return Fraction
- FractionFraction.dividedBy(Fraction b) - -
-          return a Fraction representing this Fraction divided by b
- FractionFraction.dividedBy(long n) - -
-          return a Fraction representing this Fraction divided by n
- FractionFraction.inverse() - -
-          return a Fraction representing 1 / this Fraction
- FractionFraction.minus(Fraction b) - -
-          return a Fraction representing this Fraction minus b
- FractionFraction.minus(long n) - -
-          return a Fraction representing this Fraction minus n
- FractionFraction.negative() - -
-          return a Fraction representing the negated value of this Fraction
- FractionFraction.plus(Fraction b) - -
-          return a Fraction representing this Fraction plus b
- FractionFraction.plus(long n) - -
-          return a Fraction representing this Fraction plus n
- FractionFraction.times(Fraction b) - -
-          return a Fraction representing this Fraction times b
- FractionFraction.times(long n) - -
-          return a Fraction representing this Fraction times n
-  -

- - - - - - - - - - - - - - - - - - - - - -
Methods in edu.oswego.cs.dl.util.concurrent.misc with parameters of type Fraction
- FractionFraction.dividedBy(Fraction b) - -
-          return a Fraction representing this Fraction divided by b
- FractionFraction.minus(Fraction b) - -
-          return a Fraction representing this Fraction minus b
- FractionFraction.plus(Fraction b) - -
-          return a Fraction representing this Fraction plus b
- FractionFraction.times(Fraction b) - -
-          return a Fraction representing this Fraction times b
-  -

- - - - - - - - -
Constructors in edu.oswego.cs.dl.util.concurrent.misc with parameters of type Fraction
Fraction(Fraction f) - -
-          Create a fraction with the same value as Fraction f
-  -

-

- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class   Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
- - - diff --git a/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-frame.html b/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-frame.html deleted file mode 100644 index 67c59b7..0000000 --- a/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-frame.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - -edu.oswego.cs.dl.util.concurrent.misc - - - - - - - - - - -edu.oswego.cs.dl.util.concurrent.misc - - - - -
-Classes  - -
-Fraction
- - - - diff --git a/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-summary.html b/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-summary.html deleted file mode 100644 index 0c6422a..0000000 --- a/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-summary.html +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - -edu.oswego.cs.dl.util.concurrent.misc - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview   Package  Class  Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV PACKAGE  - NEXT PACKAGE - FRAMES   - NO FRAMES   -  - - - -
- - - -
-

-Package edu.oswego.cs.dl.util.concurrent.misc -

- - - - - - - - - -
-Class Summary
FractionAn immutable class representing fractions as pairs of longs.
-  - -

-

-
-
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview   Package  Class  Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV PACKAGE  - NEXT PACKAGE - FRAMES   - NO FRAMES   -  - - - -
- - - -
- - - diff --git a/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-tree.html b/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-tree.html deleted file mode 100644 index 2987944..0000000 --- a/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-tree.html +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - -edu.oswego.cs.dl.util.concurrent.misc Class Hierarchy - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use   Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-
-

-Hierarchy For Package edu.oswego.cs.dl.util.concurrent.misc -

-
-
-
Package Hierarchies:
All Packages
-
-

-Class Hierarchy -

- -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use   Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
- - - diff --git a/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-use.html b/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-use.html deleted file mode 100644 index 9b99ed2..0000000 --- a/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/package-use.html +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - -Uses of Package edu.oswego.cs.dl.util.concurrent.misc - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class   Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-
-

-Uses of Package
edu.oswego.cs.dl.util.concurrent.misc

-
- - - - - - - - - - - - - - - - - - - - - -
-Packages that use edu.oswego.cs.dl.util.concurrent.misc
com.myronmarston.music  
com.myronmarston.music.settings  
com.myronmarston.music.transformers  
edu.oswego.cs.dl.util.concurrent.misc  
-  -

- - - - - - - - -
-Classes in edu.oswego.cs.dl.util.concurrent.misc used by com.myronmarston.music
Fraction - -
-          An immutable class representing fractions as pairs of longs.
-  -

- - - - - - - - -
-Classes in edu.oswego.cs.dl.util.concurrent.misc used by com.myronmarston.music.settings
Fraction - -
-          An immutable class representing fractions as pairs of longs.
-  -

- - - - - - - - -
-Classes in edu.oswego.cs.dl.util.concurrent.misc used by com.myronmarston.music.transformers
Fraction - -
-          An immutable class representing fractions as pairs of longs.
-  -

- - - - - - - - -
-Classes in edu.oswego.cs.dl.util.concurrent.misc used by edu.oswego.cs.dl.util.concurrent.misc
Fraction - -
-          An immutable class representing fractions as pairs of longs.
-  -

-

- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class   Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
- - - diff --git a/FractalComposer/dist/javadoc/allclasses-frame.html b/FractalComposer/dist/javadoc/allclasses-frame.html index d54a204..9cbe3c1 100644 --- a/FractalComposer/dist/javadoc/allclasses-frame.html +++ b/FractalComposer/dist/javadoc/allclasses-frame.html @@ -32,7 +32,7 @@
FractalPiece
-Fraction +Fraction
HarmonicMinorScale
diff --git a/FractalComposer/dist/javadoc/allclasses-noframe.html b/FractalComposer/dist/javadoc/allclasses-noframe.html index 92bdbf5..0035914 100644 --- a/FractalComposer/dist/javadoc/allclasses-noframe.html +++ b/FractalComposer/dist/javadoc/allclasses-noframe.html @@ -32,7 +32,7 @@
FractalPiece
-Fraction +Fraction
HarmonicMinorScale
diff --git a/FractalComposer/dist/javadoc/com/myronmarston/music/Note.html b/FractalComposer/dist/javadoc/com/myronmarston/music/Note.html index 8272686..9878866 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/music/Note.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/music/Note.html @@ -125,20 +125,20 @@

          Default constructor. -Note(int scaleStep, +Note(int scaleStep, int octave, int chromaticAdjustment, - Fraction duration, + Fraction duration, int volume)
          Constructor. -Note(int scaleStep, +Note(int scaleStep, int octave, int chromaticAdjustment, - Fraction duration, + Fraction duration, int volume, SegmentSettings segmentSettings) @@ -164,8 +164,8 @@

 MidiNote -convertToMidiNote(Scale scale, - Fraction startTime, +convertToMidiNote(Scale scale, + Fraction startTime, int midiTickResolution, int channel, boolean keepExactPitch) @@ -177,7 +177,7 @@

static Note -createRest(Fraction duration) +createRest(Fraction duration)
          Creates a note that is a rest. @@ -201,7 +201,7 @@

- Fraction + Fraction getDuration()
@@ -259,9 +259,9 @@

static Note -parseNoteString(java.lang.String noteString, +parseNoteString(java.lang.String noteString, Scale scale, - Fraction defaultDuration, + Fraction defaultDuration, java.lang.Integer defaultVolume)
@@ -279,7 +279,7 @@

 void -setDuration(Fraction duration) +setDuration(Fraction duration)
          Sets how long the note should last, in whole notes. @@ -368,13 +368,13 @@

-

+

Note

 public Note(int scaleStep,
             int octave,
             int chromaticAdjustment,
-            Fraction duration,
+            Fraction duration,
             int volume)
Constructor. @@ -387,13 +387,13 @@

-

+

Note

 public Note(int scaleStep,
             int octave,
             int chromaticAdjustment,
-            Fraction duration,
+            Fraction duration,
             int volume,
             SegmentSettings segmentSettings)
@@ -429,10 +429,10 @@

-

+

createRest

-public static Note createRest(Fraction duration)
+public static Note createRest(Fraction duration)
Creates a note that is a rest.

@@ -562,7 +562,7 @@

getDuration

-public Fraction getDuration()
+public Fraction getDuration()
Gets how long the note should last, in whole notes.

@@ -573,10 +573,10 @@

-

+

setDuration

-public void setDuration(Fraction duration)
+public void setDuration(Fraction duration)
Sets how long the note should last, in whole notes.

@@ -642,12 +642,12 @@

-

+

parseNoteString

 public static Note parseNoteString(java.lang.String noteString,
                                    Scale scale,
-                                   Fraction defaultDuration,
+                                   Fraction defaultDuration,
                                    java.lang.Integer defaultVolume)
                             throws NoteStringParseException
@@ -666,11 +666,11 @@

-

+

convertToMidiNote

 public MidiNote convertToMidiNote(Scale scale,
-                                  Fraction startTime,
+                                  Fraction startTime,
                                   int midiTickResolution,
                                   int channel,
                                   boolean keepExactPitch)
diff --git a/FractalComposer/dist/javadoc/com/myronmarston/music/NoteList.html b/FractalComposer/dist/javadoc/com/myronmarston/music/NoteList.html index 9fae50b..050d2ca 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/music/NoteList.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/music/NoteList.html @@ -167,16 +167,16 @@

 javax.sound.midi.Track -createAndFillMidiTrack(javax.sound.midi.Sequence sequence, +createAndFillMidiTrack(javax.sound.midi.Sequence sequence, Scale scale, - Fraction startTime) + Fraction startTime)
          Fills the given midi track with the notes from this NoteList. - Fraction + Fraction getDuration()
@@ -358,7 +358,7 @@

getDuration

-public Fraction getDuration()
+public Fraction getDuration()
Gets the total length of the note list.

@@ -389,12 +389,12 @@

-

+

createAndFillMidiTrack

 public javax.sound.midi.Track createAndFillMidiTrack(javax.sound.midi.Sequence sequence,
                                                      Scale scale,
-                                                     Fraction startTime)
+                                                     Fraction startTime)
                                               throws javax.sound.midi.InvalidMidiDataException
Fills the given midi track with the notes from this NoteList. diff --git a/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/MidiNote.html b/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/MidiNote.html index 6899d16..3b94161 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/MidiNote.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/MidiNote.html @@ -112,8 +112,8 @@

 MidiNote -Note.convertToMidiNote(Scale scale, - Fraction startTime, +Note.convertToMidiNote(Scale scale, + Fraction startTime, int midiTickResolution, int channel, boolean keepExactPitch) diff --git a/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/Note.html b/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/Note.html index a93c2a2..0743174 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/Note.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/Note.html @@ -116,7 +116,7 @@

static Note -Note.createRest(Fraction duration) +Note.createRest(Fraction duration)
          Creates a note that is a rest. @@ -132,9 +132,9 @@

static Note -Note.parseNoteString(java.lang.String noteString, +Note.parseNoteString(java.lang.String noteString, Scale scale, - Fraction defaultDuration, + Fraction defaultDuration, java.lang.Integer defaultVolume)
diff --git a/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/NoteList.html b/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/NoteList.html index f07076b..d0062d0 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/NoteList.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/NoteList.html @@ -179,7 +179,7 @@

 NoteList -VoiceSection.getLengthenedVoiceSectionResult(Fraction length) +VoiceSection.getLengthenedVoiceSectionResult(Fraction length)
          Returns the voice section result, set to a particular length by padding diff --git a/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/NoteStringParseException.html b/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/NoteStringParseException.html index 7c63a49..8d69585 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/NoteStringParseException.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/music/class-use/NoteStringParseException.html @@ -149,9 +149,9 @@

static Note -Note.parseNoteString(java.lang.String noteString, +Note.parseNoteString(java.lang.String noteString, Scale scale, - Fraction defaultDuration, + Fraction defaultDuration, java.lang.Integer defaultVolume)
diff --git a/FractalComposer/dist/javadoc/com/myronmarston/music/package-tree.html b/FractalComposer/dist/javadoc/com/myronmarston/music/package-tree.html index 82a0b82..b227642 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/music/package-tree.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/music/package-tree.html @@ -116,7 +116,7 @@

  • java.lang.Object
    diff --git a/FractalComposer/dist/javadoc/com/myronmarston/music/scales/class-use/Scale.html b/FractalComposer/dist/javadoc/com/myronmarston/music/scales/class-use/Scale.html index 234b975..078ac49 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/music/scales/class-use/Scale.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/music/scales/class-use/Scale.html @@ -120,8 +120,8 @@

     MidiNote -Note.convertToMidiNote(Scale scale, - Fraction startTime, +Note.convertToMidiNote(Scale scale, + Fraction startTime, int midiTickResolution, int channel, boolean keepExactPitch) @@ -133,9 +133,9 @@

     javax.sound.midi.Track -NoteList.createAndFillMidiTrack(javax.sound.midi.Sequence sequence, +NoteList.createAndFillMidiTrack(javax.sound.midi.Sequence sequence, Scale scale, - Fraction startTime) + Fraction startTime)
              Fills the given midi track with the notes from this NoteList. @@ -152,9 +152,9 @@

    static Note -Note.parseNoteString(java.lang.String noteString, +Note.parseNoteString(java.lang.String noteString, Scale scale, - Fraction defaultDuration, + Fraction defaultDuration, java.lang.Integer defaultVolume)
    diff --git a/FractalComposer/dist/javadoc/com/myronmarston/music/settings/Section.html b/FractalComposer/dist/javadoc/com/myronmarston/music/settings/Section.html index 4517351..2433426 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/music/settings/Section.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/music/settings/Section.html @@ -138,7 +138,7 @@

    - Fraction + Fraction getDuration()
    @@ -243,7 +243,7 @@

    getDuration

    -public Fraction getDuration()
    +public Fraction getDuration()
    Gets the duration for this entire section. This will be the duration of the longest voice section. diff --git a/FractalComposer/dist/javadoc/com/myronmarston/music/settings/Voice.html b/FractalComposer/dist/javadoc/com/myronmarston/music/settings/Voice.html index f57cc67..bb3fcc5 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/music/settings/Voice.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/music/settings/Voice.html @@ -199,7 +199,7 @@

    - Fraction + Fraction getSpeedScaleFactor()
    @@ -251,7 +251,7 @@

     void -setSpeedScaleFactor(Fraction val) +setSpeedScaleFactor(Fraction val)
              Sets the speed scale factor to apply to the germ for use by this voice. @@ -370,7 +370,7 @@

    getSpeedScaleFactor

    -public Fraction getSpeedScaleFactor()
    +public Fraction getSpeedScaleFactor()
    Gets the speed scale factor to apply to the germ for use by this voice.

    @@ -381,10 +381,10 @@

    -

    +

    setSpeedScaleFactor

    -public void setSpeedScaleFactor(Fraction val)
    +public void setSpeedScaleFactor(Fraction val)
    Sets the speed scale factor to apply to the germ for use by this voice.

    diff --git a/FractalComposer/dist/javadoc/com/myronmarston/music/settings/VoiceSection.html b/FractalComposer/dist/javadoc/com/myronmarston/music/settings/VoiceSection.html index 10d75c8..2869ca2 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/music/settings/VoiceSection.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/music/settings/VoiceSection.html @@ -169,7 +169,7 @@

     NoteList -getLengthenedVoiceSectionResult(Fraction length) +getLengthenedVoiceSectionResult(Fraction length)
              Returns the voice section result, set to a particular length by padding @@ -519,10 +519,10 @@

    -

    +

    getLengthenedVoiceSectionResult

    -public NoteList getLengthenedVoiceSectionResult(Fraction length)
    +public NoteList getLengthenedVoiceSectionResult(Fraction length)
    Returns the voice section result, set to a particular length by padding it with repeats and/or rests as appropriate. diff --git a/FractalComposer/dist/javadoc/com/myronmarston/music/settings/class-use/SegmentSettings.html b/FractalComposer/dist/javadoc/com/myronmarston/music/settings/class-use/SegmentSettings.html index 2674583..08858f0 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/music/settings/class-use/SegmentSettings.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/music/settings/class-use/SegmentSettings.html @@ -142,10 +142,10 @@

    Constructors in com.myronmarston.music with parameters of type SegmentSettings -Note(int scaleStep, +Note(int scaleStep, int octave, int chromaticAdjustment, - Fraction duration, + Fraction duration, int volume, SegmentSettings segmentSettings) diff --git a/FractalComposer/dist/javadoc/com/myronmarston/music/transformers/RhythmicDurationTransformer.html b/FractalComposer/dist/javadoc/com/myronmarston/music/transformers/RhythmicDurationTransformer.html index d90086d..c5353fb 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/music/transformers/RhythmicDurationTransformer.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/music/transformers/RhythmicDurationTransformer.html @@ -122,7 +122,7 @@

    Constructor Summary -RhythmicDurationTransformer(Fraction scaleFactor) +RhythmicDurationTransformer(Fraction scaleFactor)
              Constructor. @@ -139,7 +139,7 @@

    - Fraction + Fraction getScaleFactor()
    @@ -176,10 +176,10 @@

    -

    +

    RhythmicDurationTransformer

    -public RhythmicDurationTransformer(Fraction scaleFactor)
    +public RhythmicDurationTransformer(Fraction scaleFactor)
    Constructor.

    @@ -202,7 +202,7 @@

    getScaleFactor

    -public Fraction getScaleFactor()
    +public Fraction getScaleFactor()
    Gets the scale factor. Factors less than 1 will increase the speed of the NoteList; factors greater than 1 will slow it down. diff --git a/FractalComposer/dist/javadoc/com/myronmarston/util/ClassHelper.html b/FractalComposer/dist/javadoc/com/myronmarston/util/ClassHelper.html index 4679799..86c6cbd 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/util/ClassHelper.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/util/ClassHelper.html @@ -55,7 +55,7 @@  PREV CLASS  - NEXT CLASS + NEXT CLASS FRAMES    NO FRAMES   @@ -281,7 +281,7 @@

     PREV CLASS  - NEXT CLASS + NEXT CLASS FRAMES    NO FRAMES   diff --git a/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/Fraction.html b/FractalComposer/dist/javadoc/com/myronmarston/util/Fraction.html similarity index 60% rename from FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/Fraction.html rename to FractalComposer/dist/javadoc/com/myronmarston/util/Fraction.html index 74b0200..f57b2fd 100644 --- a/FractalComposer/dist/javadoc/EDU/oswego/cs/dl/util/concurrent/misc/Fraction.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/util/Fraction.html @@ -8,7 +8,7 @@ - + @@ -87,12 +87,12 @@

    -edu.oswego.cs.dl.util.concurrent.misc +com.myronmarston.util
    Class Fraction

     java.lang.Object
-  extended by edu.oswego.cs.dl.util.concurrent.misc.Fraction
+  extended by com.myronmarston.util.Fraction
    All Implemented Interfaces:
    java.io.Serializable, java.lang.Cloneable, java.lang.Comparable
    @@ -109,7 +109,7 @@

    -
    See Also:
    Serialized Form
    +
    See Also:
    Serialized Form

    @@ -124,7 +124,7 @@

    protected  long -denominator_ +denominator_
                @@ -132,7 +132,7 @@

    protected  long -numerator_ +numerator_
                @@ -148,13 +148,13 @@

    Constructor Summary -Fraction(Fraction f) +Fraction(Fraction f)
              Create a fraction with the same value as Fraction f -Fraction(long num, +Fraction(long num, long den)
    @@ -173,7 +173,7 @@

     double -asDouble() +asDouble()
              Return the value of the Fraction as a double @@ -181,7 +181,7 @@

     java.lang.Object -clone() +clone()
                @@ -189,7 +189,7 @@

     int -compareTo(long n) +compareTo(long n)
              return a number less, equal, or greater than zero @@ -198,7 +198,7 @@

     int -compareTo(java.lang.Object other) +compareTo(java.lang.Object other)
              return a number less, equal, or greater than zero @@ -208,23 +208,23 @@

     long -denominator() +denominator()
              Return the denominator - Fraction -dividedBy(Fraction b) + Fraction +dividedBy(Fraction b)
              return a Fraction representing this Fraction divided by b - Fraction -dividedBy(long n) + Fraction +dividedBy(long n)
              return a Fraction representing this Fraction divided by n @@ -232,7 +232,7 @@

     boolean -equals(long n) +equals(long n)
                @@ -240,7 +240,7 @@

     boolean -equals(java.lang.Object other) +equals(java.lang.Object other)
                @@ -248,7 +248,7 @@

    static long -gcd(long a, +gcd(long a, long b)
    @@ -257,39 +257,39 @@

     int -hashCode() +hashCode()
                - Fraction -inverse() + Fraction +inverse()
              return a Fraction representing 1 / this Fraction - Fraction -minus(Fraction b) + Fraction +minus(Fraction b)
              return a Fraction representing this Fraction minus b - Fraction -minus(long n) + Fraction +minus(long n)
              return a Fraction representing this Fraction minus n - Fraction -negative() + Fraction +negative()
              return a Fraction representing the negated value of this Fraction @@ -297,39 +297,39 @@

     long -numerator() +numerator()
              Return the numerator - Fraction -plus(Fraction b) + Fraction +plus(Fraction b)
              return a Fraction representing this Fraction plus b - Fraction -plus(long n) + Fraction +plus(long n)
              return a Fraction representing this Fraction plus n - Fraction -times(Fraction b) + Fraction +times(Fraction b)
              return a Fraction representing this Fraction times b - Fraction -times(long n) + Fraction +times(long n)
              return a Fraction representing this Fraction times n @@ -337,7 +337,7 @@

     java.lang.String -toString() +toString()
                @@ -405,10 +405,10 @@

    -

    +

    Fraction

    -public Fraction(Fraction f)
    +public Fraction(Fraction f)
    Create a fraction with the same value as Fraction f

    @@ -522,7 +522,7 @@

    negative

    -public Fraction negative()
    +public Fraction negative()
    return a Fraction representing the negated value of this Fraction

    @@ -538,7 +538,7 @@

    inverse

    -public Fraction inverse()
    +public Fraction inverse()
    return a Fraction representing 1 / this Fraction

    @@ -551,10 +551,10 @@

    -

    +

    plus

    -public Fraction plus(Fraction b)
    +public Fraction plus(Fraction b)
    return a Fraction representing this Fraction plus b

    @@ -570,7 +570,7 @@

    plus

    -public Fraction plus(long n)
    +public Fraction plus(long n)
    return a Fraction representing this Fraction plus n

    @@ -583,10 +583,10 @@

    -

    +

    minus

    -public Fraction minus(Fraction b)
    +public Fraction minus(Fraction b)
    return a Fraction representing this Fraction minus b

    @@ -602,7 +602,7 @@

    minus

    -public Fraction minus(long n)
    +public Fraction minus(long n)
    return a Fraction representing this Fraction minus n

    @@ -615,10 +615,10 @@

    -

    +

    times

    -public Fraction times(Fraction b)
    +public Fraction times(Fraction b)
    return a Fraction representing this Fraction times b

    @@ -634,7 +634,7 @@

    times

    -public Fraction times(long n)
    +public Fraction times(long n)
    return a Fraction representing this Fraction times n

    @@ -647,10 +647,10 @@

    -

    +

    dividedBy

    -public Fraction dividedBy(Fraction b)
    +public Fraction dividedBy(Fraction b)
    return a Fraction representing this Fraction divided by b

    @@ -666,7 +666,7 @@

    dividedBy

    -public Fraction dividedBy(long n)
    +public Fraction dividedBy(long n)
    return a Fraction representing this Fraction divided by n

    @@ -767,14 +767,14 @@

    - + - - - + + +
    Overview  Overview  Package   Class  Use  Tree  Deprecated  Index  Help  Deprecated  Index  Help 
    @@ -785,20 +785,20 @@

    - PREV CLASS  - NEXT CLASS + PREV CLASS  + NEXT CLASS - FRAMES   + FRAMES    NO FRAMES     diff --git a/FractalComposer/dist/javadoc/com/myronmarston/util/MathHelper.html b/FractalComposer/dist/javadoc/com/myronmarston/util/MathHelper.html index 52bff7a..72bec23 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/util/MathHelper.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/util/MathHelper.html @@ -54,7 +54,7 @@ - PREV CLASS  + PREV CLASS   NEXT CLASS FRAMES   @@ -296,7 +296,7 @@

    - PREV CLASS  + PREV CLASS   NEXT CLASS FRAMES   diff --git a/FractalComposer/dist/javadoc/com/myronmarston/util/class-use/Fraction.html b/FractalComposer/dist/javadoc/com/myronmarston/util/class-use/Fraction.html new file mode 100644 index 0000000..81960ac --- /dev/null +++ b/FractalComposer/dist/javadoc/com/myronmarston/util/class-use/Fraction.html @@ -0,0 +1,534 @@ + + + + + + +Uses of Class com.myronmarston.util.Fraction + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + +
    Overview  Package  Class   Use  Tree  Deprecated  Index  Help 
    +    		 + +
    + PREV  + NEXT + FRAMES   + NO FRAMES   +  + + + +
    + + + +
    +
    +

    +Uses of Class
    com.myronmarston.util.Fraction

    +
    + + + + + + + + + + + + + + + + + + + + + +
    +Packages that use Fraction
    com.myronmarston.music  
    com.myronmarston.music.settings  
    com.myronmarston.music.transformers  
    com.myronmarston.util  
    +  +

    + + + + + +
    +Uses of Fraction in com.myronmarston.music
    +  +

    + + + + + + + + + + + + + +
    Methods in com.myronmarston.music that return Fraction
    + FractionNote.getDuration() + +
    +          Gets how long the note should last, in whole notes.
    + FractionNoteList.getDuration() + +
    +          Gets the total length of the note list.
    +  +

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    Methods in com.myronmarston.music with parameters of type Fraction
    + MidiNoteNote.convertToMidiNote(Scale scale, + Fraction startTime, + int midiTickResolution, + int channel, + boolean keepExactPitch) + +
    +          Converts the note to a Midi Note, that can then be used to get the + actual Midi note on and note off events.
    + javax.sound.midi.TrackNoteList.createAndFillMidiTrack(javax.sound.midi.Sequence sequence, + Scale scale, + Fraction startTime) + +
    +          Fills the given midi track with the notes from this NoteList.
    +static NoteNote.createRest(Fraction duration) + +
    +          Creates a note that is a rest.
    +static NoteNote.parseNoteString(java.lang.String noteString, + Scale scale, + Fraction defaultDuration, + java.lang.Integer defaultVolume) + +
    +          Parses a note string such as F#4,1/8,MF.
    + voidNote.setDuration(Fraction duration) + +
    +          Sets how long the note should last, in whole notes.
    +  +

    + + + + + + + + + + + +
    Constructors in com.myronmarston.music with parameters of type Fraction
    Note(int scaleStep, + int octave, + int chromaticAdjustment, + Fraction duration, + int volume) + +
    +          Constructor.
    Note(int scaleStep, + int octave, + int chromaticAdjustment, + Fraction duration, + int volume, + SegmentSettings segmentSettings) + +
    +          Constructor.
    +  +

    + + + + + +
    +Uses of Fraction in com.myronmarston.music.settings
    +  +

    + + + + + + + + + + + + + +
    Methods in com.myronmarston.music.settings that return Fraction
    + FractionSection.getDuration() + +
    +          Gets the duration for this entire section.
    + FractionVoice.getSpeedScaleFactor() + +
    +          Gets the speed scale factor to apply to the germ for use by this voice.
    +  +

    + + + + + + + + + + + + + +
    Methods in com.myronmarston.music.settings with parameters of type Fraction
    + NoteListVoiceSection.getLengthenedVoiceSectionResult(Fraction length) + +
    +          Returns the voice section result, set to a particular length by padding + it with repeats and/or rests as appropriate.
    + voidVoice.setSpeedScaleFactor(Fraction val) + +
    +          Sets the speed scale factor to apply to the germ for use by this voice.
    +  +

    + + + + + +
    +Uses of Fraction in com.myronmarston.music.transformers
    +  +

    + + + + + + + + + +
    Methods in com.myronmarston.music.transformers that return Fraction
    + FractionRhythmicDurationTransformer.getScaleFactor() + +
    +          Gets the scale factor.
    +  +

    + + + + + + + + +
    Constructors in com.myronmarston.music.transformers with parameters of type Fraction
    RhythmicDurationTransformer(Fraction scaleFactor) + +
    +          Constructor.
    +  +

    + + + + + +
    +Uses of Fraction in com.myronmarston.util
    +  +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Methods in com.myronmarston.util that return Fraction
    + FractionFraction.dividedBy(Fraction b) + +
    +          return a Fraction representing this Fraction divided by b
    + FractionFraction.dividedBy(long n) + +
    +          return a Fraction representing this Fraction divided by n
    + FractionFraction.inverse() + +
    +          return a Fraction representing 1 / this Fraction
    + FractionFraction.minus(Fraction b) + +
    +          return a Fraction representing this Fraction minus b
    + FractionFraction.minus(long n) + +
    +          return a Fraction representing this Fraction minus n
    + FractionFraction.negative() + +
    +          return a Fraction representing the negated value of this Fraction
    + FractionFraction.plus(Fraction b) + +
    +          return a Fraction representing this Fraction plus b
    + FractionFraction.plus(long n) + +
    +          return a Fraction representing this Fraction plus n
    + FractionFraction.times(Fraction b) + +
    +          return a Fraction representing this Fraction times b
    + FractionFraction.times(long n) + +
    +          return a Fraction representing this Fraction times n
    +  +

    + + + + + + + + + + + + + + + + + + + + + +
    Methods in com.myronmarston.util with parameters of type Fraction
    + FractionFraction.dividedBy(Fraction b) + +
    +          return a Fraction representing this Fraction divided by b
    + FractionFraction.minus(Fraction b) + +
    +          return a Fraction representing this Fraction minus b
    + FractionFraction.plus(Fraction b) + +
    +          return a Fraction representing this Fraction plus b
    + FractionFraction.times(Fraction b) + +
    +          return a Fraction representing this Fraction times b
    +  +

    + + + + + + + + +
    Constructors in com.myronmarston.util with parameters of type Fraction
    Fraction(Fraction f) + +
    +          Create a fraction with the same value as Fraction f
    +  +

    +

    + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + +
    Overview  Package  Class   Use  Tree  Deprecated  Index  Help 
    +    		 + +
    + PREV  + NEXT + FRAMES   + NO FRAMES   +  + + + +
    + + + +
    + + + diff --git a/FractalComposer/dist/javadoc/com/myronmarston/util/package-frame.html b/FractalComposer/dist/javadoc/com/myronmarston/util/package-frame.html index 75d2ea0..4bc45c1 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/util/package-frame.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/util/package-frame.html @@ -24,6 +24,8 @@
    ClassHelper
    +Fraction +
    MathHelper     diff --git a/FractalComposer/dist/javadoc/com/myronmarston/util/package-summary.html b/FractalComposer/dist/javadoc/com/myronmarston/util/package-summary.html index ec349d1..2e46c05 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/util/package-summary.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/util/package-summary.html @@ -55,7 +55,7 @@  PREV PACKAGE  - NEXT PACKAGE + NEXT PACKAGE     FRAMES    NO FRAMES   @@ -92,6 +92,10 @@

      +Fraction +An immutable class representing fractions as pairs of longs. + + MathHelper A class containing static helper methods for some math functions used to generate fractal music. @@ -133,7 +137,7 @@

     PREV PACKAGE  - NEXT PACKAGE + NEXT PACKAGE FRAMES    NO FRAMES   diff --git a/FractalComposer/dist/javadoc/com/myronmarston/util/package-tree.html b/FractalComposer/dist/javadoc/com/myronmarston/util/package-tree.html index d637970..b099c93 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/util/package-tree.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/util/package-tree.html @@ -55,7 +55,7 @@  PREV  - NEXT + NEXT FRAMES    NO FRAMES   @@ -91,7 +91,8 @@

    • java.lang.Object +
    • com.myronmarston.util.ClassHelper
    • com.myronmarston.util.Fraction (implements java.lang.Cloneable, java.lang.Comparable<T>, java.io.Serializable) +
    • com.myronmarston.util.MathHelper
    @@ -124,7 +125,7 @@

     PREV  - NEXT + NEXT FRAMES    NO FRAMES   diff --git a/FractalComposer/dist/javadoc/com/myronmarston/util/package-use.html b/FractalComposer/dist/javadoc/com/myronmarston/util/package-use.html index 17bc409..670727e 100644 --- a/FractalComposer/dist/javadoc/com/myronmarston/util/package-use.html +++ b/FractalComposer/dist/javadoc/com/myronmarston/util/package-use.html @@ -82,7 +82,90 @@

    Uses of Package
    com.myronmarston.util

    -No usage of com.myronmarston.util + + + + + + + + + + + + + + + + + + + + + +
    +Packages that use com.myronmarston.util
    com.myronmarston.music  
    com.myronmarston.music.settings  
    com.myronmarston.music.transformers  
    com.myronmarston.util  
    +  +

    + + + + + + + + +
    +Classes in com.myronmarston.util used by com.myronmarston.music
    Fraction + +
    +          An immutable class representing fractions as pairs of longs.
    +  +

    + + + + + + + + +
    +Classes in com.myronmarston.util used by com.myronmarston.music.settings
    Fraction + +
    +          An immutable class representing fractions as pairs of longs.
    +  +

    + + + + + + + + +
    +Classes in com.myronmarston.util used by com.myronmarston.music.transformers
    Fraction + +
    +          An immutable class representing fractions as pairs of longs.
    +  +

    + + + + + + + + +
    +Classes in com.myronmarston.util used by com.myronmarston.util
    Fraction + +
    +          An immutable class representing fractions as pairs of longs.
    + 

    diff --git a/FractalComposer/dist/javadoc/index-files/index-1.html b/FractalComposer/dist/javadoc/index-files/index-1.html index 3d3189e..e4816af 100644 --- a/FractalComposer/dist/javadoc/index-files/index-1.html +++ b/FractalComposer/dist/javadoc/index-files/index-1.html @@ -91,8 +91,8 @@
    add(int, M) - Method in class com.myronmarston.music.settings.VoiceOrSectionList
    Insert the given Voice or Section into the list at the given index. -
    asDouble() - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    asDouble() - +Method in class com.myronmarston.util.Fraction
    Return the value of the Fraction as a double
    AVAILABLE_INSTRUMENTS - Static variable in class com.myronmarston.music.Instrument diff --git a/FractalComposer/dist/javadoc/index-files/index-11.html b/FractalComposer/dist/javadoc/index-files/index-11.html index f36ee22..9afc165 100644 --- a/FractalComposer/dist/javadoc/index-files/index-11.html +++ b/FractalComposer/dist/javadoc/index-files/index-11.html @@ -139,11 +139,11 @@
    MinorScale() - Constructor for class com.myronmarston.music.scales.MinorScale
    Provided to allow xml deserialization. -
    minus(Fraction) - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    minus(Fraction) - +Method in class com.myronmarston.util.Fraction
    return a Fraction representing this Fraction minus b -
    minus(long) - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    minus(long) - +Method in class com.myronmarston.util.Fraction
    return a Fraction representing this Fraction minus n

    diff --git a/FractalComposer/dist/javadoc/index-files/index-12.html b/FractalComposer/dist/javadoc/index-files/index-12.html index 7a5485f..44be585 100644 --- a/FractalComposer/dist/javadoc/index-files/index-12.html +++ b/FractalComposer/dist/javadoc/index-files/index-12.html @@ -81,8 +81,8 @@

    N

    -
    negative() - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    negative() - +Method in class com.myronmarston.util.Fraction
    return a Fraction representing the negated value of this Fraction
    NonPositiveTimeSignatureException - Exception in com.myronmarston.music.settings
    Exception that is thrown when a time signature is given a negative or zero numerator or denominator.
    NonPositiveTimeSignatureException(int) - @@ -91,10 +91,10 @@
    Note - Class in com.myronmarston.music
    Represents a note, relative to a particular scale.
    Note() - Constructor for class com.myronmarston.music.Note
    Default constructor. -
    Note(int, int, int, Fraction, int) - +
    Note(int, int, int, Fraction, int) - Constructor for class com.myronmarston.music.Note
    Constructor. -
    Note(int, int, int, Fraction, int, SegmentSettings) - +
    Note(int, int, int, Fraction, int, SegmentSettings) - Constructor for class com.myronmarston.music.Note
    Constructor.
    Note(Note) - @@ -118,11 +118,11 @@
    NUM_LETTER_NAMES - Static variable in enum com.myronmarston.music.NoteName
      -
    numerator() - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    numerator() - +Method in class com.myronmarston.util.Fraction
    Return the numerator -
    numerator_ - -Variable in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    numerator_ - +Variable in class com.myronmarston.util.Fraction
     
    diff --git a/FractalComposer/dist/javadoc/index-files/index-14.html b/FractalComposer/dist/javadoc/index-files/index-14.html index db91df8..58c1300 100644 --- a/FractalComposer/dist/javadoc/index-files/index-14.html +++ b/FractalComposer/dist/javadoc/index-files/index-14.html @@ -84,14 +84,14 @@
    parseNoteListString(String, Scale) - Static method in class com.myronmarston.music.NoteList
    Creates a new note list based on the given note list string. -
    parseNoteString(String, Scale, Fraction, Integer) - +
    parseNoteString(String, Scale, Fraction, Integer) - Static method in class com.myronmarston.music.Note
    Parses a note string such as F#4,1/8,MF. -
    plus(Fraction) - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    plus(Fraction) - +Method in class com.myronmarston.util.Fraction
    return a Fraction representing this Fraction plus b -
    plus(long) - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    plus(long) - +Method in class com.myronmarston.util.Fraction
    return a Fraction representing this Fraction plus n
    diff --git a/FractalComposer/dist/javadoc/index-files/index-15.html b/FractalComposer/dist/javadoc/index-files/index-15.html index 2003d58..4174c46 100644 --- a/FractalComposer/dist/javadoc/index-files/index-15.html +++ b/FractalComposer/dist/javadoc/index-files/index-15.html @@ -88,7 +88,7 @@ Constructor for class com.myronmarston.music.transformers.RetrogradeTransformer
     
    RhythmicDurationTransformer - Class in com.myronmarston.music.transformers
    Transformer that scales the the rhythmic duration of the notes by some scale - factor.
    RhythmicDurationTransformer(Fraction) - + factor.
    RhythmicDurationTransformer(Fraction) - Constructor for class com.myronmarston.music.transformers.RhythmicDurationTransformer
    Constructor.
    diff --git a/FractalComposer/dist/javadoc/index-files/index-16.html b/FractalComposer/dist/javadoc/index-files/index-16.html index 9465e63..a3160b7 100644 --- a/FractalComposer/dist/javadoc/index-files/index-16.html +++ b/FractalComposer/dist/javadoc/index-files/index-16.html @@ -185,7 +185,7 @@
    setDuration(long) - Method in class com.myronmarston.music.MidiNote
    Sets how long the note should be, in midi ticks. -
    setDuration(Fraction) - +
    setDuration(Fraction) - Method in class com.myronmarston.music.Note
    Sets how long the note should last, in whole notes.
    setGenerateLayeredIntro(boolean) - @@ -246,7 +246,7 @@
    setSelfSimilaritySettingsOnAllVoiceSections(Boolean, Boolean, Boolean) - Method in class com.myronmarston.music.settings.AbstractVoiceOrSection
    Updates the self-similarity settings of all voice sections. -
    setSpeedScaleFactor(Fraction) - +
    setSpeedScaleFactor(Fraction) - Method in class com.myronmarston.music.settings.Voice
    Sets the speed scale factor to apply to the germ for use by this voice.
    setStartTime(long) - diff --git a/FractalComposer/dist/javadoc/index-files/index-17.html b/FractalComposer/dist/javadoc/index-files/index-17.html index 55f04a9..423134c 100644 --- a/FractalComposer/dist/javadoc/index-files/index-17.html +++ b/FractalComposer/dist/javadoc/index-files/index-17.html @@ -88,11 +88,11 @@ Method in class com.myronmarston.music.Note
    Throws an exception if the changing field is not being changed to zero and the note is a rest. -
    times(Fraction) - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    times(Fraction) - +Method in class com.myronmarston.util.Fraction
    return a Fraction representing this Fraction times b -
    times(long) - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    times(long) - +Method in class com.myronmarston.util.Fraction
    return a Fraction representing this Fraction times n
    TimeSignature - Class in com.myronmarston.music.settings
    Class that holds the time signature for the fractal piece.
    TimeSignature(int, int) - Constructor for class com.myronmarston.music.settings.TimeSignature @@ -110,8 +110,8 @@
    toString() - Method in class com.myronmarston.music.scales.Scale
      -
    toString() - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    toString() - +Method in class com.myronmarston.util.Fraction
     
    transform(NoteList) - Method in class com.myronmarston.music.transformers.InversionTransformer diff --git a/FractalComposer/dist/javadoc/index-files/index-2.html b/FractalComposer/dist/javadoc/index-files/index-2.html index faa3b2e..a0294cd 100644 --- a/FractalComposer/dist/javadoc/index-files/index-2.html +++ b/FractalComposer/dist/javadoc/index-files/index-2.html @@ -97,26 +97,26 @@
    clearTempIntroOutroSections() - Method in class com.myronmarston.music.settings.FractalPiece
    Clears out any temporary intro or outro sections. -
    clone() - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    clone() - +Method in class com.myronmarston.util.Fraction
      -
    com.myronmarston.music - package com.myronmarston.music
     
    com.myronmarston.music.scales - package com.myronmarston.music.scales
     
    com.myronmarston.music.settings - package com.myronmarston.music.settings
     
    com.myronmarston.music.transformers - package com.myronmarston.music.transformers
     
    com.myronmarston.util - package com.myronmarston.util
     
    compareTo(Object) - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    com.myronmarston.music - package com.myronmarston.music
     
    com.myronmarston.music.scales - package com.myronmarston.music.scales
     
    com.myronmarston.music.settings - package com.myronmarston.music.settings
     
    com.myronmarston.music.transformers - package com.myronmarston.music.transformers
     
    com.myronmarston.util - package com.myronmarston.util
     
    compareTo(Object) - +Method in class com.myronmarston.util.Fraction
    return a number less, equal, or greater than zero reflecting whether this Fraction is less, equal or greater than the value of Fraction other. -
    compareTo(long) - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    compareTo(long) - +Method in class com.myronmarston.util.Fraction
    return a number less, equal, or greater than zero reflecting whether this Fraction is less, equal or greater than n. -
    convertToMidiNote(Scale, Fraction, int, int, boolean) - +
    convertToMidiNote(Scale, Fraction, int, int, boolean) - Method in class com.myronmarston.music.Note
    Converts the note to a Midi Note, that can then be used to get the actual Midi note on and note off events.
    CopyTransformer - Class in com.myronmarston.music.transformers
    Creates a copy of the input.
    CopyTransformer() - Constructor for class com.myronmarston.music.transformers.CopyTransformer
    Constructor. -
    createAndFillMidiTrack(Sequence, Scale, Fraction) - +
    createAndFillMidiTrack(Sequence, Scale, Fraction) - Method in class com.myronmarston.music.NoteList
    Fills the given midi track with the notes from this NoteList.
    createAndSaveMidiFile(String) - @@ -141,7 +141,7 @@
    createOutroSections() - Method in class com.myronmarston.music.settings.FractalPiece
    Creates the layered outro sections. -
    createRest(Fraction) - +
    createRest(Fraction) - Static method in class com.myronmarston.music.Note
    Creates a note that is a rest.
    createSection() - diff --git a/FractalComposer/dist/javadoc/index-files/index-3.html b/FractalComposer/dist/javadoc/index-files/index-3.html index a63ca28..3ca8b22 100644 --- a/FractalComposer/dist/javadoc/index-files/index-3.html +++ b/FractalComposer/dist/javadoc/index-files/index-3.html @@ -97,20 +97,20 @@
    DEFAULT_VELOCITY - Static variable in class com.myronmarston.music.MidiNote
    The default velocity (volume) of the note -
    denominator() - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    denominator() - +Method in class com.myronmarston.util.Fraction
    Return the denominator -
    denominator_ - -Variable in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    denominator_ - +Variable in class com.myronmarston.util.Fraction
     
    deserializationComplete(FractalPiece) - Method in class com.myronmarston.music.settings.VoiceOrSectionList
    Should be called when deserialization is complete. -
    dividedBy(Fraction) - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    dividedBy(Fraction) - +Method in class com.myronmarston.util.Fraction
    return a Fraction representing this Fraction divided by b -
    dividedBy(long) - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    dividedBy(long) - +Method in class com.myronmarston.util.Fraction
    return a Fraction representing this Fraction divided by n
    Dynamic - Enum in com.myronmarston.music
    Pre-defined volume levels based on musical dynamics.
    diff --git a/FractalComposer/dist/javadoc/index-files/index-4.html b/FractalComposer/dist/javadoc/index-files/index-4.html index 83dfc8e..1257453 100644 --- a/FractalComposer/dist/javadoc/index-files/index-4.html +++ b/FractalComposer/dist/javadoc/index-files/index-4.html @@ -81,7 +81,7 @@

    E

    -
    edu.oswego.cs.dl.util.concurrent.misc - package edu.oswego.cs.dl.util.concurrent.misc
     
    equals(Object) - +
    equals(Object) - Method in class com.myronmarston.music.Note
     
    equals(Object) - @@ -102,11 +102,11 @@
    equals(Object) - Method in class com.myronmarston.music.settings.VoiceSectionHashMapKey
      -
    equals(Object) - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    equals(Object) - +Method in class com.myronmarston.util.Fraction
      -
    equals(long) - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    equals(long) - +Method in class com.myronmarston.util.Fraction
     
    diff --git a/FractalComposer/dist/javadoc/index-files/index-5.html b/FractalComposer/dist/javadoc/index-files/index-5.html index b887650..7306f11 100644 --- a/FractalComposer/dist/javadoc/index-files/index-5.html +++ b/FractalComposer/dist/javadoc/index-files/index-5.html @@ -84,11 +84,11 @@
    FractalPiece - Class in com.myronmarston.music.settings
    The GrandDaddy of them all.
    FractalPiece() - Constructor for class com.myronmarston.music.settings.FractalPiece
      -
    Fraction - Class in edu.oswego.cs.dl.util.concurrent.misc
    An immutable class representing fractions as pairs of longs.
    Fraction(long, long) - -Constructor for class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    Fraction - Class in com.myronmarston.util
    An immutable class representing fractions as pairs of longs.
    Fraction(long, long) - +Constructor for class com.myronmarston.util.Fraction
    Create a Fraction equal in value to num / den -
    Fraction(Fraction) - -Constructor for class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    Fraction(Fraction) - +Constructor for class com.myronmarston.util.Fraction
    Create a fraction with the same value as Fraction f
    diff --git a/FractalComposer/dist/javadoc/index-files/index-6.html b/FractalComposer/dist/javadoc/index-files/index-6.html index 2903a36..5d31da3 100644 --- a/FractalComposer/dist/javadoc/index-files/index-6.html +++ b/FractalComposer/dist/javadoc/index-files/index-6.html @@ -81,8 +81,8 @@

    G

    -
    gcd(long, long) - -Static method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    gcd(long, long) - +Static method in class com.myronmarston.util.Fraction
    Compute the nonnegative greatest common divisor of a and b.
    generatePiece() - Method in class com.myronmarston.music.settings.FractalPiece @@ -219,7 +219,7 @@
    getKeySignatureMidiEvent() - Method in class com.myronmarston.music.scales.KeySignature
    Gets the midi key signature event. -
    getLengthenedVoiceSectionResult(Fraction) - +
    getLengthenedVoiceSectionResult(Fraction) - Method in class com.myronmarston.music.settings.VoiceSection
    Returns the voice section result, set to a particular length by padding it with repeats and/or rests as appropriate. diff --git a/FractalComposer/dist/javadoc/index-files/index-7.html b/FractalComposer/dist/javadoc/index-files/index-7.html index 404bece..fbb84f5 100644 --- a/FractalComposer/dist/javadoc/index-files/index-7.html +++ b/FractalComposer/dist/javadoc/index-files/index-7.html @@ -108,8 +108,8 @@
    hashCode() - Method in class com.myronmarston.music.settings.VoiceSectionHashMapKey
      -
    hashCode() - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    hashCode() - +Method in class com.myronmarston.util.Fraction
     
    diff --git a/FractalComposer/dist/javadoc/index-files/index-8.html b/FractalComposer/dist/javadoc/index-files/index-8.html index 3b1c4d6..5536ea4 100644 --- a/FractalComposer/dist/javadoc/index-files/index-8.html +++ b/FractalComposer/dist/javadoc/index-files/index-8.html @@ -108,8 +108,8 @@
    InvalidTimeSignatureException - Exception in com.myronmarston.music.settings
    Exception that is thrown when an invalid time signature is created.
    InvalidTimeSignatureException(int, String) - Constructor for exception com.myronmarston.music.settings.InvalidTimeSignatureException
    Constructor. -
    inverse() - -Method in class edu.oswego.cs.dl.util.concurrent.misc.Fraction +
    inverse() - +Method in class com.myronmarston.util.Fraction
    return a Fraction representing 1 / this Fraction
    InversionTransformer - Class in com.myronmarston.music.transformers
    Transformer that applies inversion to the given note list.
    InversionTransformer() - Constructor for class com.myronmarston.music.transformers.InversionTransformer diff --git a/FractalComposer/dist/javadoc/overview-frame.html b/FractalComposer/dist/javadoc/overview-frame.html index 722845f..9b4c9aa 100644 --- a/FractalComposer/dist/javadoc/overview-frame.html +++ b/FractalComposer/dist/javadoc/overview-frame.html @@ -39,8 +39,6 @@
    com.myronmarston.util
    -edu.oswego.cs.dl.util.concurrent.misc -
    diff --git a/FractalComposer/dist/javadoc/overview-summary.html b/FractalComposer/dist/javadoc/overview-summary.html index dc1e747..00a415d 100644 --- a/FractalComposer/dist/javadoc/overview-summary.html +++ b/FractalComposer/dist/javadoc/overview-summary.html @@ -104,10 +104,6 @@ com.myronmarston.util   - -edu.oswego.cs.dl.util.concurrent.misc -  -

    diff --git a/FractalComposer/dist/javadoc/overview-tree.html b/FractalComposer/dist/javadoc/overview-tree.html index 128db58..2326be9 100644 --- a/FractalComposer/dist/javadoc/overview-tree.html +++ b/FractalComposer/dist/javadoc/overview-tree.html @@ -83,7 +83,7 @@

    Hierarchy For All Packages

    -
    Package Hierarchies:
    com.myronmarston.music, com.myronmarston.music.scales, com.myronmarston.music.settings, com.myronmarston.music.transformers, com.myronmarston.util, edu.oswego.cs.dl.util.concurrent.misc
    +
    Package Hierarchies:
    com.myronmarston.music, com.myronmarston.music.scales, com.myronmarston.music.settings, com.myronmarston.music.transformers, com.myronmarston.util

    Class Hierarchy @@ -101,7 +101,7 @@

  • com.myronmarston.music.settings.AbstractVoiceOrSection<M,O>
    • com.myronmarston.music.settings.Section
    • com.myronmarston.music.settings.Voice
    -
  • com.myronmarston.util.ClassHelper
  • com.myronmarston.music.settings.FractalPiece
  • edu.oswego.cs.dl.util.concurrent.misc.Fraction (implements java.lang.Cloneable, java.lang.Comparable<T>, java.io.Serializable) +
  • com.myronmarston.util.ClassHelper
  • com.myronmarston.music.settings.FractalPiece
  • com.myronmarston.util.Fraction (implements java.lang.Cloneable, java.lang.Comparable<T>, java.io.Serializable)
  • com.myronmarston.music.Instrument
  • com.myronmarston.music.transformers.InversionTransformer (implements com.myronmarston.music.transformers.Transformer)
  • com.myronmarston.music.scales.KeySignature
  • com.myronmarston.util.MathHelper
  • com.myronmarston.music.MidiNote
  • com.myronmarston.music.Note
  • java.util.Observable diff --git a/FractalComposer/dist/javadoc/package-list b/FractalComposer/dist/javadoc/package-list index a8445b3..d95d16f 100644 --- a/FractalComposer/dist/javadoc/package-list +++ b/FractalComposer/dist/javadoc/package-list @@ -3,4 +3,3 @@ com.myronmarston.music.scales com.myronmarston.music.settings com.myronmarston.music.transformers com.myronmarston.util -edu.oswego.cs.dl.util.concurrent.misc diff --git a/FractalComposer/dist/javadoc/serialized-form.html b/FractalComposer/dist/javadoc/serialized-form.html index a8b0dc4..a399d5d 100644 --- a/FractalComposer/dist/javadoc/serialized-form.html +++ b/FractalComposer/dist/javadoc/serialized-form.html @@ -287,16 +287,16 @@

    +Packagecom.myronmarston.util
    -Package edu.oswego.cs.dl.util.concurrent.misc

    - + +Class com.myronmarston.util.Fraction extends java.lang.Object implements Serializable
    -Class edu.oswego.cs.dl.util.concurrent.misc.Fraction extends java.lang.Object implements Serializable
    diff --git a/FractalComposer/src/com/myronmarston/music/Note.java b/FractalComposer/src/com/myronmarston/music/Note.java index 36eb818..4ee26f4 100644 --- a/FractalComposer/src/com/myronmarston/music/Note.java +++ b/FractalComposer/src/com/myronmarston/music/Note.java @@ -4,7 +4,7 @@ import com.myronmarston.music.scales.Scale; import com.myronmarston.music.NoteStringInvalidPartException.NoteStringPart; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import org.simpleframework.xml.*; diff --git a/FractalComposer/src/com/myronmarston/music/NoteList.java b/FractalComposer/src/com/myronmarston/music/NoteList.java index 43d9cf6..21797c5 100644 --- a/FractalComposer/src/com/myronmarston/music/NoteList.java +++ b/FractalComposer/src/com/myronmarston/music/NoteList.java @@ -2,7 +2,7 @@ import com.myronmarston.music.scales.Scale; import com.myronmarston.util.MathHelper; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import java.util.*; import javax.sound.midi.InvalidMidiDataException; diff --git a/FractalComposer/src/com/myronmarston/music/settings/FractalPiece.java b/FractalComposer/src/com/myronmarston/music/settings/FractalPiece.java index 8555882..a831c37 100644 --- a/FractalComposer/src/com/myronmarston/music/settings/FractalPiece.java +++ b/FractalComposer/src/com/myronmarston/music/settings/FractalPiece.java @@ -7,7 +7,7 @@ import com.myronmarston.music.scales.Scale; import com.myronmarston.music.Tempo; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import java.io.IOException; import javax.sound.midi.InvalidMidiDataException; diff --git a/FractalComposer/src/com/myronmarston/music/settings/Section.java b/FractalComposer/src/com/myronmarston/music/settings/Section.java index 3b8d30e..fc277bf 100644 --- a/FractalComposer/src/com/myronmarston/music/settings/Section.java +++ b/FractalComposer/src/com/myronmarston/music/settings/Section.java @@ -1,6 +1,6 @@ package com.myronmarston.music.settings; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import com.myronmarston.music.NoteList; import java.io.IOException; import org.simpleframework.xml.*; diff --git a/FractalComposer/src/com/myronmarston/music/settings/Voice.java b/FractalComposer/src/com/myronmarston/music/settings/Voice.java index c1c5e8a..b4d9ee7 100644 --- a/FractalComposer/src/com/myronmarston/music/settings/Voice.java +++ b/FractalComposer/src/com/myronmarston/music/settings/Voice.java @@ -9,7 +9,7 @@ import javax.sound.midi.InvalidMidiDataException; import org.simpleframework.xml.*; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import java.util.*; /** diff --git a/FractalComposer/src/com/myronmarston/music/settings/VoiceSection.java b/FractalComposer/src/com/myronmarston/music/settings/VoiceSection.java index 4160877..20fa11e 100644 --- a/FractalComposer/src/com/myronmarston/music/settings/VoiceSection.java +++ b/FractalComposer/src/com/myronmarston/music/settings/VoiceSection.java @@ -9,7 +9,7 @@ import org.simpleframework.xml.*; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import java.io.IOException; import javax.sound.midi.InvalidMidiDataException; diff --git a/FractalComposer/src/com/myronmarston/music/transformers/RhythmicDurationTransformer.java b/FractalComposer/src/com/myronmarston/music/transformers/RhythmicDurationTransformer.java index 4147302..c3f2f11 100644 --- a/FractalComposer/src/com/myronmarston/music/transformers/RhythmicDurationTransformer.java +++ b/FractalComposer/src/com/myronmarston/music/transformers/RhythmicDurationTransformer.java @@ -3,7 +3,7 @@ import com.myronmarston.music.Note; import com.myronmarston.music.NoteList; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; /** * Transformer that scales the the rhythmic duration of the notes by some scale diff --git a/FractalComposer/src/com/myronmarston/util/Fraction.java b/FractalComposer/src/com/myronmarston/util/Fraction.java index 8f31cb9..de20555 100644 --- a/FractalComposer/src/com/myronmarston/util/Fraction.java +++ b/FractalComposer/src/com/myronmarston/util/Fraction.java @@ -1,6 +1,8 @@ /* File: Fraction.java Downloaded from: http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/misc/Fraction.java + This has been moved to the com.myronmarston.util package because JRuby seems + to have issues importing from an edu package. Originally written by Doug Lea and released into the public domain. This may be used for any purposes whatsoever without acknowledgment. @@ -13,7 +15,7 @@ 11Oct1999 dl add hashCode */ -package edu.oswego.cs.dl.util.concurrent.misc; +package com.myronmarston.util; import org.simpleframework.xml.*; diff --git a/FractalComposer/test/com/myronmarston/music/NoteListTest.java b/FractalComposer/test/com/myronmarston/music/NoteListTest.java index 2ef8562..f927621 100644 --- a/FractalComposer/test/com/myronmarston/music/NoteListTest.java +++ b/FractalComposer/test/com/myronmarston/music/NoteListTest.java @@ -4,7 +4,7 @@ import com.myronmarston.music.scales.MajorScale; import com.myronmarston.music.scales.Scale; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import java.util.*; diff --git a/FractalComposer/test/com/myronmarston/music/NoteTest.java b/FractalComposer/test/com/myronmarston/music/NoteTest.java index 3b60a44..e8c64c9 100644 --- a/FractalComposer/test/com/myronmarston/music/NoteTest.java +++ b/FractalComposer/test/com/myronmarston/music/NoteTest.java @@ -2,7 +2,7 @@ import com.myronmarston.music.NoteStringInvalidPartException.NoteStringPart; import com.myronmarston.music.scales.*; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import javax.sound.midi.InvalidMidiDataException; import org.junit.Test; diff --git a/FractalComposer/test/com/myronmarston/music/scales/ScaleTest.java b/FractalComposer/test/com/myronmarston/music/scales/ScaleTest.java index 1e3d341..28e3ed8 100644 --- a/FractalComposer/test/com/myronmarston/music/scales/ScaleTest.java +++ b/FractalComposer/test/com/myronmarston/music/scales/ScaleTest.java @@ -4,7 +4,7 @@ import com.myronmarston.music.Note; import com.myronmarston.music.NoteName; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import java.util.*; import org.junit.After; diff --git a/FractalComposer/test/com/myronmarston/music/settings/FractalPieceTest.java b/FractalComposer/test/com/myronmarston/music/settings/FractalPieceTest.java index d99f8ad..4e42b67 100644 --- a/FractalComposer/test/com/myronmarston/music/settings/FractalPieceTest.java +++ b/FractalComposer/test/com/myronmarston/music/settings/FractalPieceTest.java @@ -1,6 +1,6 @@ package com.myronmarston.music.settings; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import com.myronmarston.music.*; import com.myronmarston.music.scales.*; diff --git a/FractalComposer/test/com/myronmarston/music/settings/PieceTest.java b/FractalComposer/test/com/myronmarston/music/settings/PieceTest.java index 9add967..55db562 100644 --- a/FractalComposer/test/com/myronmarston/music/settings/PieceTest.java +++ b/FractalComposer/test/com/myronmarston/music/settings/PieceTest.java @@ -2,7 +2,7 @@ import com.myronmarston.music.*; import com.myronmarston.music.scales.*; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import javax.sound.midi.*; diff --git a/FractalComposer/test/com/myronmarston/music/settings/SectionTest.java b/FractalComposer/test/com/myronmarston/music/settings/SectionTest.java index 65dea39..9cb66e8 100644 --- a/FractalComposer/test/com/myronmarston/music/settings/SectionTest.java +++ b/FractalComposer/test/com/myronmarston/music/settings/SectionTest.java @@ -1,7 +1,7 @@ package com.myronmarston.music.settings; import com.myronmarston.music.*; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import org.junit.Test; import static org.junit.Assert.*; diff --git a/FractalComposer/test/com/myronmarston/music/settings/VoiceSectionTest.java b/FractalComposer/test/com/myronmarston/music/settings/VoiceSectionTest.java index 0af3cd5..f9a9a98 100644 --- a/FractalComposer/test/com/myronmarston/music/settings/VoiceSectionTest.java +++ b/FractalComposer/test/com/myronmarston/music/settings/VoiceSectionTest.java @@ -1,7 +1,7 @@ package com.myronmarston.music.settings; import com.myronmarston.music.*; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import org.junit.Test; import static org.junit.Assert.*; diff --git a/FractalComposer/test/com/myronmarston/music/settings/VoiceTest.java b/FractalComposer/test/com/myronmarston/music/settings/VoiceTest.java index e8f113f..bb43c2c 100644 --- a/FractalComposer/test/com/myronmarston/music/settings/VoiceTest.java +++ b/FractalComposer/test/com/myronmarston/music/settings/VoiceTest.java @@ -1,7 +1,7 @@ package com.myronmarston.music.settings; import com.myronmarston.music.*; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import org.junit.Test; import static org.junit.Assert.*; diff --git a/FractalComposer/test/com/myronmarston/music/settings/XmlSerializationTest.java b/FractalComposer/test/com/myronmarston/music/settings/XmlSerializationTest.java index 4c72714..d62aa5e 100644 --- a/FractalComposer/test/com/myronmarston/music/settings/XmlSerializationTest.java +++ b/FractalComposer/test/com/myronmarston/music/settings/XmlSerializationTest.java @@ -1,6 +1,6 @@ package com.myronmarston.music.settings; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import com.myronmarston.music.*; import com.myronmarston.music.scales.*; import org.simpleframework.xml.*; diff --git a/FractalComposer/test/com/myronmarston/music/transformers/TransformerTest.java b/FractalComposer/test/com/myronmarston/music/transformers/TransformerTest.java index 499f4f7..8218629 100644 --- a/FractalComposer/test/com/myronmarston/music/transformers/TransformerTest.java +++ b/FractalComposer/test/com/myronmarston/music/transformers/TransformerTest.java @@ -3,7 +3,7 @@ import com.myronmarston.music.Note; import com.myronmarston.music.NoteList; -import edu.oswego.cs.dl.util.concurrent.misc.Fraction; +import com.myronmarston.util.Fraction; import org.junit.After; import org.junit.AfterClass;