CSSTUDIO-1950 Revert "CSSTUDIO-1950 Remove call to fireItemDataConfigChanged() when archives are removed from instances of PVItem."

abrahamwolk · abrahamwolk · commit 672d82a77b0d · 2023-07-10T10:04:51.000+02:00
This reverts commit 91aa15d.
diff --git a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/model/PVItem.java b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/model/PVItem.java
@@ -243,14 +243,19 @@ public void addArchiveDataSource(final ArchiveDataSource archs[])
     public void removeArchiveDataSource(final ArchiveDataSource archive)
     {
         // Archive removed -> (Probably) no need to get new data
-        archives.remove(archive);
+        if (archives.remove(archive))
+            fireItemDataConfigChanged(false);
     }
 
     /** @param archs Archives to remove as a source from this item. Ignored when not used. */
     public void removeArchiveDataSource(final List<ArchiveDataSource> archs)
     {
+        boolean change = false;
         for (ArchiveDataSource archive : archs)
-            archives.remove(archive);
+            if (archives.remove(archive))
+                change = true;
+        if (change)
+            fireItemDataConfigChanged(false);
     }
 
     /** Replace existing archive data sources with given archives

Original file line number	Diff line number	Diff line change
`@@ -243,14 +243,19 @@ public void addArchiveDataSource(final ArchiveDataSource archs[])`
`243`	`243`	`public void removeArchiveDataSource(final ArchiveDataSource archive)`
`244`	`244`	`{`
`245`	`245`	`// Archive removed -> (Probably) no need to get new data`
`246`		`- archives.remove(archive);`
	`246`	`+ if (archives.remove(archive))`
	`247`	`+ fireItemDataConfigChanged(false);`
`247`	`248`	`}`
`248`	`249`
`249`	`250`	`/** @param archs Archives to remove as a source from this item. Ignored when not used. */`
`250`	`251`	`public void removeArchiveDataSource(final List<ArchiveDataSource> archs)`
`251`	`252`	`{`
	`253`	`+ boolean change = false;`
`252`	`254`	`for (ArchiveDataSource archive : archs)`
`253`		`- archives.remove(archive);`
	`255`	`+ if (archives.remove(archive))`
	`256`	`+ change = true;`
	`257`	`+ if (change)`
	`258`	`+ fireItemDataConfigChanged(false);`
`254`	`259`	`}`
`255`	`260`
`256`	`261`	`/** Replace existing archive data sources with given archives`