From cd6025133781924b74e8632f539c14d0e8d5f07f Mon Sep 17 00:00:00 2001
From: Denny <denny@denny-desktop>
Date: Sun, 12 Feb 2017 10:59:06 -0500
Subject: [PATCH] Resolves #173 - duplicate streaming calls for patch groups.

---
 src/alias/Alias.java                    | 25 +----------
 src/alias/PatchGroupAlias.java          | 57 +++++++++++++++++++++----
 src/audio/broadcast/BroadcastModel.java |  4 +-
 src/channel/metadata/Metadata.java      | 40 ++++-------------
 4 files changed, 60 insertions(+), 66 deletions(-)

diff --git a/src/alias/Alias.java b/src/alias/Alias.java
index 0747e72d..8f8b5ba5 100644
--- a/src/alias/Alias.java
+++ b/src/alias/Alias.java
@@ -185,27 +185,6 @@ public class Alias
 	 */
 	public void validate()
 	{
-		//Check for duplicate broadcast channels
-		List<BroadcastChannel> broadcastChannels = getBroadcastChannels();
-
-		if(broadcastChannels.size() > 0)
-		{
-			Set<String> channelNames = new TreeSet<>();
-
-			for(BroadcastChannel broadcastChannel: broadcastChannels)
-			{
-				String channelName = broadcastChannel.getChannelName();
-
-				if(channelName == null || channelName.isEmpty() || channelNames.contains(channelName))
-				{
-					removeAliasID(broadcastChannel);
-				}
-				else
-				{
-					channelNames.add(channelName);
-				}
-			}
-		}
 	}
 	/**
 	 * Returns the priority level of this alias, if defined, or the default priority
@@ -336,9 +315,9 @@ public class Alias
 	 * List of broadcast channels specified for this alias.
 	 */
     @XmlTransient
