Merge branch 'hotfix/2.9.1'

kunstmusik · Sep 10, 2023 · 84bef85 · 84bef85
2 parents 4615e18 + aea6ab7
commit 84bef85
Show file tree

Hide file tree

Showing 74 changed files with 70 additions and 304 deletions.
diff --git 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/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/build-mac.xml b/application/build-mac.xml
@@ -8,7 +8,7 @@
 
     <property name="app.name" value="blue"/>
     <!-- for Info.plist, must be only numbers and periods per Apple guidelines -->
-    <property name="app.version" value="2.9.0"/>
+    <property name="app.version" value="2.9.1"/>
     <property name="app.root" value="target/${app.name}.app"/>
     <property name="blue.root" value="target/${app.name}.app/Contents/Resources/blue/"/>
 

diff --git a/application/pom.xml b/application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.kunstmusik</groupId>
         <artifactId>blue-parent</artifactId>
-        <version>2.9.0</version>
+        <version>2.9.1</version>
     </parent>
 
     <artifactId>blue</artifactId>

diff --git a/blue-application/pom.xml b/blue-application/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.kunstmusik</groupId>
         <artifactId>blue-parent</artifactId>
-        <version>2.9.0</version>
+        <version>2.9.1</version>
     </parent>
     <artifactId>blue-application</artifactId>
     <packaging>nbm</packaging>

diff --git a/blue-clojure/pom.xml b/blue-clojure/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.kunstmusik</groupId>
         <artifactId>blue-parent</artifactId>
-        <version>2.9.0</version>
+        <version>2.9.1</version>
     </parent>
     <artifactId>blue-clojure</artifactId>
     <packaging>nbm</packaging>

diff --git a/blue-core/pom.xml b/blue-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.kunstmusik</groupId>
         <artifactId>blue-parent</artifactId>
-        <version>2.9.0</version>
+        <version>2.9.1</version>
     </parent>
     <artifactId>blue-core</artifactId>
     <packaging>nbm</packaging>

diff --git 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
@@ -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<String> {
@@ -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
@@ -29,15 +29,13 @@
 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;
 import javax.swing.event.ChangeListener;
 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
@@ -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
@@ -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
@@ -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
@@ -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<String, Channel> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -3,7 +3,6 @@
 import blue.utility.XMLUtilities;
 import electric.xml.Element;
 import electric.xml.Elements;
-import org.apache.commons.lang3.builder.EqualsBuilder;
 
 /**
  * <p>
@@ -84,8 +83,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/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;
 
 /**
  * <p>
@@ -53,9 +52,4 @@ public Element saveAsXML() {
 
         return retVal;
     }
-
-    @Override
-    public boolean equals(Object obj) {
-        return EqualsBuilder.reflectionEquals(this, obj);
-    }
 }