From 91aa15daf6dac715749601eb687975cb04edea42 Mon Sep 17 00:00:00 2001 From: Abraham Wolk Date: Thu, 22 Jun 2023 13:39:31 +0200 Subject: [PATCH 1/3] CSSTUDIO-1950 Remove call to fireItemDataConfigChanged() when archives are removed from instances of PVItem. --- .../org/csstudio/trends/databrowser3/model/PVItem.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 index 5dec2e83cc..0c9db3cf56 100644 --- 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,19 +243,14 @@ public void addArchiveDataSource(final ArchiveDataSource archs[]) public void removeArchiveDataSource(final ArchiveDataSource archive) { // Archive removed -> (Probably) no need to get new data - if (archives.remove(archive)) - fireItemDataConfigChanged(false); + archives.remove(archive); } /** @param archs Archives to remove as a source from this item. Ignored when not used. */ public void removeArchiveDataSource(final List archs) { - boolean change = false; for (ArchiveDataSource archive : archs) - if (archives.remove(archive)) - change = true; - if (change) - fireItemDataConfigChanged(false); + archives.remove(archive); } /** Replace existing archive data sources with given archives From 672d82a77b0d16e8c00af04ebf329852785a49d9 Mon Sep 17 00:00:00 2001 From: Abraham Wolk Date: Mon, 10 Jul 2023 09:43:10 +0200 Subject: [PATCH 2/3] CSSTUDIO-1950 Revert "CSSTUDIO-1950 Remove call to fireItemDataConfigChanged() when archives are removed from instances of PVItem." This reverts commit 91aa15daf6dac715749601eb687975cb04edea42. --- .../org/csstudio/trends/databrowser3/model/PVItem.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 index 0c9db3cf56..5dec2e83cc 100644 --- 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 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 From 65b745a25d2e6214f9d61273936b56a416f06e0c Mon Sep 17 00:00:00 2001 From: Abraham Wolk Date: Mon, 10 Jul 2023 10:05:39 +0200 Subject: [PATCH 3/3] CSSTUDIO-1950 When use_default_archives==false, remove call to fireItemDataConfigChanged() when archives are removed from instances of PVItem. --- .../org/csstudio/trends/databrowser3/model/PVItem.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 index 5dec2e83cc..7dd0cfbd56 100644 --- 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 @@ -242,9 +242,11 @@ public void addArchiveDataSource(final ArchiveDataSource archs[]) /** @param archive Archive to remove as a source from this item. */ public void removeArchiveDataSource(final ArchiveDataSource archive) { - // Archive removed -> (Probably) no need to get new data - if (archives.remove(archive)) + boolean change = archives.remove(archive); + if (!Preferences.use_default_archives && change) { + // Archive removed -> (Probably) no need to get new data fireItemDataConfigChanged(false); + } } /** @param archs Archives to remove as a source from this item. Ignored when not used. */ @@ -254,7 +256,7 @@ public void removeArchiveDataSource(final List archs) for (ArchiveDataSource archive : archs) if (archives.remove(archive)) change = true; - if (change) + if (!Preferences.use_default_archives && change) fireItemDataConfigChanged(false); }