-	public List<BroadcastChannel> getBroadcastChannels()
+	public Set<BroadcastChannel> getBroadcastChannels()
 	{
-		List<BroadcastChannel> broadcastChannels = new ArrayList<>();
+		Set<BroadcastChannel> broadcastChannels = new TreeSet<>();
 
 		for(AliasID id: getId())
 		{
diff --git a/src/alias/PatchGroupAlias.java b/src/alias/PatchGroupAlias.java
index 5831d9ea..bb7e347a 100644
--- a/src/alias/PatchGroupAlias.java
+++ b/src/alias/PatchGroupAlias.java
@@ -24,12 +24,20 @@ import alias.id.AliasIDType;
 import alias.id.broadcast.BroadcastChannel;
 import alias.id.priority.Priority;
 import alias.id.talkgroup.TalkgroupID;
+import gui.SDRTrunk;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import playlist.version1.System;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
 public class PatchGroupAlias extends Alias
 {
+    private final static Logger mLog = LoggerFactory.getLogger(PatchGroupAlias.class);
+
     private Alias mPatchGroupAlias;
     private List<Alias> mPatchedAliases = new ArrayList<>();
     private List<String> mPatchedTalkgroupIDs = new ArrayList<>();
@@ -295,9 +303,9 @@ public class PatchGroupAlias extends Alias
     }
 
     @Override
-    public List<BroadcastChannel> getBroadcastChannels()
+    public Set<BroadcastChannel> getBroadcastChannels()
     {
-        List<BroadcastChannel> broadcastChannels = new ArrayList<>();
+        Set<BroadcastChannel> broadcastChannels = new TreeSet<>();
 
         if(hasPatchGroupAlias())
         {
@@ -308,13 +316,7 @@ public class PatchGroupAlias extends Alias
         {
             if(!(alias instanceof PatchGroupAlias))
             {
-                for(BroadcastChannel broadcastChannel: alias.getBroadcastChannels())
-                {
-                    if(!broadcastChannels.contains(broadcastChannel))
-                    {
-                        broadcastChannels.add(broadcastChannel);
-                    }
-                }
+                broadcastChannels.addAll(alias.getBroadcastChannels());
             }
         }
 
@@ -339,4 +341,41 @@ public class PatchGroupAlias extends Alias
 
         return false;
     }
+
+    public static void main(String[] args)
+    {
+        Alias a1 = new Alias("Alias 1");
+        a1.addAliasID(new BroadcastChannel("Channel 1"));
+        a1.addAliasID(new BroadcastChannel("Channel 2"));
+        a1.addAliasID(new BroadcastChannel("Channel 3"));
+        a1.addAliasID(new BroadcastChannel("Channel 4"));
+
+        Alias a2 = new Alias("Alias 1");
+        a1.addAliasID(new BroadcastChannel("Channel 1"));
+        a1.addAliasID(new BroadcastChannel("Channel 2"));
+        a1.addAliasID(new BroadcastChannel("Channel 3"));
+        a1.addAliasID(new BroadcastChannel("Channel 4"));
+
+        Alias a3 = new Alias("Alias 1");
+        a1.addAliasID(new BroadcastChannel("Channel 1"));
+        a1.addAliasID(new BroadcastChannel("Channel 2"));
+        a1.addAliasID(new BroadcastChannel("Channel 3"));
+        a1.addAliasID(new BroadcastChannel("Channel 4"));
+
+        Alias a4 = new Alias("Alias 1");
+        a1.addAliasID(new BroadcastChannel("Channel 1"));
+        a1.addAliasID(new BroadcastChannel("Channel 2"));
+        a1.addAliasID(new BroadcastChannel("Channel 3"));
+        a1.addAliasID(new BroadcastChannel("Channel 4"));
+
+        PatchGroupAlias pga = new PatchGroupAlias();
+        pga.setPatchGroupAlias(a1);
+        pga.addPatchedAlias(a2);
+        pga.addPatchedAlias(a3);
+        pga.addPatchedAlias(a4);
+
+        Set<BroadcastChannel> bc = pga.getBroadcastChannels();
+
+        mLog.debug("Channels:" + bc);
+    }
 }
diff --git a/src/audio/broadcast/BroadcastModel.java b/src/audio/broadcast/BroadcastModel.java
index fa9708ed..04f64f76 100644
--- a/src/audio/broadcast/BroadcastModel.java
+++ b/src/audio/broadcast/BroadcastModel.java
@@ -707,9 +707,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
 
             if(metadata != null && metadata.isStreamable())
             {
-                List<BroadcastChannel> broadcastChannels = metadata.getBroadcastChannels();
-
-                for(BroadcastChannel broadcastChannel : broadcastChannels)
+                for(BroadcastChannel broadcastChannel : metadata.getBroadcastChannels())
                 {
                     String channelName = broadcastChannel.getChannelName();
 
diff --git a/src/channel/metadata/Metadata.java b/src/channel/metadata/Metadata.java
index 5db7a40e..e3117dbf 100644
--- a/src/channel/metadata/Metadata.java
+++ b/src/channel/metadata/Metadata.java
@@ -28,6 +28,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
 public class Metadata
 {
@@ -61,7 +63,7 @@ public class Metadata
     private Integer mAudioPriority;
     protected Boolean mRecordable = false;
     protected Boolean mDoNotRecord;
-    private List<BroadcastChannel> mBroadcastChannels;
+    private Set<BroadcastChannel> mBroadcastChannels;
 
 
     /**
@@ -166,7 +168,7 @@ public class Metadata
     /**
      * List of de-duplicated broadcast channels aggregated from the primary and secondary TO/FROM aliases.
      */
-    public List<BroadcastChannel> getBroadcastChannels()
+    public Set<BroadcastChannel> getBroadcastChannels()
     {
         if(mBroadcastChannels == null)
         {
@@ -582,50 +584,26 @@ public class Metadata
      */
     private void determineBroadcastChannels()
     {
-        mBroadcastChannels = new ArrayList<>();
+        mBroadcastChannels = new TreeSet<>();
 
         if(mPrimaryAddressTo.hasAlias() && mPrimaryAddressTo.getAlias().isStreamable())
         {
-            for(BroadcastChannel broadcastChannel: mPrimaryAddressTo.getAlias().getBroadcastChannels())
-            {
-                if(!mBroadcastChannels.contains(broadcastChannel))
-                {
-                    mBroadcastChannels.add(broadcastChannel);
-                }
-            }
+            mBroadcastChannels.addAll(mPrimaryAddressTo.getAlias().getBroadcastChannels());
         }
 
         if(mPrimaryAddressFrom.hasAlias() && mPrimaryAddressFrom.getAlias().isStreamable())
         {
-            for(BroadcastChannel broadcastChannel: mPrimaryAddressFrom.getAlias().getBroadcastChannels())
-            {
-                if(!mBroadcastChannels.contains(broadcastChannel))
-                {
-                    mBroadcastChannels.add(broadcastChannel);
-                }
-            }
+            mBroadcastChannels.addAll(mPrimaryAddressFrom.getAlias().getBroadcastChannels());
         }
 
         if(mSecondaryAddressTo.hasAlias() && mSecondaryAddressTo.getAlias().isStreamable())
         {
-            for(BroadcastChannel broadcastChannel: mSecondaryAddressTo.getAlias().getBroadcastChannels())
-            {
-                if(!mBroadcastChannels.contains(broadcastChannel))
-                {
-                    mBroadcastChannels.add(broadcastChannel);
-                }
-            }
+            mBroadcastChannels.addAll(mSecondaryAddressTo.getAlias().getBroadcastChannels());
         }
 
         if(mSecondaryAddressFrom.hasAlias() && mSecondaryAddressFrom.getAlias().isStreamable())
         {
-            for(BroadcastChannel broadcastChannel: mSecondaryAddressFrom.getAlias().getBroadcastChannels())
-            {
-                if(!mBroadcastChannels.contains(broadcastChannel))
-                {
-                    mBroadcastChannels.add(broadcastChannel);
-                }
-            }
+            mBroadcastChannels.addAll(mSecondaryAddressFrom.getAlias().getBroadcastChannels());
         }
     }