Skip to content

CSSTUDIO-1950 Remove calls to fireItemDataConfigChanged() when archivers are removed from instances of PVItem. #2730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abrahamwolk merged 3 commits into from
Jul 10, 2023
Merged

CSSTUDIO-1950 Remove calls to fireItemDataConfigChanged() when archivers are removed from instances of PVItem. #2730

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91aa15d
CSSTUDIO-1950 Remove call to fireItemDataConfigChanged() when archive…
abrahamwolk Jun 22, 2023
672d82a
CSSTUDIO-1950 Revert "CSSTUDIO-1950 Remove call to fireItemDataConfig…
abrahamwolk Jul 10, 2023
65b745a
CSSTUDIO-1950 When use_default_archives==false, remove call to fireIt…
abrahamwolk Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions app/databrowser/src/main/java/org/csstudio/trends/databrowser3/model/PVItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand All @@ -254,7 +256,7 @@ public void removeArchiveDataSource(final List<ArchiveDataSource> archs)
for (ArchiveDataSource archive : archs)
if (archives.remove(archive))
change = true;
if (change)
if (!Preferences.use_default_archives && change)
fireItemDataConfigChanged(false);
}

Expand Down