From d2365dfa001851aad23839a8fce7581c971eca9c Mon Sep 17 00:00:00 2001 From: Steven Yi Date: Sat, 9 Sep 2023 15:37:23 -0400 Subject: [PATCH 1/3] Removed overridden equals methods that were causing problems in code that depended on equality by identity rather than value [fixes #758] --- .../main/java/blue/automation/Parameter.java | 23 -------------- .../java/blue/automation/ParameterIdList.java | 5 ---- .../main/java/blue/components/lines/Line.java | 6 ---- .../src/main/java/blue/mixer/Channel.java | 6 ---- .../src/main/java/blue/mixer/ChannelList.java | 7 ----- .../main/java/blue/mixer/EffectsChain.java | 6 ---- blue-core/src/main/java/blue/mixer/Mixer.java | 7 ----- .../main/java/blue/noteProcessor/Code.java | 6 ---- .../blueSynthBuilder/BSBGraphicInterface.java | 6 ---- .../orchestra/blueSynthBuilder/BSBObject.java | 8 ----- .../blueSynthBuilder/PresetGroup.java | 6 ---- .../orchestra/blueX7/AlgorithmCommonData.java | 5 ---- .../blue/orchestra/blueX7/EnvelopePoint.java | 6 ---- .../java/blue/orchestra/blueX7/LFOData.java | 6 ---- .../java/blue/orchestra/blueX7/Operator.java | 5 ---- .../src/main/java/blue/soundObject/JMask.java | 8 ----- .../java/blue/soundObject/ObjectBuilder.java | 8 ----- .../java/blue/soundObject/TrackerObject.java | 7 ----- .../blue/soundObject/jmask/Accumulator.java | 6 ---- .../java/blue/soundObject/jmask/Constant.java | 9 ------ .../java/blue/soundObject/jmask/Field.java | 6 ---- .../java/blue/soundObject/jmask/ItemList.java | 6 ---- .../java/blue/soundObject/jmask/Mask.java | 6 ---- .../blue/soundObject/jmask/Oscillator.java | 5 ---- .../blue/soundObject/jmask/Parameter.java | 6 ---- .../blue/soundObject/jmask/Probability.java | 6 ---- .../blue/soundObject/jmask/Quantizer.java | 6 ---- .../java/blue/soundObject/jmask/Random.java | 6 ---- .../java/blue/soundObject/jmask/Segment.java | 6 ---- .../java/blue/soundObject/jmask/Table.java | 6 ---- .../blue/soundObject/jmask/TablePoint.java | 6 ---- .../blue/soundObject/pattern/Pattern.java | 9 ------ .../java/blue/soundObject/tracker/Column.java | 6 ---- .../java/blue/soundObject/tracker/Track.java | 6 ---- .../blue/soundObject/tracker/TrackList.java | 6 ---- .../blue/soundObject/tracker/TrackerNote.java | 6 ---- .../src/test/java/blue/mixer/MixerTest.java | 10 ++++--- .../blue/soundObject/PatternObjectTest.java | 30 +++++++++---------- 38 files changed, 21 insertions(+), 263 deletions(-) diff --git a/blue-core/src/main/java/blue/automation/Parameter.java b/blue-core/src/main/java/blue/automation/Parameter.java index a228a87fa..03089c921 100644 --- a/blue-core/src/main/java/blue/automation/Parameter.java +++ b/blue-core/src/main/java/blue/automation/Parameter.java @@ -32,7 +32,6 @@ import javafx.beans.property.SimpleBooleanProperty; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; /** @@ -388,28 +387,6 @@ public static Parameter loadFromXML(Element data) { return retVal; } - @Override - public boolean equals(Object obj) { - if (!(obj instanceof Parameter)) { - return false; - } - - Parameter other = (Parameter) obj; - - return new EqualsBuilder() - .append(uniqueId, other.uniqueId) - .append(min, other.min) - .append(max, other.max) - .append(label, other.label) - .append(resolution, other.resolution) - .append(line, other.line) - .append(automationEnabled.get(), other.automationEnabled.get()) - .append(updatingLine, other.updatingLine) - .append(value, other.value) - .isEquals(); - - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/automation/ParameterIdList.java b/blue-core/src/main/java/blue/automation/ParameterIdList.java index ec592ff26..50aca3171 100644 --- a/blue-core/src/main/java/blue/automation/ParameterIdList.java +++ b/blue-core/src/main/java/blue/automation/ParameterIdList.java @@ -26,7 +26,6 @@ import javax.swing.event.ListDataListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class ParameterIdList implements Iterable { @@ -259,10 +258,6 @@ private void fireListSelectionEvent(int index) { } /* OTHER METHODS */ - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } @Override public String toString() { diff --git a/blue-core/src/main/java/blue/components/lines/Line.java b/blue-core/src/main/java/blue/components/lines/Line.java index 1427564ac..15dde0b15 100644 --- a/blue-core/src/main/java/blue/components/lines/Line.java +++ b/blue-core/src/main/java/blue/components/lines/Line.java @@ -29,7 +29,6 @@ import java.math.RoundingMode; import java.rmi.dgc.VMID; import java.util.*; -import java.util.stream.Collectors; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javax.swing.event.ChangeEvent; @@ -37,7 +36,6 @@ import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.text.StrBuilder; /** @@ -761,10 +759,6 @@ public double getValue(double time) { return y; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } public boolean isRightBound() { return rightBound; diff --git a/blue-core/src/main/java/blue/mixer/Channel.java b/blue-core/src/main/java/blue/mixer/Channel.java index 3fd22e758..cb5752409 100644 --- a/blue-core/src/main/java/blue/mixer/Channel.java +++ b/blue-core/src/main/java/blue/mixer/Channel.java @@ -35,7 +35,6 @@ import java.util.Iterator; import java.util.List; import java.util.Vector; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; /** @@ -375,11 +374,6 @@ public int compareTo(Channel chanB) { } } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/mixer/ChannelList.java b/blue-core/src/main/java/blue/mixer/ChannelList.java index 1c8f02084..6c5760401 100644 --- a/blue-core/src/main/java/blue/mixer/ChannelList.java +++ b/blue-core/src/main/java/blue/mixer/ChannelList.java @@ -25,9 +25,7 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -214,11 +212,6 @@ public int hashCode() { return HashCodeBuilder.reflectionHashCode(11, 41, this, false); } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj, false); - } - public void addPropertyChangeListener(PropertyChangeListener pcl) { if (propSupport == null) { propSupport = new PropertyChangeSupport(this); diff --git a/blue-core/src/main/java/blue/mixer/EffectsChain.java b/blue-core/src/main/java/blue/mixer/EffectsChain.java index a113f3620..8f3406ea9 100644 --- a/blue-core/src/main/java/blue/mixer/EffectsChain.java +++ b/blue-core/src/main/java/blue/mixer/EffectsChain.java @@ -33,7 +33,6 @@ import javax.swing.ListModel; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class EffectsChain implements ListModel, PropertyChangeListener { @@ -143,11 +142,6 @@ public int size() { return effects.size(); } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - public void pushUp(int index) { if (index > 0 && index < size()) { Object a = effects.remove(index - 1); diff --git a/blue-core/src/main/java/blue/mixer/Mixer.java b/blue-core/src/main/java/blue/mixer/Mixer.java index 631264675..bdece942e 100644 --- a/blue-core/src/main/java/blue/mixer/Mixer.java +++ b/blue-core/src/main/java/blue/mixer/Mixer.java @@ -22,7 +22,6 @@ import blue.CompileData; import blue.orchestra.GenericInstrument; import blue.udo.OpcodeList; -import blue.utility.ObjectUtilities; import blue.util.ObservableArrayList; import blue.util.ObservableList; import blue.utility.XMLUtilities; @@ -33,7 +32,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.text.StrBuilder; /** @@ -459,9 +457,4 @@ public Map getSubChannelCache() { } - - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } } diff --git a/blue-core/src/main/java/blue/noteProcessor/Code.java b/blue-core/src/main/java/blue/noteProcessor/Code.java index 45c5c76e0..b2443c49f 100644 --- a/blue-core/src/main/java/blue/noteProcessor/Code.java +++ b/blue-core/src/main/java/blue/noteProcessor/Code.java @@ -19,8 +19,6 @@ */ package blue.noteProcessor; -import org.apache.commons.lang3.builder.EqualsBuilder; - public class Code { private String code = ""; @@ -45,8 +43,4 @@ public String toString() { return "Edit Code"; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } } diff --git a/blue-core/src/main/java/blue/orchestra/blueSynthBuilder/BSBGraphicInterface.java b/blue-core/src/main/java/blue/orchestra/blueSynthBuilder/BSBGraphicInterface.java index abb68d859..c02c8e671 100644 --- a/blue-core/src/main/java/blue/orchestra/blueSynthBuilder/BSBGraphicInterface.java +++ b/blue-core/src/main/java/blue/orchestra/blueSynthBuilder/BSBGraphicInterface.java @@ -28,7 +28,6 @@ import javafx.beans.property.SimpleBooleanProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableSet; -import org.apache.commons.lang3.builder.EqualsBuilder; /** * Stores BSBObjects, notification of changes used by BSBParameterList to keep @@ -133,11 +132,6 @@ public Element saveAsXML() { return retVal; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - public final void setEditEnabled(boolean value) { editEnabled.set(value); } diff --git a/blue-core/src/main/java/blue/orchestra/blueSynthBuilder/BSBObject.java b/blue-core/src/main/java/blue/orchestra/blueSynthBuilder/BSBObject.java index 9cdd9ecf8..3d495ab2b 100644 --- a/blue-core/src/main/java/blue/orchestra/blueSynthBuilder/BSBObject.java +++ b/blue-core/src/main/java/blue/orchestra/blueSynthBuilder/BSBObject.java @@ -23,13 +23,10 @@ import electric.xml.Element; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import java.util.Iterator; -import java.util.Vector; import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; -import org.apache.commons.lang3.builder.EqualsBuilder; /** * @author Steven Yi @@ -212,11 +209,6 @@ public static Element getBasicXML(BSBObject bsbObj) { public abstract void setPresetValue(String val); - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - // EVENT LISTENERS public void addPropertyChangeListener(PropertyChangeListener pcl) { propListeners.addPropertyChangeListener(pcl); diff --git a/blue-core/src/main/java/blue/orchestra/blueSynthBuilder/PresetGroup.java b/blue-core/src/main/java/blue/orchestra/blueSynthBuilder/PresetGroup.java index 04b51e7d3..3e2a59ed9 100644 --- a/blue-core/src/main/java/blue/orchestra/blueSynthBuilder/PresetGroup.java +++ b/blue-core/src/main/java/blue/orchestra/blueSynthBuilder/PresetGroup.java @@ -23,7 +23,6 @@ import electric.xml.Elements; import java.util.ArrayList; import java.util.Iterator; -import org.apache.commons.lang3.builder.EqualsBuilder; /** * @author steven @@ -279,9 +278,4 @@ public String toString() { return getPresetGroupName(); } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - } diff --git a/blue-core/src/main/java/blue/orchestra/blueX7/AlgorithmCommonData.java b/blue-core/src/main/java/blue/orchestra/blueX7/AlgorithmCommonData.java index 6dc53632c..f9ae8c77c 100644 --- a/blue-core/src/main/java/blue/orchestra/blueX7/AlgorithmCommonData.java +++ b/blue-core/src/main/java/blue/orchestra/blueX7/AlgorithmCommonData.java @@ -3,7 +3,6 @@ import blue.utility.XMLUtilities; import electric.xml.Element; import electric.xml.Elements; -import org.apache.commons.lang3.builder.EqualsBuilder; /** *

@@ -84,8 +83,4 @@ public Element saveAsXML() { return retVal; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } } \ No newline at end of file diff --git a/blue-core/src/main/java/blue/orchestra/blueX7/EnvelopePoint.java b/blue-core/src/main/java/blue/orchestra/blueX7/EnvelopePoint.java index 6f2cbff41..877759942 100644 --- a/blue-core/src/main/java/blue/orchestra/blueX7/EnvelopePoint.java +++ b/blue-core/src/main/java/blue/orchestra/blueX7/EnvelopePoint.java @@ -1,7 +1,6 @@ package blue.orchestra.blueX7; import electric.xml.Element; -import org.apache.commons.lang3.builder.EqualsBuilder; /** *

@@ -53,9 +52,4 @@ public Element saveAsXML() { return retVal; } - - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } } diff --git a/blue-core/src/main/java/blue/orchestra/blueX7/LFOData.java b/blue-core/src/main/java/blue/orchestra/blueX7/LFOData.java index c2d5d5759..50306db7c 100644 --- a/blue-core/src/main/java/blue/orchestra/blueX7/LFOData.java +++ b/blue-core/src/main/java/blue/orchestra/blueX7/LFOData.java @@ -2,7 +2,6 @@ import blue.utility.XMLUtilities; import electric.xml.Element; -import org.apache.commons.lang3.builder.EqualsBuilder; /** *

@@ -76,9 +75,4 @@ public Element saveAsXML() { return retVal; } - - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } } diff --git a/blue-core/src/main/java/blue/orchestra/blueX7/Operator.java b/blue-core/src/main/java/blue/orchestra/blueX7/Operator.java index 2700efae7..2dbebe7f4 100644 --- a/blue-core/src/main/java/blue/orchestra/blueX7/Operator.java +++ b/blue-core/src/main/java/blue/orchestra/blueX7/Operator.java @@ -3,7 +3,6 @@ import blue.utility.XMLUtilities; import electric.xml.Element; import electric.xml.Elements; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.text.StrBuilder; /** @@ -166,8 +165,4 @@ public Element saveAsXML() { return retVal; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } } diff --git a/blue-core/src/main/java/blue/soundObject/JMask.java b/blue-core/src/main/java/blue/soundObject/JMask.java index 73153637a..7625be978 100644 --- a/blue-core/src/main/java/blue/soundObject/JMask.java +++ b/blue-core/src/main/java/blue/soundObject/JMask.java @@ -22,16 +22,13 @@ import blue.CompileData; import blue.score.ScoreObjectEvent; import blue.noteProcessor.NoteProcessorChain; -import blue.noteProcessor.NoteProcessorException; import blue.plugin.SoundObjectPlugin; import blue.soundObject.jmask.Field; -import blue.utility.ObjectUtilities; import blue.utility.ScoreUtilities; import electric.xml.Element; import electric.xml.Elements; import java.util.Map; import java.util.Random; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; @SoundObjectPlugin(displayName = "JMask", live = true, position = 50) @@ -199,11 +196,6 @@ public void setSeed(long seed) { this.seed = seed; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/ObjectBuilder.java b/blue-core/src/main/java/blue/soundObject/ObjectBuilder.java index 7dc0a487b..e742565a5 100644 --- a/blue-core/src/main/java/blue/soundObject/ObjectBuilder.java +++ b/blue-core/src/main/java/blue/soundObject/ObjectBuilder.java @@ -27,7 +27,6 @@ import blue.orchestra.blueSynthBuilder.PresetGroup; import blue.plugin.SoundObjectPlugin; import blue.score.ScoreObjectEvent; -import blue.scripting.PythonProxy; import blue.scripting.ScoreScriptEngine; import blue.scripting.ScoreScriptEngineManager; import blue.utility.ScoreUtilities; @@ -42,8 +41,6 @@ import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import javax.script.ScriptException; -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.python.core.PyException; @SoundObjectPlugin(displayName = "ObjectBuilder", live = true, position = 70) public class ObjectBuilder extends AbstractSoundObject { @@ -330,11 +327,6 @@ public void setPresetGroup(PresetGroup presetGroup) { this.presetGroup = presetGroup; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - public boolean isEditEnabled() { return editEnabled; } diff --git a/blue-core/src/main/java/blue/soundObject/TrackerObject.java b/blue-core/src/main/java/blue/soundObject/TrackerObject.java index 0059912b3..a3bead555 100644 --- a/blue-core/src/main/java/blue/soundObject/TrackerObject.java +++ b/blue-core/src/main/java/blue/soundObject/TrackerObject.java @@ -34,7 +34,6 @@ import java.util.Iterator; import java.util.Map; import java.util.Vector; -import org.apache.commons.lang3.builder.EqualsBuilder; @SoundObjectPlugin(displayName = "TrackerObject", live=true, position = 140) public class TrackerObject extends AbstractSoundObject { @@ -197,12 +196,6 @@ public void setStepsPerBeat(int stepsPerBeat) { this.stepsPerBeat = stepsPerBeat; } - - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - private void firePropertyChangeEvent(PropertyChangeEvent pce) { if (listeners == null) { return; diff --git a/blue-core/src/main/java/blue/soundObject/jmask/Accumulator.java b/blue-core/src/main/java/blue/soundObject/jmask/Accumulator.java index 3ab6d7a52..02376a861 100644 --- a/blue-core/src/main/java/blue/soundObject/jmask/Accumulator.java +++ b/blue-core/src/main/java/blue/soundObject/jmask/Accumulator.java @@ -24,7 +24,6 @@ import blue.utility.XMLUtilities; import electric.xml.Element; import electric.xml.Elements; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class Accumulator { @@ -246,11 +245,6 @@ public void setRunningValue(double value) { this.runningValue = value; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/jmask/Constant.java b/blue-core/src/main/java/blue/soundObject/jmask/Constant.java index cc210cef2..5dccd95f0 100644 --- a/blue-core/src/main/java/blue/soundObject/jmask/Constant.java +++ b/blue-core/src/main/java/blue/soundObject/jmask/Constant.java @@ -23,7 +23,6 @@ import electric.xml.Element; import electric.xml.Elements; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class Constant implements Generator, Accumulatable { @@ -82,14 +81,6 @@ public double getValue(double time, java.util.Random rnd) { return value; } -// public JComponent getEditor() { -// return new ConstantEditor(this); -// } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/jmask/Field.java b/blue-core/src/main/java/blue/soundObject/jmask/Field.java index fd4f8d5b1..ac133a2c5 100644 --- a/blue-core/src/main/java/blue/soundObject/jmask/Field.java +++ b/blue-core/src/main/java/blue/soundObject/jmask/Field.java @@ -32,7 +32,6 @@ import javax.swing.ListModel; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class Field implements ListModel { @@ -278,11 +277,6 @@ private void fireContentsChangedEvent(ListDataEvent lde) { } } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/jmask/ItemList.java b/blue-core/src/main/java/blue/soundObject/jmask/ItemList.java index 95f97442d..cfbac6d6c 100644 --- a/blue-core/src/main/java/blue/soundObject/jmask/ItemList.java +++ b/blue-core/src/main/java/blue/soundObject/jmask/ItemList.java @@ -31,7 +31,6 @@ import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class ItemList implements Generator, TableModel, Accumulatable { @@ -330,11 +329,6 @@ public void setListType(int listType) { this.listType = listType; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/jmask/Mask.java b/blue-core/src/main/java/blue/soundObject/jmask/Mask.java index cb61f5f35..98690e139 100644 --- a/blue-core/src/main/java/blue/soundObject/jmask/Mask.java +++ b/blue-core/src/main/java/blue/soundObject/jmask/Mask.java @@ -24,7 +24,6 @@ import blue.utility.XMLUtilities; import electric.xml.Element; import electric.xml.Elements; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class Mask { @@ -158,11 +157,6 @@ public double getValue(double time, double val) { // public JComponent getEditor() { // return new MaskEditor(this); // } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/jmask/Oscillator.java b/blue-core/src/main/java/blue/soundObject/jmask/Oscillator.java index bea1a734f..4a733b269 100644 --- a/blue-core/src/main/java/blue/soundObject/jmask/Oscillator.java +++ b/blue-core/src/main/java/blue/soundObject/jmask/Oscillator.java @@ -261,11 +261,6 @@ private double powerdown(double phpt) { .pow(2.0, exponent)); } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/jmask/Parameter.java b/blue-core/src/main/java/blue/soundObject/jmask/Parameter.java index 846d766e7..75edabc9b 100644 --- a/blue-core/src/main/java/blue/soundObject/jmask/Parameter.java +++ b/blue-core/src/main/java/blue/soundObject/jmask/Parameter.java @@ -26,7 +26,6 @@ import electric.xml.Elements; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class Parameter { @@ -203,11 +202,6 @@ public Element saveAsXML() { return retVal; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/jmask/Probability.java b/blue-core/src/main/java/blue/soundObject/jmask/Probability.java index a52fd2ac2..77bb9e795 100644 --- a/blue-core/src/main/java/blue/soundObject/jmask/Probability.java +++ b/blue-core/src/main/java/blue/soundObject/jmask/Probability.java @@ -26,7 +26,6 @@ import blue.utility.XMLUtilities; import electric.xml.Element; import electric.xml.Elements; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class Probability implements Generator, Maskable, @@ -118,11 +117,6 @@ public static void main(String[] args) { } } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/jmask/Quantizer.java b/blue-core/src/main/java/blue/soundObject/jmask/Quantizer.java index 6712db594..76ea59ba4 100644 --- a/blue-core/src/main/java/blue/soundObject/jmask/Quantizer.java +++ b/blue-core/src/main/java/blue/soundObject/jmask/Quantizer.java @@ -24,7 +24,6 @@ import blue.utility.XMLUtilities; import electric.xml.Element; import electric.xml.Elements; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class Quantizer { @@ -193,11 +192,6 @@ public double getValue(double time, double val) { } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/jmask/Random.java b/blue-core/src/main/java/blue/soundObject/jmask/Random.java index c8bb02986..bdb776a12 100644 --- a/blue-core/src/main/java/blue/soundObject/jmask/Random.java +++ b/blue-core/src/main/java/blue/soundObject/jmask/Random.java @@ -23,7 +23,6 @@ import electric.xml.Element; import electric.xml.Elements; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class Random implements Generator, Quantizable, Accumulatable { @@ -103,11 +102,6 @@ public void setMin(double min) { this.min = min; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/jmask/Segment.java b/blue-core/src/main/java/blue/soundObject/jmask/Segment.java index 397fac1be..5fe4effed 100644 --- a/blue-core/src/main/java/blue/soundObject/jmask/Segment.java +++ b/blue-core/src/main/java/blue/soundObject/jmask/Segment.java @@ -23,7 +23,6 @@ import electric.xml.Element; import electric.xml.Elements; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class Segment implements Generator, Quantizable, Accumulatable { @@ -80,11 +79,6 @@ public Table getTable() { return table; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/jmask/Table.java b/blue-core/src/main/java/blue/soundObject/jmask/Table.java index df42e4e8b..fe0c6040f 100644 --- a/blue-core/src/main/java/blue/soundObject/jmask/Table.java +++ b/blue-core/src/main/java/blue/soundObject/jmask/Table.java @@ -32,7 +32,6 @@ import java.util.Iterator; import javax.swing.event.TableModelListener; import javax.swing.table.AbstractTableModel; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class Table extends AbstractTableModel { @@ -423,11 +422,6 @@ public Element saveAsXML() { return retVal; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj, false, this.getClass()); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/jmask/TablePoint.java b/blue-core/src/main/java/blue/soundObject/jmask/TablePoint.java index ba8da3990..ba26a0bac 100644 --- a/blue-core/src/main/java/blue/soundObject/jmask/TablePoint.java +++ b/blue-core/src/main/java/blue/soundObject/jmask/TablePoint.java @@ -26,7 +26,6 @@ import java.util.Vector; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class TablePoint { @@ -65,11 +64,6 @@ public Element saveAsXML() { return retVal; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/pattern/Pattern.java b/blue-core/src/main/java/blue/soundObject/pattern/Pattern.java index 5f27ddf00..282b052be 100644 --- a/blue-core/src/main/java/blue/soundObject/pattern/Pattern.java +++ b/blue-core/src/main/java/blue/soundObject/pattern/Pattern.java @@ -21,7 +21,6 @@ import electric.xml.Element; import electric.xml.Elements; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class Pattern { @@ -152,14 +151,6 @@ public static Pattern loadFromXML(Element data) { return retVal; } - /** - * @see java.lang.Object#equals(Object) - */ - @Override - public boolean equals(Object object) { - return EqualsBuilder.reflectionEquals(this, object); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/tracker/Column.java b/blue-core/src/main/java/blue/soundObject/tracker/Column.java index b4b2188e8..4f367007a 100644 --- a/blue-core/src/main/java/blue/soundObject/tracker/Column.java +++ b/blue-core/src/main/java/blue/soundObject/tracker/Column.java @@ -24,7 +24,6 @@ import blue.utility.XMLUtilities; import electric.xml.Element; import electric.xml.Elements; -import org.apache.commons.lang3.builder.EqualsBuilder; public class Column { @@ -163,11 +162,6 @@ public void setOutputFrequency(boolean outputFrequency) { this.outputFrequency = outputFrequency; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - /* VALIDATION AND OTHER METHODS */ public boolean isValid(final String input) { diff --git a/blue-core/src/main/java/blue/soundObject/tracker/Track.java b/blue-core/src/main/java/blue/soundObject/tracker/Track.java index 7b2198616..edd0726f1 100644 --- a/blue-core/src/main/java/blue/soundObject/tracker/Track.java +++ b/blue-core/src/main/java/blue/soundObject/tracker/Track.java @@ -34,7 +34,6 @@ import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; -import org.apache.commons.lang3.builder.EqualsBuilder; public class Track implements TableModel { @@ -451,11 +450,6 @@ private void fireTableDataChanged() { } } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - /* SERIALIZATION METHODS */ public Element saveAsXML() { diff --git a/blue-core/src/main/java/blue/soundObject/tracker/TrackList.java b/blue-core/src/main/java/blue/soundObject/tracker/TrackList.java index 1e10da9d1..a0c54c296 100644 --- a/blue-core/src/main/java/blue/soundObject/tracker/TrackList.java +++ b/blue-core/src/main/java/blue/soundObject/tracker/TrackList.java @@ -30,7 +30,6 @@ import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; public class TrackList implements TableModel { @@ -371,11 +370,6 @@ public int getTrackIndexForColumn(int column) { return index; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/blue-core/src/main/java/blue/soundObject/tracker/TrackerNote.java b/blue-core/src/main/java/blue/soundObject/tracker/TrackerNote.java index cafc2f130..a868eb448 100644 --- a/blue-core/src/main/java/blue/soundObject/tracker/TrackerNote.java +++ b/blue-core/src/main/java/blue/soundObject/tracker/TrackerNote.java @@ -23,7 +23,6 @@ import electric.xml.Element; import electric.xml.Elements; import java.util.ArrayList; -import org.apache.commons.lang3.builder.EqualsBuilder; public class TrackerNote { @@ -121,11 +120,6 @@ public boolean isActive() { return false; } - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - public Element saveAsXML() { Element retVal = new Element("trackerNote"); diff --git a/blue-core/src/test/java/blue/mixer/MixerTest.java b/blue-core/src/test/java/blue/mixer/MixerTest.java index 15dca8070..c2a6364cb 100644 --- a/blue-core/src/test/java/blue/mixer/MixerTest.java +++ b/blue-core/src/test/java/blue/mixer/MixerTest.java @@ -26,11 +26,13 @@ public class MixerTest extends TestCase { + // FIXME: Check if equals needs to be overridden... public void testSaveParam() { - Parameter p = new Parameter(); - Parameter clone = new Parameter(p); - System.out.println(p +":"+clone); - assertEquals(p, clone); +// Parameter p = new Parameter(); +// Parameter clone = new Parameter(p); +// System.out.println(p +":"+clone); +// assertEquals(p, clone); +assertTrue(true); } // public void testSave() { diff --git a/blue-core/src/test/java/blue/soundObject/PatternObjectTest.java b/blue-core/src/test/java/blue/soundObject/PatternObjectTest.java index edc90227a..8330f433a 100644 --- a/blue-core/src/test/java/blue/soundObject/PatternObjectTest.java +++ b/blue-core/src/test/java/blue/soundObject/PatternObjectTest.java @@ -41,22 +41,22 @@ public void testClone() { SoundObject clone = p.deepCopy(); - boolean isEqual = EqualsBuilder.reflectionEquals(p, clone); +// boolean isEqual = EqualsBuilder.reflectionEquals(p, clone); - if (!isEqual) { - StringBuilder buffer = new StringBuilder(); - buffer.append("Problem with Pattern\n"); - buffer.append("Original Object\n"); - buffer.append(ToStringBuilder.reflectionToString(p)).append("\n"); - buffer.append("Cloned Object\n"); - buffer.append(ToStringBuilder.reflectionToString(clone)).append( - "\n"); - - System.out.println(buffer.toString()); - - } - - assertTrue(isEqual); +// if (!isEqual) { +// StringBuilder buffer = new StringBuilder(); +// buffer.append("Problem with Pattern\n"); +// buffer.append("Original Object\n"); +// buffer.append(ToStringBuilder.reflectionToString(p)).append("\n"); +// buffer.append("Cloned Object\n"); +// buffer.append(ToStringBuilder.reflectionToString(clone)).append( +// "\n"); +// +// System.out.println(buffer.toString()); +// +// } +// +// assertTrue(isEqual); assertEquals(p.saveAsXML(null).toString(), clone.saveAsXML(null) .toString()); From f7f4d86b554d259bdfe0885b0e82bac1f207e875 Mon Sep 17 00:00:00 2001 From: Steven Yi Date: Sun, 10 Sep 2023 14:03:12 -0400 Subject: [PATCH 2/3] updated for 2.9.1 release --- ChangeLog.md | 8 ++++++++ application/pom.xml | 2 +- blue-application/pom.xml | 2 +- blue-clojure/pom.xml | 2 +- blue-core/pom.xml | 2 +- .../src/main/resources/blue/blueConstants.properties | 4 ++-- blue-csnd6/pom.xml | 2 +- blue-ext-commons-io/pom.xml | 2 +- blue-ext-commons-lang3/pom.xml | 2 +- blue-ext-exml/pom.xml | 2 +- blue-ext-jython/pom.xml | 2 +- blue-ext-openjfx/pom.xml | 2 +- blue-midi/pom.xml | 2 +- blue-osc/pom.xml | 2 +- blue-plaf/pom.xml | 2 +- blue-plugin/pom.xml | 2 +- blue-projects/pom.xml | 2 +- blue-score-layers-audio-core/pom.xml | 2 +- blue-score-layers-audio-ui/pom.xml | 2 +- blue-score-layers-patterns-core/pom.xml | 2 +- blue-score-layers-patterns-ui/pom.xml | 2 +- blue-services/pom.xml | 2 +- blue-settings/pom.xml | 2 +- blue-ui-components/pom.xml | 2 +- blue-ui-core/pom.xml | 2 +- blue-ui-editor/pom.xml | 2 +- blue-ui-filemanager/pom.xml | 2 +- blue-ui-nbutilities/pom.xml | 2 +- blue-ui-utilities/pom.xml | 2 +- blue-utilities/pom.xml | 2 +- branding/pom.xml | 2 +- cecilia/pom.xml | 2 +- csound-manual/pom.xml | 2 +- pom.xml | 2 +- 34 files changed, 42 insertions(+), 34 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index ef05df27e..7ced6f833 100755 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -11,6 +11,14 @@ information. # CHANGE LOG +## [2.9.1] - 2023-09-10 + +### FIX + +* Issues #758 - fixed issues with selection of JMask, Tracker, and other objects + due to issue with implementing equals() + + ## [2.9.0] - 2023-07-26 ### NEW diff --git a/application/pom.xml b/application/pom.xml index 10c6725f1..4e4c2ac3c 100755 --- a/application/pom.xml +++ b/application/pom.xml @@ -5,7 +5,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue diff --git a/blue-application/pom.xml b/blue-application/pom.xml index fa19ca46d..a22a74596 100755 --- a/blue-application/pom.xml +++ b/blue-application/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-application nbm diff --git a/blue-clojure/pom.xml b/blue-clojure/pom.xml index 1d8cd8e17..f13ee9883 100755 --- a/blue-clojure/pom.xml +++ b/blue-clojure/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-clojure nbm diff --git a/blue-core/pom.xml b/blue-core/pom.xml index cfacc8673..07288c166 100755 --- a/blue-core/pom.xml +++ b/blue-core/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-core nbm diff --git a/blue-core/src/main/resources/blue/blueConstants.properties b/blue-core/src/main/resources/blue/blueConstants.properties index bebe043e8..f7b75b941 100644 --- a/blue-core/src/main/resources/blue/blueConstants.properties +++ b/blue-core/src/main/resources/blue/blueConstants.properties @@ -1,2 +1,2 @@ -blueReleaseDate=2023.07.26 -blueVersion=2.9.0 +blueReleaseDate=2023.09.10 +blueVersion=2.9.1 diff --git a/blue-csnd6/pom.xml b/blue-csnd6/pom.xml index 69f416f3e..957e55c3a 100755 --- a/blue-csnd6/pom.xml +++ b/blue-csnd6/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-csnd6 nbm diff --git a/blue-ext-commons-io/pom.xml b/blue-ext-commons-io/pom.xml index da3479899..410c906cb 100644 --- a/blue-ext-commons-io/pom.xml +++ b/blue-ext-commons-io/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-ext-commons-io nbm diff --git a/blue-ext-commons-lang3/pom.xml b/blue-ext-commons-lang3/pom.xml index 09e926651..4a449a5d5 100644 --- a/blue-ext-commons-lang3/pom.xml +++ b/blue-ext-commons-lang3/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-ext-commons-lang3 nbm diff --git a/blue-ext-exml/pom.xml b/blue-ext-exml/pom.xml index f2242b249..3f79fea55 100755 --- a/blue-ext-exml/pom.xml +++ b/blue-ext-exml/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-ext-exml nbm diff --git a/blue-ext-jython/pom.xml b/blue-ext-jython/pom.xml index ced6fa79d..0b9bd7305 100755 --- a/blue-ext-jython/pom.xml +++ b/blue-ext-jython/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-ext-jython nbm diff --git a/blue-ext-openjfx/pom.xml b/blue-ext-openjfx/pom.xml index 603891174..bf21d6048 100755 --- a/blue-ext-openjfx/pom.xml +++ b/blue-ext-openjfx/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-ext-openjfx nbm diff --git a/blue-midi/pom.xml b/blue-midi/pom.xml index 113d5bd35..96f53943b 100755 --- a/blue-midi/pom.xml +++ b/blue-midi/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-midi nbm diff --git a/blue-osc/pom.xml b/blue-osc/pom.xml index 143a7b152..672c21311 100755 --- a/blue-osc/pom.xml +++ b/blue-osc/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-osc nbm diff --git a/blue-plaf/pom.xml b/blue-plaf/pom.xml index d55dc4204..19a091922 100755 --- a/blue-plaf/pom.xml +++ b/blue-plaf/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-plaf nbm diff --git a/blue-plugin/pom.xml b/blue-plugin/pom.xml index 0ef045f6b..badb7d5bf 100755 --- a/blue-plugin/pom.xml +++ b/blue-plugin/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-plugin nbm diff --git a/blue-projects/pom.xml b/blue-projects/pom.xml index a748b8e7a..b13eebab1 100755 --- a/blue-projects/pom.xml +++ b/blue-projects/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-projects nbm diff --git a/blue-score-layers-audio-core/pom.xml b/blue-score-layers-audio-core/pom.xml index bd48d8859..0c113ca27 100755 --- a/blue-score-layers-audio-core/pom.xml +++ b/blue-score-layers-audio-core/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-score-layers-audio-core nbm diff --git a/blue-score-layers-audio-ui/pom.xml b/blue-score-layers-audio-ui/pom.xml index 6724f6197..9e84d44ad 100755 --- a/blue-score-layers-audio-ui/pom.xml +++ b/blue-score-layers-audio-ui/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-score-layers-audio-ui nbm diff --git a/blue-score-layers-patterns-core/pom.xml b/blue-score-layers-patterns-core/pom.xml index 796d30697..0b2d28aae 100755 --- a/blue-score-layers-patterns-core/pom.xml +++ b/blue-score-layers-patterns-core/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-score-layers-patterns-core nbm diff --git a/blue-score-layers-patterns-ui/pom.xml b/blue-score-layers-patterns-ui/pom.xml index 4a17911ae..778030953 100755 --- a/blue-score-layers-patterns-ui/pom.xml +++ b/blue-score-layers-patterns-ui/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-score-layers-patterns-ui nbm diff --git a/blue-services/pom.xml b/blue-services/pom.xml index 9f006c689..2eb05d8e3 100755 --- a/blue-services/pom.xml +++ b/blue-services/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-services nbm diff --git a/blue-settings/pom.xml b/blue-settings/pom.xml index c077ce575..32e24c36f 100755 --- a/blue-settings/pom.xml +++ b/blue-settings/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-settings nbm diff --git a/blue-ui-components/pom.xml b/blue-ui-components/pom.xml index 4827404f2..cff9499f7 100755 --- a/blue-ui-components/pom.xml +++ b/blue-ui-components/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-ui-components nbm diff --git a/blue-ui-core/pom.xml b/blue-ui-core/pom.xml index d2954b9e2..ddfdc4579 100755 --- a/blue-ui-core/pom.xml +++ b/blue-ui-core/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-ui-core nbm diff --git a/blue-ui-editor/pom.xml b/blue-ui-editor/pom.xml index 6fcd78f47..cc5f8de66 100755 --- a/blue-ui-editor/pom.xml +++ b/blue-ui-editor/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-ui-editor nbm diff --git a/blue-ui-filemanager/pom.xml b/blue-ui-filemanager/pom.xml index 4f3282381..ec4603640 100755 --- a/blue-ui-filemanager/pom.xml +++ b/blue-ui-filemanager/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-ui-filemanager nbm diff --git a/blue-ui-nbutilities/pom.xml b/blue-ui-nbutilities/pom.xml index ddc84a6b1..3f65594f1 100755 --- a/blue-ui-nbutilities/pom.xml +++ b/blue-ui-nbutilities/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-ui-nbutilities nbm diff --git a/blue-ui-utilities/pom.xml b/blue-ui-utilities/pom.xml index ff51fbc04..e7c3d7776 100755 --- a/blue-ui-utilities/pom.xml +++ b/blue-ui-utilities/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-ui-utilities nbm diff --git a/blue-utilities/pom.xml b/blue-utilities/pom.xml index a957649e9..31be15843 100755 --- a/blue-utilities/pom.xml +++ b/blue-utilities/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-utilities nbm diff --git a/branding/pom.xml b/branding/pom.xml index a34409543..b4c4e1673 100755 --- a/branding/pom.xml +++ b/branding/pom.xml @@ -5,7 +5,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 blue-branding diff --git a/cecilia/pom.xml b/cecilia/pom.xml index 5af551c87..c827ee71f 100755 --- a/cecilia/pom.xml +++ b/cecilia/pom.xml @@ -4,7 +4,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 cecilia nbm diff --git a/csound-manual/pom.xml b/csound-manual/pom.xml index 25d3962c7..0cd96e5d1 100755 --- a/csound-manual/pom.xml +++ b/csound-manual/pom.xml @@ -5,7 +5,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 csound-manual nbm diff --git a/pom.xml b/pom.xml index c868f9820..789d89001 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.kunstmusik blue-parent - 2.9.0 + 2.9.1 pom blue-parent From aea6ab7152d82574a32f23f25653d8a21bb9aad8 Mon Sep 17 00:00:00 2001 From: Steven Yi Date: Sun, 10 Sep 2023 14:20:04 -0400 Subject: [PATCH 3/3] fix version numbers for artifacts --- .github/workflows/blue_ci_build.yml | 12 ++++++------ application/build-mac.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/blue_ci_build.yml b/.github/workflows/blue_ci_build.yml index d8735ef82..f278ef4c8 100644 --- a/.github/workflows/blue_ci_build.yml +++ b/.github/workflows/blue_ci_build.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/upload-artifact@v2 with: name: Blue (macOS arm64 .app) - path: application/target/blue-macOS-arm64-2.9.0.zip + path: application/target/blue-macOS-arm64-2.9.1.zip macos_x86_64: runs-on: macos-latest steps: @@ -37,7 +37,7 @@ jobs: - uses: actions/upload-artifact@v2 with: name: Blue (macOS x86_64 .app) - path: application/target/blue-macOS-x86_64-2.9.0.zip + path: application/target/blue-macOS-x86_64-2.9.1.zip linux: runs-on: ubuntu-latest steps: @@ -51,12 +51,12 @@ jobs: - name: Build Blue run: mvn -Dmaven.test.skip=true -Pgenerate-manual clean install - - run: mv application/target/blue-2.9.0.zip blue-linux-2.9.0.zip + - run: mv application/target/blue-2.9.1.zip blue-linux-2.9.1.zip - uses: actions/upload-artifact@v2 with: name: Blue Linux Zip - path: blue-linux-2.9.0.zip + path: blue-linux-2.9.1.zip windows: runs-on: windows-latest @@ -71,9 +71,9 @@ jobs: - name: Build Blue run: mvn -Pgenerate-manual clean install - - run: mv application/target/blue-2.9.0.zip blue-windows-2.9.0.zip + - run: mv application/target/blue-2.9.1.zip blue-windows-2.9.1.zip - uses: actions/upload-artifact@v2 with: name: Blue Windows Zip - path: blue-windows-2.9.0.zip + path: blue-windows-2.9.1.zip diff --git a/application/build-mac.xml b/application/build-mac.xml index fec2a6eac..af9590254 100644 --- a/application/build-mac.xml +++ b/application/build-mac.xml @@ -8,7 +8,7 @@ - +