Added constructor for ChromatogramGroupId that takes both qcTraceName and spectrumFilter.

Author: vagisha

src/org/labkey/targetedms/parser/ChromatogramGroupId.java

@@ -31,16 +31,16 @@ public class ChromatogramGroupId
     private ChromatogramGroupId()
     {
     }
-    public ChromatogramGroupId(Target target, SpectrumFilter spectrumFilter)
+    public ChromatogramGroupId(Target target, String qcTraceName, SpectrumFilter spectrumFilter)
     {
         _target = target;
+        _qcTraceName = StringUtils.isEmpty(qcTraceName) ? null : qcTraceName;
         _spectrumFilter = spectrumFilter;
     }
 
-    public ChromatogramGroupId(Target target, String qcTraceName)
+    public ChromatogramGroupId(Target target, SpectrumFilter spectrumFilter)
     {
-        _target = target;
-        _qcTraceName = StringUtils.isEmpty(qcTraceName) ? null : qcTraceName;
+        this(target, null, spectrumFilter);
     }
 
     public Target getTarget()
@@ -87,7 +87,7 @@ public static List<ChromatogramGroupId> fromProtos(ChromatogramGroupDataOuterCla
             SpectrumFilter spectrumFilter = SpectrumFilter.fromFilterClauses(
                     chromatogramGroupId.getFilterIndexesList().stream()
                     .map(filterClauses::get).collect(Collectors.toList())).orElse(null);
-            list.add(new ChromatogramGroupId(targets.get(chromatogramGroupId.getTargetIndex()), spectrumFilter));
+            list.add(new ChromatogramGroupId(targets.get(chromatogramGroupId.getTargetIndex()), chromatogramGroupId.getQcTraceName(), spectrumFilter));
         }
         return list;
     }