From 8845306b4aac54258577342b21d721a05fa1f09b Mon Sep 17 00:00:00 2001 From: Dennis Sheirer Date: Thu, 9 Nov 2023 04:12:46 -0500 Subject: [PATCH] #968 Resolves issue with clearing alias ID overlap state when the user edits the alias to correct the overlap. --- .../gui/playlist/alias/AliasConfigurationEditor.java | 2 +- .../github/dsheirer/gui/playlist/alias/AliasItemEditor.java | 5 ++++- .../source/tuner/rtl/r8x/r828d/R828DEmbeddedTuner.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasConfigurationEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasConfigurationEditor.java index 0a26f86a2..2d53c2efe 100644 --- a/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasConfigurationEditor.java +++ b/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasConfigurationEditor.java @@ -387,7 +387,7 @@ private TableView getAliasTableView() idsColumn.setCellValueFactory(new IdentifierCountCell()); TableColumn errorsColumn = new TableColumn<>("Error"); - errorsColumn.setPrefWidth(80); + errorsColumn.setPrefWidth(120); errorsColumn.setCellValueFactory(new PropertyValueFactory<>("overlap")); errorsColumn.setCellFactory(param -> { diff --git a/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasItemEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasItemEditor.java index 6fd0130a8..fcc64e30e 100644 --- a/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasItemEditor.java +++ b/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasItemEditor.java @@ -362,7 +362,10 @@ public void save() for(AliasID aliasID: getIdentifiersList().getItems()) { //Create a copy of the identifier so that the alias and the editor don't have the same instance - alias.addAliasID(AliasFactory.copyOf(aliasID)); + //and reset the overlap flag (if set) so that the alias list can reevaluate the overlap state. + AliasID copy = AliasFactory.copyOf(aliasID); + copy.setOverlap(false); + alias.addAliasID(copy); } //Remove and replace alias actions diff --git a/src/main/java/io/github/dsheirer/source/tuner/rtl/r8x/r828d/R828DEmbeddedTuner.java b/src/main/java/io/github/dsheirer/source/tuner/rtl/r8x/r828d/R828DEmbeddedTuner.java index 36765fbcc..33940db49 100644 --- a/src/main/java/io/github/dsheirer/source/tuner/rtl/r8x/r828d/R828DEmbeddedTuner.java +++ b/src/main/java/io/github/dsheirer/source/tuner/rtl/r8x/r828d/R828DEmbeddedTuner.java @@ -123,7 +123,7 @@ else if(frequency < 250_000_000) } catch(UsbException e) { - throw new SourceException("R820TTunerController - exception while setting frequency [" + frequency + "] - " + + throw new SourceException("R828DTunerController - exception while setting frequency [" + frequency + "] - " + e.getLocalizedMessage()); } finally